Update so common dependencies

- update so-common version (1.12.1 -> 1.15.6)
- bump snapshot version to 1.13.2-SNAPSHOT

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

diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml
index 6c52063..7e2b36d 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.1-SNAPSHOT</version>
+        <version>1.13.2-SNAPSHOT</version>
     </parent>
     <groupId>org.onap.so.adapters.so-cnf-adapter.packages</groupId>
-    <version>1.13.1-SNAPSHOT</version>
+    <version>1.13.2-SNAPSHOT</version>
     <packaging>pom</packaging>
     <artifactId>docker</artifactId>
     <name>Docker Packaging</name>

diff --git a/packages/pom.xml b/packages/pom.xml
index 02398e4..15cf10e 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.1-SNAPSHOT</version>
+        <version>1.13.2-SNAPSHOT</version>
     </parent>
     <artifactId>packages</artifactId>
     <packaging>pom</packaging>
-    <version>1.13.1-SNAPSHOT</version>
+    <version>1.13.2-SNAPSHOT</version>
     <name>Packages</name>
 
     <profiles>

diff --git a/pom.xml b/pom.xml
index 61033aa..bcd54fe 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
     </parent>
     <groupId>org.onap.so.adapters.so-cnf-adapter</groupId>
     <artifactId>so-cnf-adapter</artifactId>
-    <version>1.13.1-SNAPSHOT</version>
+    <version>1.13.2-SNAPSHOT</version>
     <name>SO CNF Adapter</name>
     <packaging>pom</packaging>
 
@@ -20,7 +20,7 @@
         <gson-version>2.8.9</gson-version>
         <swagger-core-v3-version>2.1.13</swagger-core-v3-version>
         <version-swagger-codegen-v3>3.0.33</version-swagger-codegen-v3>
-        <so-core-version>1.12.1-SNAPSHOT</so-core-version>
+        <so-core-version>1.15.6-SNAPSHOT</so-core-version>
         <equalsverifier-version>3.4.1</equalsverifier-version>
         <snakeyaml-version>0.11</snakeyaml-version>
         <kubernetes-client-version>16.0.0</kubernetes-client-version>
@@ -101,10 +101,9 @@
         </plugins>
     </build>
 
-    <!-- The 1.13.0-SNAPSHOT so common pom updated the
-     h2 dependency to 2.X without also updating flyway.
-     TODO: remove this once this service is updated to
-     the 1.15.6 common pom -->
+    <!-- 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. -->
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -112,6 +111,18 @@
                 <artifactId>h2</artifactId>
                 <version>1.4.200</version>
             </dependency>
+            <dependency>
+                <groupId>org.flywaydb</groupId>
+                <artifactId>flyway-core</artifactId>
+                <version>6.4.4</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <version>Hoxton.SR12</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

diff --git a/so-cnf-adapter-application/pom.xml b/so-cnf-adapter-application/pom.xml
index 489f84b..6a9ce15 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.1-SNAPSHOT</version>
+        <version>1.13.2-SNAPSHOT</version>
     </parent>
   <artifactId>so-cnf-adapter-application</artifactId>
-  <version>1.13.1-SNAPSHOT</version>
+  <version>1.13.2-SNAPSHOT</version>
   <name>SO CNF Application Jar</name>
   <build>
     <finalName>${project.artifactId}-${project.version}</finalName>

diff --git a/so-cnfm/pom.xml b/so-cnfm/pom.xml
index 71afd6b..89d2707 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.1-SNAPSHOT</version>
+        <version>1.13.2-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 34a6a95..4fb5cd6 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.1-SNAPSHOT</version>
+        <version>1.13.2-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 cec5782..4f6188f 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.1-SNAPSHOT</version>
+        <version>1.13.2-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 953cb10..93d7988 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.1-SNAPSHOT</version>
+        <version>1.13.2-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 9375662..9dfbddd 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.1-SNAPSHOT</version>
+        <version>1.13.2-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 32f1c1a..c23d6fe 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.1-SNAPSHOT</version>
+        <version>1.13.2-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 6752876..57a8a5f 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.1-SNAPSHOT</version>
+        <version>1.13.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>so-cnfm-lcm-service</artifactId>

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