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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

External dependencies upgrade - Spring Boot 2.7.2 and Spring Cloud 2021.0.3 #30150

Merged
merged 1 commit into from
Jul 27, 2022
Merged
Changes from all commits
Commits
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
Upgrade external dependencies to align with Spring Boot 2.7.2
github-actions committed Jul 27, 2022
commit e1d2d16dd6cea98a18a958ff85e9b953d9eaf87f
2 changes: 1 addition & 1 deletion common/perf-test-core/pom.xml
Original file line number Diff line number Diff line change
@@ -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.19]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
<include>io.projectreactor:reactor-core:[3.4.21]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
112 changes: 56 additions & 56 deletions eng/versioning/external_dependencies.txt
Original file line number Diff line number Diff line change
@@ -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.1_managed_external_dependencies.txt
# If your version is different from sdk/spring/scripts/spring_boot_2.7.1_managed_external_dependencies.txt,
# make sure the version is same to sdk/spring/scripts/spring_boot_2.7.2_managed_external_dependencies.txt
# If your version is different from sdk/spring/scripts/spring_boot_2.7.2_managed_external_dependencies.txt,
# please discuss with Spring Integration team members:
# @chenrujun (rujche), @saragluna (xiada), @yiliuTo (yiliu6), @backwind1233 (zhihaoguo).
# Thanks.
@@ -47,24 +47,24 @@ io.cloudevents:cloudevents-api;2.2.0
io.cloudevents:cloudevents-core;2.2.0
io.fabric8:kubernetes-client;5.10.2
io.github.bonigarcia:webdrivermanager;4.3.1
io.micrometer:micrometer-core;1.9.1
io.micrometer:micrometer-registry-azure-monitor;1.9.1
io.micrometer:micrometer-registry-graphite;1.9.1
io.netty:netty-buffer;4.1.78.Final
io.netty:netty-common;4.1.78.Final
io.netty:netty-codec-http;4.1.78.Final
io.netty:netty-codec-http2;4.1.78.Final
io.netty:netty-transport;4.1.78.Final
io.netty:netty-handler;4.1.78.Final
io.netty:netty-handler-proxy;4.1.78.Final
io.micrometer:micrometer-core;1.9.2
io.micrometer:micrometer-registry-azure-monitor;1.9.2
io.micrometer:micrometer-registry-graphite;1.9.2
io.netty:netty-buffer;4.1.79.Final
io.netty:netty-common;4.1.79.Final
io.netty:netty-codec-http;4.1.79.Final
io.netty:netty-codec-http2;4.1.79.Final
io.netty:netty-transport;4.1.79.Final
io.netty:netty-handler;4.1.79.Final
io.netty:netty-handler-proxy;4.1.79.Final
io.netty:netty-tcnative;2.0.53.Final
io.netty:netty-tcnative-boringssl-static;2.0.53.Final
io.netty:netty-transport-native-epoll;4.1.78.Final
io.netty:netty-transport-native-unix-common;4.1.78.Final
io.netty:netty-transport-native-kqueue;4.1.78.Final
io.projectreactor.netty:reactor-netty;1.0.20
io.projectreactor.netty:reactor-netty-http;1.0.20
io.projectreactor:reactor-core;3.4.19
io.netty:netty-transport-native-epoll;4.1.79.Final
io.netty:netty-transport-native-unix-common;4.1.79.Final
io.netty:netty-transport-native-kqueue;4.1.79.Final
io.projectreactor.netty:reactor-netty;1.0.21
io.projectreactor.netty:reactor-netty-http;1.0.21
io.projectreactor:reactor-core;3.4.21
io.reactivex:rxjava;1.3.8
io.vertx:vertx-codegen;4.2.7
io.vertx:vertx-core;4.2.7
@@ -118,52 +118,52 @@ org.slf4j:slf4j-simple;1.7.36
redis.clients:jedis;4.2.3

