Update to 1.15.6-SNAPSHOT so parent

- update so parent (1.15.0-SNAPSHOT -> 1.15.6-SNAPSHOT)
- update snapshot version to 1.13.3-SNAPSHOT

Issue-ID: SO-4234
Change-Id: I420d59aafe7983e4cba544fd1d051dd60e6946ef
Signed-off-by: Fiete Ostkamp <fiete.ostkamp@telekom.de>

diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml
index 7e2b36d..30b2a59 100755 (executable)
--- a/packages/docker/pom.xml
+++ b/packages/docker/pom.xml
@@ -4,10 +4,10 @@
     <parent>
         <groupId>org.onap.so.adapters.so-cnf-adapter</groupId>
         <artifactId>packages</artifactId>
-        <version>1.13.2-SNAPSHOT</version>
+        <version>1.13.3-SNAPSHOT</version>
     </parent>
     <groupId>org.onap.so.adapters.so-cnf-adapter.packages</groupId>
-    <version>1.13.2-SNAPSHOT</version>
+    <version>1.13.3-SNAPSHOT</version>
     <packaging>pom</packaging>
     <artifactId>docker</artifactId>
     <name>Docker Packaging</name>

diff --git a/packages/pom.xml b/packages/pom.xml
index 15cf10e..1984c9e 100644 (file)
--- a/packages/pom.xml
+++ b/packages/pom.xml
@@ -4,11 +4,11 @@
     <parent>
         <groupId>org.onap.so.adapters.so-cnf-adapter</groupId>
         <artifactId>so-cnf-adapter</artifactId>
-        <version>1.13.2-SNAPSHOT</version>
+        <version>1.13.3-SNAPSHOT</version>
     </parent>
     <artifactId>packages</artifactId>
     <packaging>pom</packaging>
-    <version>1.13.2-SNAPSHOT</version>
+    <version>1.13.3-SNAPSHOT</version>
     <name>Packages</name>
 
     <profiles>

diff --git a/pom.xml b/pom.xml
index bcd54fe..c34dac5 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -4,11 +4,11 @@
     <parent>
         <groupId>org.onap.so</groupId>
         <artifactId>so</artifactId>
-        <version>1.15.0-SNAPSHOT</version>
+        <version>1.15.6-SNAPSHOT</version>
     </parent>
     <groupId>org.onap.so.adapters.so-cnf-adapter</groupId>
     <artifactId>so-cnf-adapter</artifactId>
-    <version>1.13.2-SNAPSHOT</version>
+    <version>1.13.3-SNAPSHOT</version>
     <name>SO CNF Adapter</name>
     <packaging>pom</packaging>
 
@@ -103,7 +103,7 @@
 
     <!-- H2 2.X has breaking changes incompatible with existing Flyway migrations.
      Keep H2 at 1.4.200 with Flyway 6.4.4 (compatible with Spring Boot 2.3.7).
-     Spring Cloud version aligned with Spring Boot 2.3.7. -->
+     Spring Cloud version aligned with Spring Boot 2.4.13. -->
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -119,7 +119,7 @@
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-dependencies</artifactId>
-                <version>Hoxton.SR12</version>
+                <version>2020.0.6</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/so-cnf-adapter-application/pom.xml b/so-cnf-adapter-application/pom.xml
index 6a9ce15..228b401 100755 (executable)
--- a/so-cnf-adapter-application/pom.xml
+++ b/so-cnf-adapter-application/pom.xml
@@ -26,10 +26,10 @@
     <parent>
         <groupId>org.onap.so.adapters.so-cnf-adapter</groupId>
         <artifactId>so-cnf-adapter</artifactId>
-        <version>1.13.2-SNAPSHOT</version>
+        <version>1.13.3-SNAPSHOT</version>
     </parent>
   <artifactId>so-cnf-adapter-application</artifactId>
-  <version>1.13.2-SNAPSHOT</version>
+  <version>1.13.3-SNAPSHOT</version>
   <name>SO CNF Application Jar</name>
   <build>
     <finalName>${project.artifactId}-${project.version}</finalName>
@@ -117,7 +117,7 @@
       <dependency>
         <groupId>org.springframework.cloud</groupId>
         <artifactId>spring-cloud-dependencies</artifactId>
-        <version>Hoxton.SR12</version>
+        <version>2020.0.6</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/so-cnf-adapter-application/src/test/java/org/onap/so/adapters/cnf/rest/TracingTest.java b/so-cnf-adapter-application/src/test/java/org/onap/so/adapters/cnf/rest/TracingTest.java
index fbdfe5d..6c2d8e5 100644 (file)
--- a/so-cnf-adapter-application/src/test/java/org/onap/so/adapters/cnf/rest/TracingTest.java
+++ b/so-cnf-adapter-application/src/test/java/org/onap/so/adapters/cnf/rest/TracingTest.java
@@ -20,12 +20,9 @@ import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.boot.web.server.LocalServerPort;
-import org.springframework.cloud.sleuth.autoconfig.TraceAutoConfiguration;
-import org.springframework.cloud.sleuth.zipkin2.ZipkinAutoConfiguration;
 import org.springframework.http.HttpStatus;
 import org.springframework.test.context.DynamicPropertyRegistry;
 import org.springframework.test.context.DynamicPropertySource;
@@ -43,7 +40,6 @@ import lombok.SneakyThrows;
 
 @Ignore
 @EnableAutoConfiguration
