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.

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

Already on GitHub? Sign in to your account

External dependencies upgrade - Spring Boot 2.7.5 and Spring Cloud 2021.0.4 #31730

Closed
wants to merge 15 commits into from
Closed
2 changes: 2 additions & 0 deletions .vscode/cspell.json
Expand Up @@ -299,6 +299,7 @@
"etag",
"eventhub",
"eventhubs",
"endtoend",
"filereports",
"gapra",
"gmavenplus",
Expand All @@ -320,6 +321,7 @@
"jacoco",
"javadoc",
"javadocs",
"JDBC",
"JSESSIONID",
"junitxml",
"jtoken",
Expand Down
2 changes: 1 addition & 1 deletion common/perf-test-core/pom.xml
Expand Up @@ -51,7 +51,7 @@
<!-- Special allowance for performance libraries as they aren't shipped. -->
<include>com.beust:jcommander:[1.78]</include> <!-- {x-include-update;com.beust:jcommander;external_dependency} -->

<include>io.projectreactor:reactor-core:[3.4.23]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
<include>io.projectreactor:reactor-core:[3.4.24]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
Expand Down
106 changes: 53 additions & 53 deletions eng/versioning/external_dependencies.txt
@@ -1,6 +1,6 @@
# To avoid dependency conflicts between SDK and Spring, when modifying or adding dependencies,
# make sure the version is same to sdk/spring/scripts/spring_boot_2.7.4_managed_external_dependencies.txt
# If your version is different from sdk/spring/scripts/spring_boot_2.7.4_managed_external_dependencies.txt,
# make sure the version is same to sdk/spring/scripts/spring_boot_2.7.5_managed_external_dependencies.txt
# If your version is different from sdk/spring/scripts/spring_boot_2.7.5_managed_external_dependencies.txt,
# please discuss with Spring Integration team members:
# @chenrujun (rujche), @saragluna (xiada), @yiliuTo (yiliu6), @backwind1233 (zhihaoguo).
# Thanks.
Expand Down Expand Up @@ -40,6 +40,7 @@ com.microsoft.rest:client-runtime;1.7.4
com.microsoft.rest.v2:client-runtime;2.1.1
com.microsoft.sqlserver:mssql-jdbc;10.2.1.jre8
com.microsoft.azure:spring-data-cosmosdb;2.3.0
com.mysql:mysql-connector-j;8.0.31
com.squareup.okhttp3:mockwebserver;4.10.0
com.squareup.okhttp3:okhttp;4.10.0
com.zaxxer:HikariCP;4.0.3
Expand All @@ -49,24 +50,24 @@ io.cloudevents:cloudevents-api;2.2.0
io.cloudevents:cloudevents-core;2.2.0
io.fabric8:kubernetes-client;5.12.3
io.github.bonigarcia:webdrivermanager;4.3.1
io.micrometer:micrometer-core;1.9.4
io.micrometer:micrometer-registry-azure-monitor;1.9.4
io.micrometer:micrometer-registry-graphite;1.9.4
io.netty:netty-buffer;4.1.82.Final
io.netty:netty-common;4.1.82.Final
io.netty:netty-codec-http;4.1.82.Final
io.netty:netty-codec-http2;4.1.82.Final
io.netty:netty-transport;4.1.82.Final
io.netty:netty-handler;4.1.82.Final
io.netty:netty-handler-proxy;4.1.82.Final
io.micrometer:micrometer-core;1.9.5
io.micrometer:micrometer-registry-azure-monitor;1.9.5
io.micrometer:micrometer-registry-graphite;1.9.5
io.netty:netty-buffer;4.1.84.Final
io.netty:netty-common;4.1.84.Final
io.netty:netty-codec-http;4.1.84.Final
io.netty:netty-codec-http2;4.1.84.Final
io.netty:netty-transport;4.1.84.Final
io.netty:netty-handler;4.1.84.Final
io.netty:netty-handler-proxy;4.1.84.Final
io.netty:netty-tcnative;2.0.54.Final
io.netty:netty-tcnative-boringssl-static;2.0.54.Final
io.netty:netty-transport-native-epoll;4.1.82.Final
io.netty:netty-transport-native-unix-common;4.1.82.Final
io.netty:netty-transport-native-kqueue;4.1.82.Final
io.projectreactor.netty:reactor-netty;1.0.23
io.projectreactor.netty:reactor-netty-http;1.0.23
io.projectreactor:reactor-core;3.4.23
io.netty:netty-transport-native-epoll;4.1.84.Final
io.netty:netty-transport-native-unix-common;4.1.84.Final
io.netty:netty-transport-native-kqueue;4.1.84.Final
io.projectreactor.netty:reactor-netty;1.0.24
io.projectreactor.netty:reactor-netty-http;1.0.24
io.projectreactor:reactor-core;3.4.24
io.reactivex:rxjava;1.3.8
io.vertx:vertx-codegen;4.3.3
io.vertx:vertx-core;4.3.3
Expand All @@ -77,7 +78,6 @@ javax.json:javax.json-api;1.1.4
javax.servlet:javax.servlet-api;4.0.1
javax.validation:validation-api;2.0.1.Final
javax.websocket:javax.websocket-api;1.1
mysql:mysql-connector-java;8.0.30
org.apache.ant:ant;1.9.4
org.apache.avro:avro;1.11.0
org.apache.avro:avro-maven-plugin;1.11.0
Expand Down Expand Up @@ -119,42 +119,42 @@ org.slf4j:slf4j-simple;1.7.36
redis.clients:jedis;4.2.3
io.lettuce:lettuce-core;6.2.0.RELEASE
org.redisson:redisson;3.17.0
net.bytebuddy:byte-buddy;1.12.17
net.bytebuddy:byte-buddy;1.12.18

