Update so-parent in cnf-adapter

- update so-parent (1.9.0-SNAPSHOT -> 1.12.0-SNAPSHOT)
- notably, this includes:
  - jackson (2.11.3 -> 2.14.2)
  - guava (27.0-jre -> 28.1-jre)

Issue-ID: SO-4157
Change-Id: Icb26852c311bd7a518daff92ca4b317ddde6286f
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>

diff --git a/.gitignore b/.gitignore
index 5814298..e361410 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@ target
 /.metadata/
 **/.sts4-cache
 **/.java-version
+.vscode

diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml
index 2df3f49..1bfade4 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.9.0-SNAPSHOT</version>
+        <version>1.12.1-SNAPSHOT</version>
     </parent>
     <groupId>org.onap.so.adapters.so-cnf-adapter.packages</groupId>
-    <version>1.9.0-SNAPSHOT</version>
+    <version>1.12.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <artifactId>docker</artifactId>
     <name>Docker Packaging</name>
@@ -182,4 +182,4 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>

diff --git a/packages/pom.xml b/packages/pom.xml
index e65fbcc..d78cf28 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.9.0-SNAPSHOT</version>
+        <version>1.12.1-SNAPSHOT</version>
     </parent>
     <artifactId>packages</artifactId>
     <packaging>pom</packaging>
-    <version>1.9.0-SNAPSHOT</version>
+    <version>1.12.1-SNAPSHOT</version>
     <name>Packages</name>
 
     <profiles>
@@ -32,4 +32,4 @@
             </properties>
         </profile>
     </profiles>
-</project>
\ No newline at end of file
+</project>

diff --git a/pom.xml b/pom.xml
index ecd0433..c325fa0 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -4,11 +4,11 @@
     <parent>
         <groupId>org.onap.so</groupId>
         <artifactId>so</artifactId>
-        <version>1.9.0-SNAPSHOT</version>
+        <version>1.12.1-SNAPSHOT</version>
     </parent>
     <groupId>org.onap.so.adapters.so-cnf-adapter</groupId>
     <artifactId>so-cnf-adapter</artifactId>
-    <version>1.9.0-SNAPSHOT</version>
+    <version>1.12.1-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.9.0-SNAPSHOT</so-core-version>
+        <so-core-version>1.12.1-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>

diff --git a/so-cnf-adapter-application/pom.xml b/so-cnf-adapter-application/pom.xml
index 32254ca..72158d7 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.9.0-SNAPSHOT</version>
+        <version>1.12.1-SNAPSHOT</version>
     </parent>
   <artifactId>so-cnf-adapter-application</artifactId>
-  <version>1.9.0-SNAPSHOT</version>
+  <version>1.12.1-SNAPSHOT</version>
   <name>SO CNF Application Jar</name>
   <build>
     <finalName>${project.artifactId}-${project.version}</finalName>
@@ -159,7 +159,7 @@
     <dependency>
       <groupId>org.onap.so</groupId>
       <artifactId>aai-client</artifactId>
-      <version>1.9.0-SNAPSHOT</version>
+      <version>1.12.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.sun.xml.ws</groupId>
@@ -174,4 +174,3 @@
     </dependency>
   </dependencies>
 </project>
-

diff --git a/so-cnfm/pom.xml b/so-cnfm/pom.xml
index 4f2f1de..0ba6c9f 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.9.0-SNAPSHOT</version>
+        <version>1.12.1-SNAPSHOT</version>
     </parent>
     <artifactId>so-cnfm</artifactId>
     <packaging>pom</packaging>
@@ -12,4 +12,4 @@
     <modules>
         <module>so-cnfm-lcm</module>
     </modules>
-</project>
\ No newline at end of file
+</project>

diff --git a/so-cnfm/so-cnfm-lcm/pom.xml b/so-cnfm/so-cnfm-lcm/pom.xml
index 82474e2..2cf7667 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.9.0-SNAPSHOT</version>
+        <version>1.12.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.so.adapters.so-cnf-adapter.so-cnfm.lcm</groupId>
@@ -18,4 +18,4 @@
         <module>so-cnfm-lcm-service</module>
         <module>so-cnfm-lcm-application</module>
     </modules>
-</project>
\ No newline at end of file
+</project>

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 929dde6..04075bc 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.9.0-SNAPSHOT</version>
+        <version>1.12.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>so-cnfm-lcm-api</artifactId>
@@ -111,4 +111,4 @@
             <artifactId>jaxb-api</artifactId>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>

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 812bd6d..86a97f0 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.9.0-SNAPSHOT</version>
+        <version>1.12.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>so-cnfm-lcm-application</artifactId>
@@ -63,4 +63,4 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>

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 bf3a50e..87550fd 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.9.0-SNAPSHOT</version>
+        <version>1.12.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>so-cnfm-lcm-bpmn-flows</artifactId>
@@ -148,4 +148,4 @@
         </dependency>
 
     </dependencies>
-</project>
\ No newline at end of file
+</project>

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 ff73b20..57d2c93 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.9.0-SNAPSHOT</version>
+        <version>1.12.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>so-cnfm-lcm-database-service</artifactId>
@@ -52,4 +52,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>

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 b025d73..99bfe5d 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.9.0-SNAPSHOT</version>
+        <version>1.12.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>so-cnfm-lcm-service</artifactId>
@@ -66,4 +66,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>

diff --git a/version.properties b/version.properties
index 27fb6c9..0e7c66e 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -4,7 +4,7 @@
 
 major=1
 minor=12
-patch=2
+patch=3
 
 base_version=${major}.${minor}.${patch}