-@ImportAutoConfiguration(classes = { TraceAutoConfiguration.class, ZipkinAutoConfiguration.class })
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = {
     "spring.sleuth.enabled=true",
     "spring.sleuth.sampler.probability=1.0"

diff --git a/so-cnfm/pom.xml b/so-cnfm/pom.xml
index 89d2707..83ad43e 100644 (file)
--- a/so-cnfm/pom.xml
+++ b/so-cnfm/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.onap.so.adapters.so-cnf-adapter</groupId>
         <artifactId>so-cnf-adapter</artifactId>
-        <version>1.13.2-SNAPSHOT</version>
+        <version>1.13.3-SNAPSHOT</version>
     </parent>
     <artifactId>so-cnfm</artifactId>
     <packaging>pom</packaging>

diff --git a/so-cnfm/so-cnfm-lcm/pom.xml b/so-cnfm/so-cnfm-lcm/pom.xml
index 4fb5cd6..3675c90 100644 (file)
--- a/so-cnfm/so-cnfm-lcm/pom.xml
+++ b/so-cnfm/so-cnfm-lcm/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.onap.so.adapters.so-cnf-adapter</groupId>
         <artifactId>so-cnfm</artifactId>
-        <version>1.13.2-SNAPSHOT</version>
+        <version>1.13.3-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.so.adapters.so-cnf-adapter.so-cnfm.lcm</groupId>

diff --git a/so-cnfm/so-cnfm-lcm/so-cnfm-lcm-api/pom.xml b/so-cnfm/so-cnfm-lcm/so-cnfm-lcm-api/pom.xml
index 4f6188f..24f3b18 100644 (file)
--- a/so-cnfm/so-cnfm-lcm/so-cnfm-lcm-api/pom.xml
+++ b/so-cnfm/so-cnfm-lcm/so-cnfm-lcm-api/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.onap.so.adapters.so-cnf-adapter.so-cnfm.lcm</groupId>
         <artifactId>so-cnfm-lcm</artifactId>
-        <version>1.13.2-SNAPSHOT</version>
+        <version>1.13.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>so-cnfm-lcm-api</artifactId>

diff --git a/so-cnfm/so-cnfm-lcm/so-cnfm-lcm-application/pom.xml b/so-cnfm/so-cnfm-lcm/so-cnfm-lcm-application/pom.xml
index 93d7988..3f311d8 100644 (file)
--- a/so-cnfm/so-cnfm-lcm/so-cnfm-lcm-application/pom.xml
+++ b/so-cnfm/so-cnfm-lcm/so-cnfm-lcm-application/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.onap.so.adapters.so-cnf-adapter.so-cnfm.lcm</groupId>
         <artifactId>so-cnfm-lcm</artifactId>
-        <version>1.13.2-SNAPSHOT</version>
+        <version>1.13.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>so-cnfm-lcm-application</artifactId>

diff --git a/so-cnfm/so-cnfm-lcm/so-cnfm-lcm-bpmn-flows/pom.xml b/so-cnfm/so-cnfm-lcm/so-cnfm-lcm-bpmn-flows/pom.xml
index 9dfbddd..d6b52a0 100644 (file)
--- a/so-cnfm/so-cnfm-lcm/so-cnfm-lcm-bpmn-flows/pom.xml
+++ b/so-cnfm/so-cnfm-lcm/so-cnfm-lcm-bpmn-flows/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.onap.so.adapters.so-cnf-adapter.so-cnfm.lcm</groupId>
         <artifactId>so-cnfm-lcm</artifactId>
-        <version>1.13.2-SNAPSHOT</version>
+        <version>1.13.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>so-cnfm-lcm-bpmn-flows</artifactId>

diff --git a/so-cnfm/so-cnfm-lcm/so-cnfm-lcm-database-service/pom.xml b/so-cnfm/so-cnfm-lcm/so-cnfm-lcm-database-service/pom.xml
index c23d6fe..4545268 100644 (file)
--- a/so-cnfm/so-cnfm-lcm/so-cnfm-lcm-database-service/pom.xml
+++ b/so-cnfm/so-cnfm-lcm/so-cnfm-lcm-database-service/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.onap.so.adapters.so-cnf-adapter.so-cnfm.lcm</groupId>
         <artifactId>so-cnfm-lcm</artifactId>
-        <version>1.13.2-SNAPSHOT</version>
+        <version>1.13.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>so-cnfm-lcm-database-service</artifactId>

diff --git a/so-cnfm/so-cnfm-lcm/so-cnfm-lcm-service/pom.xml b/so-cnfm/so-cnfm-lcm/so-cnfm-lcm-service/pom.xml
index 57a8a5f..45c7788 100644 (file)
--- a/so-cnfm/so-cnfm-lcm/so-cnfm-lcm-service/pom.xml
+++ b/so-cnfm/so-cnfm-lcm/so-cnfm-lcm-service/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.onap.so.adapters.so-cnf-adapter.so-cnfm.lcm</groupId>
         <artifactId>so-cnfm-lcm</artifactId>
-        <version>1.13.2-SNAPSHOT</version>
+        <version>1.13.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>so-cnfm-lcm-service</artifactId>

diff --git a/version.properties b/version.properties
index 50335b6..d5313ef 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -4,7 +4,7 @@
 
 major=1
 minor=13
-patch=2
+patch=3
 
 base_version=${major}.${minor}.${patch}