## Spring boot dependency versions
org.springframework.boot:spring-boot-dependencies;2.7.4
org.springframework.boot:spring-boot-actuator;2.7.4
org.springframework.boot:spring-boot-actuator-autoconfigure;2.7.4
org.springframework.boot:spring-boot-autoconfigure-processor;2.7.4
org.springframework.boot:spring-boot-autoconfigure;2.7.4
org.springframework.boot:spring-boot-configuration-metadata;2.7.4
org.springframework.boot:spring-boot-configuration-processor;2.7.4
org.springframework.boot:spring-boot-dependencies;2.7.5
org.springframework.boot:spring-boot-actuator;2.7.5
org.springframework.boot:spring-boot-actuator-autoconfigure;2.7.5
org.springframework.boot:spring-boot-autoconfigure-processor;2.7.5
org.springframework.boot:spring-boot-autoconfigure;2.7.5
org.springframework.boot:spring-boot-configuration-metadata;2.7.5
org.springframework.boot:spring-boot-configuration-processor;2.7.5
org.springframework.boot:spring-boot-maven-plugin;2.7.4
org.springframework.boot:spring-boot-starter-actuator;2.7.4
org.springframework.boot:spring-boot-starter-aop;2.7.4
org.springframework.boot:spring-boot-starter-cache;2.7.4
org.springframework.boot:spring-boot-starter-data-redis;2.7.4
org.springframework.boot:spring-boot-starter-integration;2.7.4
org.springframework.boot:spring-boot-starter-logging;2.7.4
org.springframework.boot:spring-boot-starter-test;2.7.4
org.springframework.boot:spring-boot-starter-validation;2.7.4
org.springframework.boot:spring-boot-starter-web;2.7.4
org.springframework.boot:spring-boot-starter;2.7.4
org.springframework.boot:spring-boot-test;2.7.4
org.springframework.boot:spring-boot;2.7.4
org.springframework.data:spring-data-commons;2.7.3
org.springframework.data:spring-data-mongodb;3.4.3
org.springframework.data:spring-data-redis;2.7.3
org.springframework.boot:spring-boot-starter-actuator;2.7.5
org.springframework.boot:spring-boot-starter-aop;2.7.5
org.springframework.boot:spring-boot-starter-cache;2.7.5
org.springframework.boot:spring-boot-starter-data-redis;2.7.5
org.springframework.boot:spring-boot-starter-integration;2.7.5
org.springframework.boot:spring-boot-starter-logging;2.7.5
org.springframework.boot:spring-boot-starter-test;2.7.5
org.springframework.boot:spring-boot-starter-validation;2.7.5
org.springframework.boot:spring-boot-starter-web;2.7.5
org.springframework.boot:spring-boot-starter;2.7.5
org.springframework.boot:spring-boot-test;2.7.5
org.springframework.boot:spring-boot;2.7.5
org.springframework.data:spring-data-commons;2.7.5
org.springframework.data:spring-data-mongodb;3.4.5
org.springframework.data:spring-data-redis;2.7.5
org.springframework.experimental:spring-aot;0.11.4
org.springframework.integration:spring-integration-core;5.5.15
org.springframework.kafka:spring-kafka;2.8.9
org.springframework.security:spring-security-config;5.7.3
org.springframework.security:spring-security-core;5.7.3
org.springframework.security:spring-security-oauth2-client;5.7.3
org.springframework.security:spring-security-oauth2-resource-server;5.7.3
org.springframework.security:spring-security-oauth2-core;5.7.3
org.springframework.security:spring-security-oauth2-jose;5.7.3
org.springframework.security:spring-security-web;5.7.3
org.springframework.kafka:spring-kafka;2.8.10
org.springframework.security:spring-security-config;5.7.4
org.springframework.security:spring-security-core;5.7.4
org.springframework.security:spring-security-oauth2-client;5.7.4
org.springframework.security:spring-security-oauth2-resource-server;5.7.4
org.springframework.security:spring-security-oauth2-core;5.7.4
org.springframework.security:spring-security-oauth2-jose;5.7.4
org.springframework.security:spring-security-web;5.7.4
org.springframework:spring-beans;5.3.23
org.springframework:spring-context-support;5.3.23
org.springframework:spring-context;5.3.23
Expand All @@ -167,8 +167,8 @@ org.springframework:spring-tx;5.3.23
org.springframework:spring-web;5.3.23
org.springframework:spring-webmvc;5.3.23
org.springframework:spring-test;5.3.23
org.springframework.retry:spring-retry;1.3.3
org.springframework.boot:spring-boot-starter-parent;2.7.4
org.springframework.retry:spring-retry;1.3.4
org.springframework.boot:spring-boot-starter-parent;2.7.5

