Fixed versions

rshiva777 · Sep 29, 2012 · f6bf5fe · f6bf5fe
2 parents 2c46a60 + 4c76873
commit f6bf5fe
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/gameoflife-web/pom.xml b/gameoflife-web/pom.xml
@@ -121,12 +121,16 @@
         <dependency>
             <groupId>com.wakaleo.gameoflife</groupId>
             <artifactId>gameoflife-core</artifactId>
+<<<<<<< HEAD
             <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.wakaleo.gameoflife</groupId>
             <artifactId>gameoflife-webservice</artifactId>
             <version>0.9.66-SNAPSHOT</version>
+=======
+            <version>0.9.67-SNAPSHOT</version>
+>>>>>>> master
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>

diff --git a/pom.xml b/pom.xml
@@ -127,6 +127,20 @@
                 </configuration>
             </plugin>
 
+            <plugin>
+                <groupId>com.jelastic</groupId>
+                <artifactId>jelastic-maven-plugin</artifactId>
+                <version>1.6</version>
+                <configuration>
+                    <email>${jelastic.username}</email>
+                    <password>${jelastic.password}</password>
+                    <context>gameoflife</context>
+                    <environment>wakaleo</environment>
+                    <api_hoster>app.jelastic.servint.net</api_hoster>
+                    <finalName>gameoflife</finalName>
+                </configuration>
+            </plugin>
+
         </plugins>
 
         <pluginManagement>