Merge branch 'release-0.3' into develop

Cardshifter · Oct 6, 2014 · 40b6094 · 40b6094
2 parents 74c6964 + cd18b44
commit 40b6094
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 17 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,8 +16,8 @@ deploy:
   api-key: 
     secure: "CJyVgIoL/G0a233WuqPi14eOAk8JlWdErxqbJZYawGmCt5CBJW9l5+4CO4mJqho+EKHmpr+OgGVFq5HV4zQVqVJNFhL86yEucY52v3uQqqT26UmyJwLEtNOpHzVw0pXKvE5LbBOQdl+/8nNhakd6VwGE3qs05F+0ZYyu9LXaal4="
   file: 
-      - "target/cardshifter-fx-0.2.jar"
-      - "target/cardshifter-server-0.2.jar"
+      - "target/cardshifter-fx-0.3.jar"
+      - "target/cardshifter-server-0.3.jar"
   skip_cleanup: true
   on:
     tags: true

diff --git a/cardshifter-api/pom.xml b/cardshifter-api/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.cardshifter</groupId>
 		<artifactId>cardshifter</artifactId>
-		<version>0.3-SNAPSHOT</version>
+		<version>0.3</version>
 	</parent>
 
 	<artifactId>cardshifter-api</artifactId>

diff --git a/cardshifter-console/pom.xml b/cardshifter-console/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.cardshifter</groupId>
 		<artifactId>cardshifter</artifactId>
-		<version>0.3-SNAPSHOT</version>
+		<version>0.3</version>
 	</parent>
 
 	<artifactId>cardshifter-console</artifactId>
@@ -50,12 +50,12 @@
 		<dependency>
 			<groupId>com.cardshifter</groupId>
 			<artifactId>cardshifter-core</artifactId>
-			<version>0.3-SNAPSHOT</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.cardshifter</groupId>
 			<artifactId>cardshifter-mod</artifactId>
-			<version>0.3-SNAPSHOT</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.beust</groupId>

diff --git a/cardshifter-core/pom.xml b/cardshifter-core/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.cardshifter</groupId>
 		<artifactId>cardshifter</artifactId>
-		<version>0.3-SNAPSHOT</version>
+		<version>0.3</version>
 	</parent>
 
 	<artifactId>cardshifter-core</artifactId>
@@ -43,7 +43,7 @@
 		<dependency>
 			<groupId>com.cardshifter</groupId>
 			<artifactId>cardshifter-api</artifactId>
-			<version>0.3-SNAPSHOT</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.luaj</groupId>

diff --git a/cardshifter-fx/pom.xml b/cardshifter-fx/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.cardshifter</groupId>
 		<artifactId>cardshifter</artifactId>
-		<version>0.3-SNAPSHOT</version>
+		<version>0.3</version>
 	</parent>
 
 	<artifactId>cardshifter-fx</artifactId>
@@ -55,12 +55,12 @@
 		<dependency>
 			<groupId>com.cardshifter</groupId>
 			<artifactId>cardshifter-mod</artifactId>
-			<version>0.3-SNAPSHOT</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.cardshifter</groupId>
 			<artifactId>cardshifter-core</artifactId>
-			<version>0.3-SNAPSHOT</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.loadui</groupId>

diff --git a/cardshifter-mod/pom.xml b/cardshifter-mod/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.cardshifter</groupId>
 		<artifactId>cardshifter</artifactId>
-		<version>0.3-SNAPSHOT</version>
+		<version>0.3</version>
 	</parent>
 
 	<artifactId>cardshifter-mod</artifactId>

diff --git a/cardshifter-server/pom.xml b/cardshifter-server/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.cardshifter</groupId>
 		<artifactId>cardshifter</artifactId>
-		<version>0.3-SNAPSHOT</version>
+		<version>0.3</version>
 	</parent>
 
 	<artifactId>cardshifter-server</artifactId>
@@ -51,17 +51,17 @@
 		<dependency>
 			<groupId>com.cardshifter</groupId>
 			<artifactId>cardshifter-core</artifactId>
-			<version>0.3-SNAPSHOT</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.cardshifter</groupId>
 			<artifactId>cardshifter-mod</artifactId>
-			<version>0.3-SNAPSHOT</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.cardshifter</groupId>
 			<artifactId>cardshifter-api</artifactId>
-			<version>0.3-SNAPSHOT</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>log4j</groupId>

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.cardshifter</groupId>
 	<artifactId>cardshifter</artifactId>
-	<version>0.3-SNAPSHOT</version>
+	<version>0.3</version>
 	<packaging>pom</packaging>
 
 	<name>cardshifter</name>