## Spring cloud dependency versions
org.springframework.cloud:spring-cloud-dependencies;2021.0.4
Expand Down Expand Up @@ -212,7 +212,7 @@ io.opentelemetry:opentelemetry-exporter-otlp;1.14.0
io.opentelemetry:opentelemetry-sdk-testing;1.14.0
io.opentelemetry:opentelemetry-sdk-extension-autoconfigure;1.14.0-alpha
io.opentelemetry:opentelemetry-sdk-logs;1.14.0-alpha
io.projectreactor:reactor-test;3.4.23
io.projectreactor:reactor-test;3.4.24
junit:junit;4.13.2
commons-cli:commons-cli;1.3
org.apache.maven:maven-compat;3.6.2
Expand Down
32 changes: 16 additions & 16 deletions sdk/aot/azure-aot-graalvm-support-netty/pom.xml
Expand Up @@ -63,44 +63,44 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
<version>4.1.82.Final</version> <!-- {x-version-update;io.netty:netty-handler;external_dependency} -->
<version>4.1.84.Final</version> <!-- {x-version-update;io.netty:netty-handler;external_dependency} -->
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler-proxy</artifactId>
<version>4.1.82.Final</version> <!-- {x-version-update;io.netty:netty-handler-proxy;external_dependency} -->
<version>4.1.84.Final</version> <!-- {x-version-update;io.netty:netty-handler-proxy;external_dependency} -->
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
<version>4.1.82.Final</version> <!-- {x-version-update;io.netty:netty-buffer;external_dependency} -->
<version>4.1.84.Final</version> <!-- {x-version-update;io.netty:netty-buffer;external_dependency} -->
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId>
<version>4.1.82.Final</version> <!-- {x-version-update;io.netty:netty-codec-http;external_dependency} -->
<version>4.1.84.Final</version> <!-- {x-version-update;io.netty:netty-codec-http;external_dependency} -->
</dependency>

