Update spring-boot to 2.4

- update spring boot (2.3.12.RELEASE -> 2.4.13)
- update spring cloud (Hoxton.SR12 -> 2020.0.6)
- update sdc-be-common (1.11.1 -> 1.12.0)
- update snapshot version to 1.14.1-SNAPSHOT

Issue-ID: SDC-4750
Change-Id: I5acdb236c88599418c6ca5f7c499d9c4a0cfb24e
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>

diff --git a/pom.xml b/pom.xml
index f77eecf..0096044 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
     <groupId>org.onap.sdc.sdc-workflow-designer</groupId>
     <artifactId>sdc-workflow-designer-parent</artifactId>
     <name>sdc-sdc-workflow-designer</name>
-    <version>1.14.0-SNAPSHOT</version>
+    <version>1.14.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>

diff --git a/sdc-workflow-designer-be/pom.xml b/sdc-workflow-designer-be/pom.xml
index 0ed0c80..d6c8c0e 100644 (file)
--- a/sdc-workflow-designer-be/pom.xml
+++ b/sdc-workflow-designer-be/pom.xml
@@ -10,12 +10,12 @@
     <parent>
         <groupId>org.onap.sdc.sdc-workflow-designer</groupId>
         <artifactId>sdc-workflow-designer-parent</artifactId>
-        <version>1.14.0-SNAPSHOT</version>
+        <version>1.14.1-SNAPSHOT</version>
     </parent>
 
     <properties>
-        <spring.boot.version>2.3.12.RELEASE</spring.boot.version>
-        <spring-cloud.version>Hoxton.SR12</spring-cloud.version>
+        <spring.boot.version>2.4.13</spring.boot.version>
+        <spring-cloud.version>2020.0.6</spring-cloud.version>
         <mapstruct.version>1.5.3.Final</mapstruct.version>
         <lombok.version>1.18.38</lombok.version>
         <springfox.version>3.0.0</springfox.version>
@@ -24,7 +24,7 @@
         <mockito.version>3.12.4</mockito.version>
         <springframework.plugin.version>2.0.0.RELEASE</springframework.plugin.version>
         <zusammen.version>1.0.2</zusammen.version>
-        <sdc-be-common.version>1.11.1</sdc-be-common.version>
+        <sdc-be-common.version>1.12.0</sdc-be-common.version>
         <junitJupiter.version>5.9.1</junitJupiter.version>
         <junit.platform.version>1.9.0</junit.platform.version>
         <janino.version>3.1.10</janino.version>

diff --git a/sdc-workflow-designer-be/src/test/java/org/onap/sdc/workflow/TracingTest.java b/sdc-workflow-designer-be/src/test/java/org/onap/sdc/workflow/TracingTest.java
index 96bfb3a..7c5ff53 100644 (file)
--- a/sdc-workflow-designer-be/src/test/java/org/onap/sdc/workflow/TracingTest.java
+++ b/sdc-workflow-designer-be/src/test/java/org/onap/sdc/workflow/TracingTest.java
@@ -32,8 +32,7 @@ import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMock
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.cloud.contract.wiremock.AutoConfigureWireMock;
-import org.springframework.cloud.sleuth.autoconfig.TraceAutoConfiguration;
-import org.springframework.cloud.sleuth.zipkin2.ZipkinAutoConfiguration;
+import org.springframework.cloud.sleuth.autoconfig.zipkin2.ZipkinAutoConfiguration;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
@@ -45,7 +44,7 @@ import lombok.SneakyThrows;
 
 @AutoConfigureMockMvc
 @AutoConfigureWireMock(port = 0)
-@ImportAutoConfiguration(classes = {TraceAutoConfiguration.class, ZipkinAutoConfiguration.class})
+@ImportAutoConfiguration(classes = {ZipkinAutoConfiguration.class})
 @SpringBootTest(properties = {
   "spring.sleuth.enabled=true",
   "spring.zipkin.baseUrl=http://localhost:${wiremock.server.port}",

diff --git a/sdc-workflow-designer-init/pom.xml b/sdc-workflow-designer-init/pom.xml
index 2abdec2..aaddecd 100644 (file)
--- a/sdc-workflow-designer-init/pom.xml
+++ b/sdc-workflow-designer-init/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.onap.sdc.sdc-workflow-designer</groupId>
         <artifactId>sdc-workflow-designer-parent</artifactId>
-        <version>1.14.0-SNAPSHOT</version>
+        <version>1.14.1-SNAPSHOT</version>
     </parent>
 
     <profiles>

diff --git a/sdc-workflow-designer-ui/pom.xml b/sdc-workflow-designer-ui/pom.xml
index 0413139..87896af 100644 (file)
--- a/sdc-workflow-designer-ui/pom.xml
+++ b/sdc-workflow-designer-ui/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.sdc.sdc-workflow-designer</groupId>
         <artifactId>sdc-workflow-designer-parent</artifactId>
-        <version>1.14.0-SNAPSHOT</version>
+        <version>1.14.1-SNAPSHOT</version>
     </parent>
 
     <properties>

diff --git a/version.properties b/version.properties
index ed6ad18..3ad27b2 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -4,7 +4,7 @@
 
 major=1
 minor=14
-patch=0
+patch=1
 
 base_version=${major}.${minor}.${patch}