Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Dec 11, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ffcca02
Bump org.springframework.boot.version from 3.3.5 to 3.4.0
dependabot[bot] Dec 10, 2024
1d0708c
cleanup and fix related dependecy versions
tommystendahl Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions ...om/ericsson/bss/cassandra/ecchronos/application/spring/TestTomcatWebServerCustomizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;

Expand Down
7 changes: 0 additions & 7 deletions connection.impl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 0 additions & 2 deletions .../java/com/ericsson/bss/cassandra/ecchronos/connection/impl/DefaultStatementDecorator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 0 additions & 12 deletions fm.impl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 0 additions & 2 deletions fm.impl/src/main/java/com/ericsson/bss/cassandra/ecchronos/fm/impl/LoggingFaultReporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
65 changes: 4 additions & 61 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -147,6 +142,8 @@
<scope>test</scope>
</dependency>

<!-- End of temporary override section -->

<!-- Netty -->
<dependency>
<groupId>io.netty</groupId>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
Loading