<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http2</artifactId>
<version>4.1.82.Final</version> <!-- {x-version-update;io.netty:netty-codec-http2;external_dependency} -->
<version>4.1.84.Final</version> <!-- {x-version-update;io.netty:netty-codec-http2;external_dependency} -->
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-unix-common</artifactId>
<version>4.1.82.Final</version> <!-- {x-version-update;io.netty:netty-transport-native-unix-common;external_dependency} -->
<version>4.1.84.Final</version> <!-- {x-version-update;io.netty:netty-transport-native-unix-common;external_dependency} -->
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
<version>4.1.82.Final</version> <!-- {x-version-update;io.netty:netty-transport-native-epoll;external_dependency} -->
<version>4.1.84.Final</version> <!-- {x-version-update;io.netty:netty-transport-native-epoll;external_dependency} -->
<classifier>linux-x86_64</classifier>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-kqueue</artifactId>
<version>4.1.82.Final</version> <!-- {x-version-update;io.netty:netty-transport-native-kqueue;external_dependency} -->
<version>4.1.84.Final</version> <!-- {x-version-update;io.netty:netty-transport-native-kqueue;external_dependency} -->
<classifier>osx-x86_64</classifier>
</dependency>
</dependencies>
Expand All @@ -115,14 +115,14 @@
<rules>
<bannedDependencies>
<includes>
<include>io.netty:netty-buffer:[4.1.82.Final]</include> <!-- {x-include-update;io.netty:netty-buffer;external_dependency} -->
<include>io.netty:netty-codec-http:[4.1.82.Final]</include> <!-- {x-include-update;io.netty:netty-codec-http;external_dependency} -->
<include>io.netty:netty-codec-http2:[4.1.82.Final]</include> <!-- {x-include-update;io.netty:netty-codec-http2;external_dependency} -->
<include>io.netty:netty-handler:[4.1.82.Final]</include> <!-- {x-include-update;io.netty:netty-handler;external_dependency} -->
<include>io.netty:netty-handler-proxy:[4.1.82.Final]</include> <!-- {x-include-update;io.netty:netty-handler-proxy;external_dependency} -->
<include>io.netty:netty-transport-native-unix-common:[4.1.82.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-unix-common;external_dependency} -->
<include>io.netty:netty-transport-native-epoll:[4.1.82.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-epoll;external_dependency} -->
<include>io.netty:netty-transport-native-kqueue:[4.1.82.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-kqueue;external_dependency} -->
<include>io.netty:netty-buffer:[4.1.84.Final]</include> <!-- {x-include-update;io.netty:netty-buffer;external_dependency} -->
<include>io.netty:netty-codec-http:[4.1.84.Final]</include> <!-- {x-include-update;io.netty:netty-codec-http;external_dependency} -->
<include>io.netty:netty-codec-http2:[4.1.84.Final]</include> <!-- {x-include-update;io.netty:netty-codec-http2;external_dependency} -->
<include>io.netty:netty-handler:[4.1.84.Final]</include> <!-- {x-include-update;io.netty:netty-handler;external_dependency} -->
<include>io.netty:netty-handler-proxy:[4.1.84.Final]</include> <!-- {x-include-update;io.netty:netty-handler-proxy;external_dependency} -->
<include>io.netty:netty-transport-native-unix-common:[4.1.84.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-unix-common;external_dependency} -->
<include>io.netty:netty-transport-native-epoll:[4.1.84.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-epoll;external_dependency} -->
<include>io.netty:netty-transport-native-kqueue:[4.1.84.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-kqueue;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
Expand Down
2 changes: 1 addition & 1 deletion sdk/appconfiguration/azure-data-appconfiguration/pom.xml
Expand Up @@ -93,7 +93,7 @@
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-test</artifactId>
<version>3.4.23</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
<version>3.4.24</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
Expand Down
Expand Up @@ -31,12 +31,12 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>2.7.4</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-web;external_dependency} -->
<version>2.7.5</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-web;external_dependency} -->
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
<version>2.7.4</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-actuator;external_dependency} -->
<version>2.7.5</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-actuator;external_dependency} -->
<optional>true</optional>
</dependency>
<dependency>
Expand Down Expand Up @@ -72,7 +72,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<version>2.7.4</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-test;external_dependency} -->
<version>2.7.5</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-test;external_dependency} -->
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -87,8 +87,8 @@
<rules>
<bannedDependencies>
<includes>
<include>org.springframework.boot:spring-boot-starter-actuator:[2.7.4]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-actuator;external_dependency} -->
<include>org.springframework.boot:spring-boot-starter-web:[2.7.4]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-web;external_dependency} -->
<include>org.springframework.boot:spring-boot-starter-actuator:[2.7.5]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-actuator;external_dependency} -->
<include>org.springframework.boot:spring-boot-starter-web:[2.7.5]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-web;external_dependency} -->
<include>org.springframework.cloud:spring-cloud-bus:[3.1.2]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-bus;external_dependency} -->
</includes>
</bannedDependencies>
Expand Down