Bump org.springframework.boot.version from 3.3.5 to 3.4.0 (#794)

Ericsson · Dec 11, 2024 · 6fe47d7 · 6fe47d7
1 parent 95dc4d5
commit 6fe47d7
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 84 deletions.
diff --git a/...om/ericsson/bss/cassandra/ecchronos/application/spring/TestTomcatWebServerCustomizer.java b/...om/ericsson/bss/cassandra/ecchronos/application/spring/TestTomcatWebServerCustomizer.java
@@ -17,8 +17,12 @@
 import com.ericsson.bss.cassandra.ecchronos.application.utils.CertUtils;
 import com.ericsson.bss.cassandra.ecchronos.connection.JmxConnectionProvider;
 import com.ericsson.bss.cassandra.ecchronos.connection.NativeConnectionProvider;
+import com.ericsson.bss.cassandra.ecchronos.core.repair.RepairScheduler;
 import com.ericsson.bss.cassandra.ecchronos.core.repair.state.ReplicationState;
 import com.ericsson.bss.cassandra.ecchronos.core.utils.NodeResolver;
+import com.ericsson.bss.cassandra.ecchronos.core.utils.RepairStatsProvider;
+import com.ericsson.bss.cassandra.ecchronos.core.utils.ReplicatedTableProvider;
+import com.ericsson.bss.cassandra.ecchronos.core.utils.TableReferenceFactory;
 import org.apache.hc.client5.http.classic.HttpClient;
 import org.apache.hc.client5.http.classic.methods.HttpGet;
 import org.apache.hc.client5.http.impl.classic.HttpClients;
@@ -118,6 +122,18 @@ public abstract class TestTomcatWebServerCustomizer
     @MockBean
     private ECChronos ecChronos;
 
+    @MockBean
+    private TableReferenceFactory tableReferenceFactory;
+
+    @MockBean
+    private ReplicatedTableProvider replicatedTableProvider;
+
+    @MockBean
+    private RepairStatsProvider repairStatsProvider;
+
+    @MockBean
+    private RepairScheduler repairScheduler;
+
     @MockBean
     private NativeConnectionProvider nativeConnectionProvider;
 

diff --git a/connection.impl/pom.xml b/connection.impl/pom.xml
@@ -47,13 +47,6 @@
             <artifactId>java-driver-metrics-micrometer</artifactId>
         </dependency>
 
-        <!-- OSGi -->
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.service.component.annotations</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
         <!-- Test -->
         <dependency>
             <groupId>org.junit.vintage</groupId>

diff --git a/.../java/com/ericsson/bss/cassandra/ecchronos/connection/impl/DefaultStatementDecorator.java b/.../java/com/ericsson/bss/cassandra/ecchronos/connection/impl/DefaultStatementDecorator.java
@@ -16,9 +16,7 @@
 
 import com.datastax.oss.driver.api.core.cql.Statement;
 import com.ericsson.bss.cassandra.ecchronos.connection.StatementDecorator;
-import org.osgi.service.component.annotations.Component;
 
-@Component(service = StatementDecorator.class)
 public class DefaultStatementDecorator implements StatementDecorator
 {
     @Override

diff --git a/fm.impl/pom.xml b/fm.impl/pom.xml
@@ -41,18 +41,6 @@
             <artifactId>slf4j-api</artifactId>
         </dependency>
 
-        <!-- OSGi -->
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.service.component.annotations</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.service.metatype.annotations</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

diff --git a/fm.impl/src/main/java/com/ericsson/bss/cassandra/ecchronos/fm/impl/LoggingFaultReporter.java b/fm.impl/src/main/java/com/ericsson/bss/cassandra/ecchronos/fm/impl/LoggingFaultReporter.java
@@ -17,13 +17,11 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.osgi.service.component.annotations.Component;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.ericsson.bss.cassandra.ecchronos.fm.RepairFaultReporter;
 
-@Component(service = RepairFaultReporter.class)
 public class LoggingFaultReporter implements RepairFaultReporter
 {
     private static final Logger LOG = LoggerFactory.getLogger(LoggingFaultReporter.class);

diff --git a/pom.xml b/pom.xml
@@ -82,20 +82,15 @@
         <org.apache.commons.io.version>2.17.0</org.apache.commons.io.version>
         <org.apache.commons.commons-compress.version>1.27.1</org.apache.commons.commons-compress.version>
         <org.apache.felix.scr.version>2.2.12</org.apache.felix.scr.version>
-        <org.apache.httpcomponents.client.version>5.3.1</org.apache.httpcomponents.client.version>
+        <org.apache.httpcomponents.client.version>5.4.1</org.apache.httpcomponents.client.version>
         <org.bouncycastle.bcpkix-jdk18on.version>1.79</org.bouncycastle.bcpkix-jdk18on.version>
         <org.hdrhistogram.version>2.2.2</org.hdrhistogram.version>
-        <org.springframework.boot.version>3.3.5</org.springframework.boot.version>
-        <org.springframework.web.version>6.1.14</org.springframework.web.version>
+        <org.springframework.boot.version>3.4.0</org.springframework.boot.version>
         <org.yaml.snakeyaml.version>2.3</org.yaml.snakeyaml.version>
-        <osgi.component.version>1.5.1</osgi.component.version>
-        <osgi.metatype.version>1.4.1</osgi.metatype.version>
-        <pax-exam.version>4.13.5</pax-exam.version>
         <slf4j.version>2.0.16</slf4j.version>
         <springdoc.openapi-starter-webmvc-ui.version>2.6.0</springdoc.openapi-starter-webmvc-ui.version>
         <swagger-annotations.version>2.2.25</swagger-annotations.version>
         <testcontainers.version>1.20.4</testcontainers.version>
-        <tomcat.version>10.1.31</tomcat.version>
 
         <!-- Plugin versions -->
         <com.mycila.license-maven-plugin.version>4.6</com.mycila.license-maven-plugin.version>
@@ -147,6 +142,8 @@
                 <scope>test</scope>
             </dependency>
 
+            <!-- End of temporary override section -->
+
             <!-- Netty -->
             <dependency>
                 <groupId>io.netty</groupId>
@@ -369,24 +366,6 @@
             </dependency>
 
             <!-- Spring boot -->
-            <dependency>
-                <groupId>org.apache.tomcat.embed</groupId>
-                <artifactId>tomcat-embed-core</artifactId>
-                <version>${tomcat.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.tomcat.embed</groupId>
-                <artifactId>tomcat-embed-el</artifactId>
-                <version>${tomcat.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.tomcat.embed</groupId>
-                <artifactId>tomcat-embed-websocket</artifactId>
-                <version>${tomcat.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
@@ -407,12 +386,6 @@
                 <version>${springdoc.openapi-starter-webmvc-ui.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-web</artifactId>
-                <version>${org.springframework.web.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>jakarta.servlet</groupId>
                 <artifactId>jakarta.servlet-api</artifactId>
@@ -444,21 +417,6 @@
                 <version>${io.prometheus.client-java.version}</version>
             </dependency>
 
-            <!-- OSGi -->
-            <dependency>
-                <groupId>org.osgi</groupId>
-                <artifactId>org.osgi.service.component.annotations</artifactId>
-                <version>${osgi.component.version}</version>
-                <scope>provided</scope>
-            </dependency>
-
-            <dependency>
-                <groupId>org.osgi</groupId>
-                <artifactId>org.osgi.service.metatype.annotations</artifactId>
-                <version>${osgi.metatype.version}</version>
-                <scope>provided</scope>
-            </dependency>
-
             <!-- Test -->
             <dependency>
                 <groupId>org.mockito</groupId>
@@ -510,21 +468,6 @@
                 <scope>test</scope>
             </dependency>
 
-            <!-- Pax exam -->
-            <dependency>
-                <groupId>org.ops4j.pax.exam</groupId>
-                <artifactId>pax-exam-cm</artifactId>
-                <version>${pax-exam.version}</version>
-                <scope>test</scope>
-            </dependency>
-
-            <dependency>
-                <groupId>org.ops4j.pax.exam</groupId>
-                <artifactId>pax-exam-junit4</artifactId>
-                <version>${pax-exam.version}</version>
-                <scope>test</scope>
-            </dependency>
-
             <dependency>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>org.apache.felix.scr</artifactId>