Update spring-boot 2.3

- update spring boot (2.3.7 -> 2.3.12)
- remove version pinning for grpc in common pom [0]
- remove version pinning for spring-cloud-sleuth in common pom [1]
- replace spring-data-hal-browser with -explorer since the former
  is deprecated

[0] this effectively upgrades some of the grpc deps that have been
    overwritten (1.25.0 -> 1.30.2)
[1] this effectively upgrades sleuth (2.0.2 -> 2.2.5)

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

diff --git a/bpmn/so-bpmn-infrastructure-flows/pom.xml b/bpmn/so-bpmn-infrastructure-flows/pom.xml
index 669e9ac..5ec0612 100644 (file)
--- a/bpmn/so-bpmn-infrastructure-flows/pom.xml
+++ b/bpmn/so-bpmn-infrastructure-flows/pom.xml
@@ -11,7 +11,6 @@
   <packaging>jar</packaging>
   <properties>
     <assertj.core.version>1.7.0</assertj.core.version>
-    <grpc.version>1.25.0</grpc.version>
   </properties>
   <build>
     <plugins>
@@ -248,7 +247,6 @@
     <dependency>
       <groupId>io.grpc</groupId>
       <artifactId>grpc-testing</artifactId>
-      <version>${grpc.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/common/pom.xml b/common/pom.xml
index f37120f..bf0ba85 100644 (file)
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -11,11 +11,9 @@
   <name>common</name>
   <description>MSO Common classes:- Logger</description>
   <properties>
-    <grpc.version>1.25.0</grpc.version>
     <protobuf.version>3.22.2</protobuf.version>
     <grpc.netty.version>4.1.30.Final</grpc.netty.version>
     <ccsdk.version>1.1.5</ccsdk.version>
-    <spring-cloud-sleuth.version>2.0.2.RELEASE</spring-cloud-sleuth.version>
     <tomcat-catalina-version>9.0.105</tomcat-catalina-version>
   </properties>
   <dependencies>
@@ -164,7 +162,6 @@
     <dependency>
       <groupId>io.grpc</groupId>
       <artifactId>grpc-protobuf</artifactId>
-      <version>${grpc.version}</version>
       <exclusions>
         <exclusion>
           <groupId>com.google.code.findbugs</groupId>
@@ -175,12 +172,10 @@
     <dependency>
       <groupId>io.grpc</groupId>
       <artifactId>grpc-netty</artifactId>
-      <version>${grpc.version}</version>
     </dependency>
     <dependency>
       <groupId>io.grpc</groupId>
       <artifactId>grpc-testing</artifactId>
-      <version>${grpc.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -280,13 +275,6 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
-      <dependency>
-        <groupId>org.springframework.cloud</groupId>
-        <artifactId>spring-cloud-sleuth</artifactId>
-        <version>${spring-cloud-sleuth.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
     </dependencies>
   </dependencyManagement>
   <build>

diff --git a/mso-catalog-db/pom.xml b/mso-catalog-db/pom.xml
index 5f40af9..8ec54d7 100644 (file)
--- a/mso-catalog-db/pom.xml
+++ b/mso-catalog-db/pom.xml
@@ -77,7 +77,7 @@
     </dependency>
     <dependency>
       <groupId>org.springframework.data</groupId>
-      <artifactId>spring-data-rest-hal-browser</artifactId>
+      <artifactId>spring-data-rest-hal-explorer</artifactId>
     </dependency>
     <dependency>
       <groupId>org.ow2.asm</groupId>

diff --git a/pom.xml b/pom.xml
index 49306e0..702d1ee 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -66,7 +66,7 @@
     <siteNexusPath>content/sites/site/org/onap/so/${project.version}/</siteNexusPath>
     <cxf.version>3.4.1</cxf.version>
     <jax.ws.rs>2.1</jax.ws.rs>
-    <springboot.version>2.3.7.RELEASE</springboot.version>
+    <springboot.version>2.3.12.RELEASE</springboot.version>
     <spring-cloud.version>Hoxton.SR8</spring-cloud.version>
     <format.skipValidate>false</format.skipValidate>
     <format.skipExecute>true</format.skipExecute>
@@ -1085,11 +1085,6 @@
         <artifactId>janino</artifactId>
         <version>2.5.15</version>
       </dependency>
-      <dependency>
-        <groupId>org.springframework.data</groupId>
-        <artifactId>spring-data-rest-hal-browser</artifactId>
-        <version>3.3.9.RELEASE</version>
-      </dependency>
       <dependency>
         <groupId>org.glassfish.jersey.core</groupId>
         <artifactId>jersey-common</artifactId>