Skip to content

Commit

Permalink
Upgrade external dependencies to align with Spring Boot 3.4.2 (#43918)
Browse files Browse the repository at this point in the history
Co-authored-by: github-actions <github-actions@github.com>
  • Loading branch information
Netyyyy and github-actions authored Jan 24, 2025
1 parent f19c963 commit fca2e2e
Show file tree
Hide file tree
Showing 38 changed files with 735 additions and 734 deletions.
88 changes: 44 additions & 44 deletions eng/versioning/external_dependencies.txt
Original file line number Diff line number Diff line change
Expand Up @@ -320,17 +320,17 @@ springboot3_com.github.spotbugs:spotbugs-maven-plugin;4.8.2.0
springboot3_com.google.code.findbugs:jsr305;3.0.2
springboot3_com.mysql:mysql-connector-j;9.1.0
springboot3_com.nimbusds:nimbus-jose-jwt;9.37.3
springboot3_io.lettuce:lettuce-core;6.4.1.RELEASE
springboot3_io.micrometer:micrometer-core;1.14.2
springboot3_io.netty:netty-buffer;4.1.116.Final
springboot3_io.netty:netty-codec-http;4.1.116.Final
springboot3_io.netty:netty-common;4.1.116.Final
springboot3_io.netty:netty-handler;4.1.116.Final
springboot3_io.netty:netty-transport-native-epoll;4.1.116.Final
springboot3_io.netty:netty-transport-native-kqueue;4.1.116.Final
springboot3_io.netty:netty-transport;4.1.116.Final
springboot3_io.projectreactor.netty:reactor-netty;1.2.1
springboot3_io.projectreactor:reactor-test;3.7.1
springboot3_io.lettuce:lettuce-core;6.4.2.RELEASE
springboot3_io.micrometer:micrometer-core;1.14.3
springboot3_io.netty:netty-buffer;4.1.117.Final
springboot3_io.netty:netty-codec-http;4.1.117.Final
springboot3_io.netty:netty-common;4.1.117.Final
springboot3_io.netty:netty-handler;4.1.117.Final
springboot3_io.netty:netty-transport-native-epoll;4.1.117.Final
springboot3_io.netty:netty-transport-native-kqueue;4.1.117.Final
springboot3_io.netty:netty-transport;4.1.117.Final
springboot3_io.projectreactor.netty:reactor-netty;1.2.2
springboot3_io.projectreactor:reactor-test;3.7.2
springboot3_jakarta.servlet:jakarta.servlet-api;6.0.0
springboot3_jakarta.validation:jakarta.validation-api;3.0.2
springboot3_javax.annotation:javax.annotation-api;1.3.2
Expand All @@ -353,58 +353,58 @@ springboot3_org.junit.jupiter:junit-jupiter;5.11.4
springboot3_org.junit.vintage:junit-vintage-engine;5.11.4
springboot3_org.messaginghub:pooled-jms;3.1.7
springboot3_org.mockito:mockito-core;5.14.2
springboot3_org.postgresql:postgresql;42.7.4
springboot3_org.postgresql:postgresql;42.7.5
springboot3_org.revapi:revapi-maven-plugin;0.14.6
springboot3_org.slf4j:slf4j-api;2.0.16
springboot3_org.slf4j:slf4j-simple;2.0.16
springboot3_org.springframework.boot:spring-boot-actuator-autoconfigure;3.4.1
springboot3_org.springframework.boot:spring-boot-actuator;3.4.1
springboot3_org.springframework.boot:spring-boot-autoconfigure;3.4.1
springboot3_org.springframework.boot:spring-boot-configuration-metadata;3.4.1
springboot3_org.springframework.boot:spring-boot-configuration-processor;3.4.1
springboot3_org.springframework.boot:spring-boot-docker-compose;3.4.1
springboot3_org.springframework.boot:spring-boot-starter-actuator;3.4.1
springboot3_org.springframework.boot:spring-boot-starter-data-jdbc;3.4.1
springboot3_org.springframework.boot:spring-boot-starter-integration;3.4.1
springboot3_org.springframework.boot:spring-boot-starter-parent;3.4.1
springboot3_org.springframework.boot:spring-boot-starter-test;3.4.1
springboot3_org.springframework.boot:spring-boot-starter-web;3.4.1
springboot3_org.springframework.boot:spring-boot-starter;3.4.1
springboot3_org.springframework.boot:spring-boot-test;3.4.1
springboot3_org.springframework.boot:spring-boot-testcontainers;3.4.1
springboot3_org.springframework.boot:spring-boot-actuator-autoconfigure;3.4.2
springboot3_org.springframework.boot:spring-boot-actuator;3.4.2
springboot3_org.springframework.boot:spring-boot-autoconfigure;3.4.2
springboot3_org.springframework.boot:spring-boot-configuration-metadata;3.4.2
springboot3_org.springframework.boot:spring-boot-configuration-processor;3.4.2
springboot3_org.springframework.boot:spring-boot-docker-compose;3.4.2
springboot3_org.springframework.boot:spring-boot-starter-actuator;3.4.2
springboot3_org.springframework.boot:spring-boot-starter-data-jdbc;3.4.2
springboot3_org.springframework.boot:spring-boot-starter-integration;3.4.2
springboot3_org.springframework.boot:spring-boot-starter-parent;3.4.2
springboot3_org.springframework.boot:spring-boot-starter-test;3.4.2
springboot3_org.springframework.boot:spring-boot-starter-web;3.4.2
springboot3_org.springframework.boot:spring-boot-starter;3.4.2
springboot3_org.springframework.boot:spring-boot-test;3.4.2
springboot3_org.springframework.boot:spring-boot-testcontainers;3.4.2
springboot3_org.springframework.cloud:spring-cloud-bus;4.2.0
springboot3_org.springframework.cloud:spring-cloud-context;4.2.0
springboot3_org.springframework.cloud:spring-cloud-starter-bootstrap;4.2.0
springboot3_org.springframework.cloud:spring-cloud-starter-stream-kafka;4.2.0
springboot3_org.springframework.cloud:spring-cloud-stream-test-binder;4.2.0
springboot3_org.springframework.cloud:spring-cloud-stream;4.2.0
springboot3_org.springframework.data:spring-data-commons;3.4.1
springboot3_org.springframework.data:spring-data-redis;3.4.1
springboot3_org.springframework.data:spring-data-commons;3.4.2
springboot3_org.springframework.data:spring-data-redis;3.4.2
springboot3_org.springframework.integration:spring-integration-core;6.4.1
springboot3_org.springframework.kafka:spring-kafka;3.3.1
springboot3_org.springframework.kafka:spring-kafka;3.3.2
springboot3_org.springframework.retry:spring-retry;2.0.11
springboot3_org.springframework.security:spring-security-config;6.4.2
springboot3_org.springframework.security:spring-security-oauth2-client;6.4.2
springboot3_org.springframework.security:spring-security-oauth2-jose;6.4.2
springboot3_org.springframework.security:spring-security-oauth2-resource-server;6.4.2
springboot3_org.springframework.security:spring-security-web;6.4.2
springboot3_org.springframework:spring-beans;6.2.1
springboot3_org.springframework:spring-context-support;6.2.1
springboot3_org.springframework:spring-context;6.2.1
springboot3_org.springframework:spring-core-test;6.2.1
springboot3_org.springframework:spring-core;6.2.1
springboot3_org.springframework:spring-expression;6.2.1
springboot3_org.springframework:spring-jdbc;6.2.1
springboot3_org.springframework:spring-jms;6.2.1
springboot3_org.springframework:spring-messaging;6.2.1
springboot3_org.springframework:spring-test;6.2.1
springboot3_org.springframework:spring-tx;6.2.1
springboot3_org.springframework:spring-web;6.2.1
springboot3_org.springframework:spring-webmvc;6.2.1
springboot3_org.springframework:spring-beans;6.2.2
springboot3_org.springframework:spring-context-support;6.2.2
springboot3_org.springframework:spring-context;6.2.2
springboot3_org.springframework:spring-core-test;6.2.2
springboot3_org.springframework:spring-core;6.2.2
springboot3_org.springframework:spring-expression;6.2.2
springboot3_org.springframework:spring-jdbc;6.2.2
springboot3_org.springframework:spring-jms;6.2.2
springboot3_org.springframework:spring-messaging;6.2.2
springboot3_org.springframework:spring-test;6.2.2
springboot3_org.springframework:spring-tx;6.2.2
springboot3_org.springframework:spring-web;6.2.2
springboot3_org.springframework:spring-webmvc;6.2.2
springboot3_org.testcontainers:junit-jupiter;1.20.4
springboot3_org.testcontainers:azure;1.20.4
# Used for Spring version updates
springboot3_org.springframework.boot:spring-boot-dependencies;3.4.1
springboot3_org.springframework.boot:spring-boot-dependencies;3.4.2
springboot3_org.springframework.cloud:spring-cloud-dependencies;2024.0.0

# Java 7 support
Expand Down
1 change: 1 addition & 0 deletions sdk/spring/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Release History

## 5.20.0-beta.1 (Unreleased)
Upgrade Spring Boot dependencies version to 3.4.2 and Spring Cloud dependencies version to 2024.0.0
Upgrade Spring Boot dependencies version to 3.4.1 and Spring Cloud dependencies version to 2024.0.0

### Spring Cloud Azure Autoconfigure
Expand Down
32 changes: 16 additions & 16 deletions sdk/spring/azure-spring-data-cosmos/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>6.2.1</version> <!-- {x-version-update;springboot3_org.springframework:spring-core;external_dependency} -->
<version>6.2.2</version> <!-- {x-version-update;springboot3_org.springframework:spring-core;external_dependency} -->
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
Expand All @@ -64,27 +64,27 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>6.2.1</version> <!-- {x-version-update;springboot3_org.springframework:spring-web;external_dependency} -->
<version>6.2.2</version> <!-- {x-version-update;springboot3_org.springframework:spring-web;external_dependency} -->
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>6.2.1</version> <!-- {x-version-update;springboot3_org.springframework:spring-beans;external_dependency} -->
<version>6.2.2</version> <!-- {x-version-update;springboot3_org.springframework:spring-beans;external_dependency} -->
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>6.2.1</version> <!-- {x-version-update;springboot3_org.springframework:spring-context;external_dependency} -->
<version>6.2.2</version> <!-- {x-version-update;springboot3_org.springframework:spring-context;external_dependency} -->
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
<version>6.2.1</version> <!-- {x-version-update;springboot3_org.springframework:spring-tx;external_dependency} -->
<version>6.2.2</version> <!-- {x-version-update;springboot3_org.springframework:spring-tx;external_dependency} -->
</dependency>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-commons</artifactId>
<version>3.4.1</version> <!-- {x-version-update;springboot3_org.springframework.data:spring-data-commons;external_dependency} -->
<version>3.4.2</version> <!-- {x-version-update;springboot3_org.springframework.data:spring-data-commons;external_dependency} -->
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
Expand All @@ -95,7 +95,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
<version>6.2.1</version> <!-- {x-version-update;springboot3_org.springframework:spring-expression;external_dependency} -->
<version>6.2.2</version> <!-- {x-version-update;springboot3_org.springframework:spring-expression;external_dependency} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand Down Expand Up @@ -163,7 +163,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<version>3.4.1</version> <!-- {x-version-update;springboot3_org.springframework.boot:spring-boot-starter-test;external_dependency} -->
<version>3.4.2</version> <!-- {x-version-update;springboot3_org.springframework.boot:spring-boot-starter-test;external_dependency} -->
<scope>test</scope>
<exclusions>
<exclusion>
Expand All @@ -175,7 +175,7 @@
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-test</artifactId>
<version>3.7.1</version> <!-- {x-version-update;springboot3_io.projectreactor:reactor-test;external_dependency} -->
<version>3.7.2</version> <!-- {x-version-update;springboot3_io.projectreactor:reactor-test;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -273,13 +273,13 @@
<rules>
<bannedDependencies>
<includes>
<include>org.springframework:spring-beans:[6.2.1]</include> <!-- {x-include-update;springboot3_org.springframework:spring-beans;external_dependency} -->
<include>org.springframework:spring-web:[6.2.1]</include> <!-- {x-include-update;springboot3_org.springframework:spring-web;external_dependency} -->
<include>org.springframework:spring-tx:[6.2.1]</include> <!-- {x-include-update;springboot3_org.springframework:spring-tx;external_dependency} -->
<include>org.springframework:spring-expression:[6.2.1]</include> <!-- {x-include-update;springboot3_org.springframework:spring-expression;external_dependency} -->
<include>org.springframework:spring-core:[6.2.1]</include> <!-- {x-include-update;springboot3_org.springframework:spring-core;external_dependency} -->
<include>org.springframework:spring-context:[6.2.1]</include> <!-- {x-include-update;springboot3_org.springframework:spring-context;external_dependency} -->
<include>org.springframework.data:spring-data-commons:[3.4.1]</include> <!-- {x-include-update;springboot3_org.springframework.data:spring-data-commons;external_dependency} -->
<include>org.springframework:spring-beans:[6.2.2]</include> <!-- {x-include-update;springboot3_org.springframework:spring-beans;external_dependency} -->
<include>org.springframework:spring-web:[6.2.2]</include> <!-- {x-include-update;springboot3_org.springframework:spring-web;external_dependency} -->
<include>org.springframework:spring-tx:[6.2.2]</include> <!-- {x-include-update;springboot3_org.springframework:spring-tx;external_dependency} -->
<include>org.springframework:spring-expression:[6.2.2]</include> <!-- {x-include-update;springboot3_org.springframework:spring-expression;external_dependency} -->
<include>org.springframework:spring-core:[6.2.2]</include> <!-- {x-include-update;springboot3_org.springframework:spring-core;external_dependency} -->
<include>org.springframework:spring-context:[6.2.2]</include> <!-- {x-include-update;springboot3_org.springframework:spring-context;external_dependency} -->
<include>org.springframework.data:spring-data-commons:[3.4.2]</include> <!-- {x-include-update;springboot3_org.springframework.data:spring-data-commons;external_dependency} -->
<include>org.javatuples:javatuples:[1.2]</include> <!-- {x-include-update;springboot3_org.javatuples:javatuples;external_dependency} -->
<include>com.fasterxml.jackson.core:jackson-annotations:[2.18.2]</include> <!-- {x-include-update;springboot3_com.fasterxml.jackson.core:jackson-annotations;external_dependency} -->
<include>com.fasterxml.jackson.datatype:jackson-datatype-jdk8:[2.18.2]</include> <!-- {x-include-update;springboot3_com.fasterxml.jackson.datatype:jackson-datatype-jdk8;external_dependency} -->
Expand Down
Loading

0 comments on commit fca2e2e

Please sign in to comment.