## Spring boot dependency versions
org.springframework.boot:spring-boot-dependencies;2.7.1
org.springframework.boot:spring-boot-actuator;2.7.1
org.springframework.boot:spring-boot-actuator-autoconfigure;2.7.1
org.springframework.boot:spring-boot-autoconfigure-processor;2.7.1
org.springframework.boot:spring-boot-autoconfigure;2.7.1
org.springframework.boot:spring-boot-configuration-metadata;2.7.1
org.springframework.boot:spring-boot-configuration-processor;2.7.1
org.springframework.boot:spring-boot-starter-actuator;2.7.1
org.springframework.boot:spring-boot-starter-aop;2.7.1
org.springframework.boot:spring-boot-starter-cache;2.7.1
org.springframework.boot:spring-boot-starter-data-redis;2.7.1
org.springframework.boot:spring-boot-starter-integration;2.7.1
org.springframework.boot:spring-boot-starter-logging;2.7.1
org.springframework.boot:spring-boot-starter-test;2.7.1
org.springframework.boot:spring-boot-starter-validation;2.7.1
org.springframework.boot:spring-boot-starter-web;2.7.1
org.springframework.boot:spring-boot-starter;2.7.1
org.springframework.boot:spring-boot-test;2.7.1
org.springframework.boot:spring-boot;2.7.1
org.springframework.data:spring-data-commons;2.7.1
org.springframework.data:spring-data-mongodb;3.4.1
org.springframework.data:spring-data-redis;2.7.1
org.springframework.boot:spring-boot-dependencies;2.7.2
org.springframework.boot:spring-boot-actuator;2.7.2
org.springframework.boot:spring-boot-actuator-autoconfigure;2.7.2
org.springframework.boot:spring-boot-autoconfigure-processor;2.7.2
org.springframework.boot:spring-boot-autoconfigure;2.7.2
org.springframework.boot:spring-boot-configuration-metadata;2.7.2
org.springframework.boot:spring-boot-configuration-processor;2.7.2
org.springframework.boot:spring-boot-starter-actuator;2.7.2
org.springframework.boot:spring-boot-starter-aop;2.7.2
org.springframework.boot:spring-boot-starter-cache;2.7.2
org.springframework.boot:spring-boot-starter-data-redis;2.7.2
org.springframework.boot:spring-boot-starter-integration;2.7.2
org.springframework.boot:spring-boot-starter-logging;2.7.2
org.springframework.boot:spring-boot-starter-test;2.7.2
org.springframework.boot:spring-boot-starter-validation;2.7.2
org.springframework.boot:spring-boot-starter-web;2.7.2
org.springframework.boot:spring-boot-starter;2.7.2
org.springframework.boot:spring-boot-test;2.7.2
org.springframework.boot:spring-boot;2.7.2
org.springframework.data:spring-data-commons;2.7.2
org.springframework.data:spring-data-mongodb;3.4.2
org.springframework.data:spring-data-redis;2.7.2
org.springframework.experimental:spring-aot;0.11.4
org.springframework.integration:spring-integration-core;5.5.13
org.springframework.kafka:spring-kafka;2.8.7
org.springframework.integration:spring-integration-core;5.5.14
org.springframework.kafka:spring-kafka;2.8.8
org.springframework.security:spring-security-config;5.7.2
org.springframework.security:spring-security-core;5.7.2
org.springframework.security:spring-security-oauth2-client;5.7.2
org.springframework.security:spring-security-oauth2-resource-server;5.7.2
org.springframework.security:spring-security-oauth2-core;5.7.2
org.springframework.security:spring-security-oauth2-jose;5.7.2
org.springframework.security:spring-security-web;5.7.2
org.springframework:spring-beans;5.3.21
org.springframework:spring-context-support;5.3.21
org.springframework:spring-context;5.3.21
org.springframework:spring-core;5.3.21
org.springframework:spring-expression;5.3.21
org.springframework:spring-jdbc;5.3.21
org.springframework:spring-jms;5.3.21
org.springframework:spring-messaging;5.3.21
org.springframework:spring-tx;5.3.21
org.springframework:spring-web;5.3.21
org.springframework:spring-webmvc;5.3.21
org.springframework:spring-test;5.3.21
org.springframework:spring-beans;5.3.22
org.springframework:spring-context-support;5.3.22
org.springframework:spring-context;5.3.22
org.springframework:spring-core;5.3.22
org.springframework:spring-expression;5.3.22
org.springframework:spring-jdbc;5.3.22
org.springframework:spring-jms;5.3.22
org.springframework:spring-messaging;5.3.22
org.springframework:spring-tx;5.3.22
org.springframework:spring-web;5.3.22
org.springframework:spring-webmvc;5.3.22
org.springframework:spring-test;5.3.22
org.springframework.retry:spring-retry;1.3.3
org.springframework.boot:spring-boot-starter-parent;2.7.1
org.springframework.boot:spring-boot-starter-parent;2.7.2

