Merge "Upversion champ in master"

diff --git a/champ-lib/champ-core/pom.xml b/champ-lib/champ-core/pom.xml
index df143c4..855cdd4 100644 (file)
--- a/champ-lib/champ-core/pom.xml
+++ b/champ-lib/champ-core/pom.xml
@@ -27,7 +27,7 @@ limitations under the License.
     <parent>
         <groupId>org.onap.aai.champ</groupId>
         <artifactId>champ-lib</artifactId>
-        <version>1.5.0-SNAPSHOT</version>
+        <version>1.6.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.aai.champ.champ-lib</groupId>

diff --git a/champ-lib/champ-janus/pom.xml b/champ-lib/champ-janus/pom.xml
index 02b375c..37864c5 100644 (file)
--- a/champ-lib/champ-janus/pom.xml
+++ b/champ-lib/champ-janus/pom.xml
@@ -27,7 +27,7 @@ limitations under the License.
     <parent>
         <groupId>org.onap.aai.champ</groupId>
         <artifactId>champ-lib</artifactId>
-        <version>1.5.0-SNAPSHOT</version>
+        <version>1.6.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.aai.champ.champ-lib</groupId>

diff --git a/champ-lib/champ-titan/pom.xml b/champ-lib/champ-titan/pom.xml
index de1426a..8ff6a60 100644 (file)
--- a/champ-lib/champ-titan/pom.xml
+++ b/champ-lib/champ-titan/pom.xml
@@ -26,7 +26,7 @@ limitations under the License.
     <parent>
         <groupId>org.onap.aai.champ</groupId>
         <artifactId>champ-lib</artifactId>
-        <version>1.5.0-SNAPSHOT</version>
+        <version>1.6.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.aai.champ.champ-lib</groupId>

diff --git a/champ-lib/pom.xml b/champ-lib/pom.xml
index 815928f..8fee755 100644 (file)
--- a/champ-lib/pom.xml
+++ b/champ-lib/pom.xml
@@ -25,7 +25,7 @@ limitations under the License.
     <parent>
         <groupId>org.onap.aai</groupId>
         <artifactId>champ</artifactId>
-        <version>1.5.0-SNAPSHOT</version>
+        <version>1.6.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.aai.champ</groupId>

diff --git a/champ-service-deps-janus/pom.xml b/champ-service-deps-janus/pom.xml
index 6407f06..04b0898 100644 (file)
--- a/champ-service-deps-janus/pom.xml
+++ b/champ-service-deps-janus/pom.xml
@@ -25,7 +25,7 @@ limitations under the License.
     <parent>
         <groupId>org.onap.aai</groupId>
         <artifactId>champ</artifactId>
-        <version>1.5.0-SNAPSHOT</version>
+        <version>1.6.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.aai.champ</groupId>

diff --git a/champ-service-deps-titan/pom.xml b/champ-service-deps-titan/pom.xml
index 2b35a34..e75c99e 100644 (file)
--- a/champ-service-deps-titan/pom.xml
+++ b/champ-service-deps-titan/pom.xml
@@ -25,7 +25,7 @@ limitations under the License.
     <parent>
         <groupId>org.onap.aai</groupId>
         <artifactId>champ</artifactId>
-        <version>1.5.0-SNAPSHOT</version>
+        <version>1.6.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.aai.champ</groupId>

diff --git a/champ-service/pom.xml b/champ-service/pom.xml
index 93126bd..4fa66b7 100644 (file)
--- a/champ-service/pom.xml
+++ b/champ-service/pom.xml
@@ -26,7 +26,7 @@ limitations under the License.
     <parent>
         <groupId>org.onap.aai</groupId>
         <artifactId>champ</artifactId>
-        <version>1.5.0-SNAPSHOT</version>
+        <version>1.6.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.aai.champ</groupId>
@@ -41,7 +41,7 @@ limitations under the License.
 
         <version.org.apache.commons.commons-lang3>3.7</version.org.apache.commons.commons-lang3>
         <version.org.hamcrest.hamcrest-library>1.3</version.org.hamcrest.hamcrest-library>
-        <version.org.springframework.boot.spring-boot-dependencies>1.5.19.RELEASE</version.org.springframework.boot.spring-boot-dependencies>
+        <version.org.springframework.boot.spring-boot-dependencies>1.5.21.RELEASE</version.org.springframework.boot.spring-boot-dependencies>
          <!-- Minimum code coverage percentage. Please update this figure as coverage increases to prevent any drops in
          coverage caused by new changes. Note that this figure cannot be lower than the ONAP requirement of 0.55 -->
         <jacoco.line.coverage.limit>0.16</jacoco.line.coverage.limit>

diff --git a/pom.xml b/pom.xml
index 012212e..349b481 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@ limitations under the License.
     <artifactId>champ</artifactId>
     <name>aai-champ</name>
     <packaging>pom</packaging>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
 
     <properties>
         <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>

diff --git a/version.properties b/version.properties
index b11eaff..704dc53 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -4,7 +4,7 @@
 # because they are used in Jenkins, whose plug-in doesn't support
 
 major_version=1
-minor_version=5
+minor_version=6
 patch_version=0
 
 base_version=${major_version}.${minor_version}.${patch_version}