Merge branch 'release/2.1.0'

# Conflicts: # cu-cli/pom.xml # cu-core/pom.xml # cu-docker-api/pom.xml # cu-manager/pom.xml # cu-manager/src/main/resources/application.properties # cu-maven/pom.xml # pom.xml
end-of-game · Aug 10, 2017 · 0bffd4a · 0bffd4a
1 parent 8d54a95
commit 0bffd4a
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/cu-cli/pom.xml b/cu-cli/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>fr.treeptik</groupId>
 		<artifactId>cloudunit</artifactId>
-		<version>2.1.0-RELEASE</version>
+		<version>2.2.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>cu-cli</artifactId>
 

diff --git a/cu-core/pom.xml b/cu-core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>cloudunit</artifactId>
 		<groupId>fr.treeptik</groupId>
-		<version>2.1.0-RELEASE</version>
+		<version>2.2.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>cu-core</artifactId>

diff --git a/cu-docker-api/pom.xml b/cu-docker-api/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>fr.treeptik</groupId>
         <artifactId>cloudunit</artifactId>
-        <version>2.1.0-RELEASE</version>
+        <version>2.2.0-SNAPSHOT</version>
     </parent>
 
     <properties>

diff --git a/cu-manager/pom.xml b/cu-manager/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>fr.treeptik</groupId>
 		<artifactId>cloudunit</artifactId>
-		<version>2.1.0-RELEASE</version>
+		<version>2.2.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>cu-manager</artifactId>
 	<packaging>war</packaging>

diff --git a/cu-manager/src/main/resources/application.properties b/cu-manager/src/main/resources/application.properties
@@ -13,7 +13,7 @@
 # For any questions, contact us : contact@treeptik.fr
 #
 
-api.version=2.1.0-RELEASE
+api.version=2.2.0-SNAPSHOT
 api.timestamp=${api.timestamp}
 
 database.showSQL=false

diff --git a/cu-maven/pom.xml b/cu-maven/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>fr.treeptik</groupId>
 		<artifactId>cloudunit</artifactId>
-		<version>2.1.0-RELEASE</version>
+		<version>2.2.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>cloudunit-maven</artifactId>
 	<packaging>maven-plugin</packaging>

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>fr.treeptik</groupId>
 	<artifactId>cloudunit</artifactId>
-	<version>2.1.0-RELEASE</version>
+	<version>2.2.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<modules>