## Spring cloud dependency versions
org.springframework.cloud:spring-cloud-dependencies;2021.0.3
@@ -206,7 +206,7 @@ io.opentelemetry:opentelemetry-exporter-jaeger;1.14.0
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.projectreactor:reactor-test;3.4.19
io.projectreactor:reactor-test;3.4.21
junit:junit;4.13.2
commons-cli:commons-cli;1.3
org.apache.maven:maven-compat;3.6.2
32 changes: 16 additions & 16 deletions sdk/aot/azure-aot-graalvm-support-netty/pom.xml
Original file line number Diff line number Diff line change
@@ -63,44 +63,44 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
<version>4.1.78.Final</version> <!-- {x-version-update;io.netty:netty-handler;external_dependency} -->
<version>4.1.79.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.78.Final</version> <!-- {x-version-update;io.netty:netty-handler-proxy;external_dependency} -->
<version>4.1.79.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.78.Final</version> <!-- {x-version-update;io.netty:netty-buffer;external_dependency} -->
<version>4.1.79.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.78.Final</version> <!-- {x-version-update;io.netty:netty-codec-http;external_dependency} -->
<version>4.1.79.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.78.Final</version> <!-- {x-version-update;io.netty:netty-codec-http2;external_dependency} -->
<version>4.1.79.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.78.Final</version> <!-- {x-version-update;io.netty:netty-transport-native-unix-common;external_dependency} -->
<version>4.1.79.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.78.Final</version> <!-- {x-version-update;io.netty:netty-transport-native-epoll;external_dependency} -->
<version>4.1.79.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.78.Final</version> <!-- {x-version-update;io.netty:netty-transport-native-kqueue;external_dependency} -->
<version>4.1.79.Final</version> <!-- {x-version-update;io.netty:netty-transport-native-kqueue;external_dependency} -->
<classifier>osx-x86_64</classifier>
</dependency>
</dependencies>
@@ -115,14 +115,14 @@
<rules>
<bannedDependencies>
<includes>
<include>io.netty:netty-buffer:[4.1.78.Final]</include> <!-- {x-include-update;io.netty:netty-buffer;external_dependency} -->
<include>io.netty:netty-codec-http:[4.1.78.Final]</include> <!-- {x-include-update;io.netty:netty-codec-http;external_dependency} -->
<include>io.netty:netty-codec-http2:[4.1.78.Final]</include> <!-- {x-include-update;io.netty:netty-codec-http2;external_dependency} -->
<include>io.netty:netty-handler:[4.1.78.Final]</include> <!-- {x-include-update;io.netty:netty-handler;external_dependency} -->
<include>io.netty:netty-handler-proxy:[4.1.78.Final]</include> <!-- {x-include-update;io.netty:netty-handler-proxy;external_dependency} -->
<include>io.netty:netty-transport-native-unix-common:[4.1.78.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-unix-common;external_dependency} -->
<include>io.netty:netty-transport-native-epoll:[4.1.78.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-epoll;external_dependency} -->
<include>io.netty:netty-transport-native-kqueue:[4.1.78.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-kqueue;external_dependency} -->
<include>io.netty:netty-buffer:[4.1.79.Final]</include> <!-- {x-include-update;io.netty:netty-buffer;external_dependency} -->
<include>io.netty:netty-codec-http:[4.1.79.Final]</include> <!-- {x-include-update;io.netty:netty-codec-http;external_dependency} -->
<include>io.netty:netty-codec-http2:[4.1.79.Final]</include> <!-- {x-include-update;io.netty:netty-codec-http2;external_dependency} -->
<include>io.netty:netty-handler:[4.1.79.Final]</include> <!-- {x-include-update;io.netty:netty-handler;external_dependency} -->
<include>io.netty:netty-handler-proxy:[4.1.79.Final]</include> <!-- {x-include-update;io.netty:netty-handler-proxy;external_dependency} -->
<include>io.netty:netty-transport-native-unix-common:[4.1.79.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-unix-common;external_dependency} -->
<include>io.netty:netty-transport-native-epoll:[4.1.79.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-epoll;external_dependency} -->
<include>io.netty:netty-transport-native-kqueue:[4.1.79.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-kqueue;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
2 changes: 1 addition & 1 deletion sdk/appconfiguration/azure-data-appconfiguration/pom.xml
Original file line number Diff line number Diff line change
@@ -93,7 +93,7 @@
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-test</artifactId>
<version>3.4.19</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
<version>3.4.21</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
Original file line number Diff line number Diff line change
@@ -31,12 +31,12 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>2.7.1</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-web;external_dependency} -->
<version>2.7.2</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.1</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-actuator;external_dependency} -->
<version>2.7.2</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-actuator;external_dependency} -->
<optional>true</optional>
</dependency>
<dependency>
@@ -72,7 +72,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<version>2.7.1</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-test;external_dependency} -->
<version>2.7.2</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-test;external_dependency} -->
<scope>test</scope>
</dependency>
</dependencies>
@@ -87,8 +87,8 @@
<rules>
<bannedDependencies>
<includes>
<include>org.springframework.boot:spring-boot-starter-actuator:[2.7.1]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-actuator;external_dependency} -->
<include>org.springframework.boot:spring-boot-starter-web:[2.7.1]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-web;external_dependency} -->
<include>org.springframework.boot:spring-boot-starter-actuator:[2.7.2]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-actuator;external_dependency} -->
<include>org.springframework.boot:spring-boot-starter-web:[2.7.2]</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>
Loading