Skip to content

Commit 8c2c2ee

Browse files
authored
Aligning Spring Boot and SpringFramework versions (#1427)
* aligning versions Signed-off-by: salaboy <[email protected]> * letting SB to manage the logback version, so it is aligned Signed-off-by: salaboy <[email protected]> * removing dep from sdk-tests Signed-off-by: salaboy <[email protected]> * removing logback Signed-off-by: salaboy <[email protected]> --------- Signed-off-by: salaboy <[email protected]>
1 parent d01da7a commit 8c2c2ee

File tree

4 files changed

+4
-21
lines changed

4 files changed

+4
-21
lines changed

dapr-spring/pom.xml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@
3434
<testcontainers.version>1.19.8</testcontainers.version>
3535
<junit.version>5.11.2</junit.version>
3636
<dapr.spring.version>0.16.0-SNAPSHOT</dapr.spring.version>
37-
<springboot.version>3.2.6</springboot.version>
38-
<springframework.version>6.1.21</springframework.version>
39-
<logback-core.version>1.4.14</logback-core.version>
4037
</properties>
4138

4239
<dependencyManagement>
@@ -162,11 +159,6 @@
162159
<version>${testcontainers.version}</version>
163160
<scope>test</scope>
164161
</dependency>
165-
<dependency>
166-
<groupId>ch.qos.logback</groupId>
167-
<artifactId>logback-core</artifactId>
168-
<version>${logback-core.version}</version>
169-
</dependency>
170162
</dependencies>
171163
</dependencyManagement>
172164

pom.xml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,15 @@
4848
<junit-bom.version>5.11.4</junit-bom.version>
4949
<snakeyaml.version>2.0</snakeyaml.version>
5050
<testcontainers.version>1.20.5</testcontainers.version>
51-
<springboot.version>3.4.3</springboot.version>
51+
<!-- Do NOT UPGRADE spring.version without checking springboot.version alignment -->
52+
<springboot.version>3.4.6</springboot.version>
53+
<springframework.version>6.2.7</springframework.version>
54+
<!-- Do NOT UPGRADE springframework.version without checking springboot.version alignment -->
5255
<nexus-staging-maven-plugin.version>1.7.0</nexus-staging-maven-plugin.version>
5356
<assertj.version>3.27.3</assertj.version>
5457
<grpc.version>1.69.0</grpc.version>
5558
<protobuf.version>3.25.5</protobuf.version>
5659
<opentelemetry.version>1.41.0</opentelemetry.version>
57-
<logback-core.version>1.5.16</logback-core.version>
5860
<wiremock.version>3.9.1</wiremock.version>
5961
<jakarta.annotation.version>2.1.1</jakarta.annotation.version>
6062
<javax.annotation.version>1.3.2</javax.annotation.version>
@@ -274,11 +276,6 @@
274276
<artifactId>commons-lang3</artifactId>
275277
<version>${commons-lang.version}</version>
276278
</dependency>
277-
<dependency>
278-
<groupId>ch.qos.logback</groupId>
279-
<artifactId>logback-core</artifactId>
280-
<version>${logback-core.version}</version>
281-
</dependency>
282279
<dependency>
283280
<groupId>commons-cli</groupId>
284281
<artifactId>commons-cli</artifactId>

sdk-tests/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -179,11 +179,6 @@
179179
<artifactId>commons-lang3</artifactId>
180180
<scope>test</scope>
181181
</dependency>
182-
<dependency>
183-
<groupId>ch.qos.logback</groupId>
184-
<artifactId>logback-core</artifactId>
185-
<scope>test</scope>
186-
</dependency>
187182
<dependency>
188183
<groupId>org.testcontainers</groupId>
189184
<artifactId>postgresql</artifactId>

spring-boot-examples/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
<properties>
1717
<maven.deploy.skip>true</maven.deploy.skip>
18-
<springboot.version>3.4.3</springboot.version>
1918
</properties>
2019

2120
<modules>

0 commit comments

Comments
 (0)