Skip to content

Commit

Permalink
Upgrade external dependencies to align with Spring Boot 2.7.16 (#36946)
Browse files Browse the repository at this point in the history
Co-authored-by: github-actions <[email protected]>
  • Loading branch information
Netyyyy and github-actions authored Oct 7, 2023
1 parent 6208c0d commit 71acaae
Show file tree
Hide file tree
Showing 118 changed files with 729 additions and 728 deletions.
2 changes: 1 addition & 1 deletion common/perf-test-core/pom.xml
Original file line number Diff line number Diff line change
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.31]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
<include>io.projectreactor:reactor-core:[3.4.32]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
Expand Down
138 changes: 69 additions & 69 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.14_managed_external_dependencies.txt
# If your version is different from sdk/spring/scripts/spring_boot_2.7.14_managed_external_dependencies.txt,
# make sure the version is same to sdk/spring/scripts/spring_boot_2.7.16_managed_external_dependencies.txt
# If your version is different from sdk/spring/scripts/spring_boot_2.7.16_managed_external_dependencies.txt,
# please discuss with Spring Integration team members:
# @chenrujun (rujche), @saragluna (xiada), @yiliuTo (yiliu6), @backwind1233 (zhihaoguo).
# Thanks.
Expand Down Expand Up @@ -51,25 +51,25 @@ commons-net:commons-net;3.9.0
io.cloudevents:cloudevents-api;2.2.0
io.cloudevents:cloudevents-core;2.2.0
io.fabric8:kubernetes-client;5.12.3
io.micrometer:micrometer-core;1.9.13
io.micrometer:micrometer-registry-azure-monitor;1.9.13
io.micrometer:micrometer-registry-graphite;1.9.13
io.netty:netty-buffer;4.1.94.Final
io.netty:netty-common;4.1.94.Final
io.netty:netty-codec;4.1.94.Final
io.netty:netty-codec-http;4.1.94.Final
io.netty:netty-codec-http2;4.1.94.Final
io.netty:netty-transport;4.1.94.Final
io.netty:netty-handler;4.1.94.Final
io.netty:netty-handler-proxy;4.1.94.Final
io.micrometer:micrometer-core;1.9.15
io.micrometer:micrometer-registry-azure-monitor;1.9.15
io.micrometer:micrometer-registry-graphite;1.9.15
io.netty:netty-buffer;4.1.97.Final
io.netty:netty-common;4.1.97.Final
io.netty:netty-codec;4.1.97.Final
io.netty:netty-codec-http;4.1.97.Final
io.netty:netty-codec-http2;4.1.97.Final
io.netty:netty-transport;4.1.97.Final
io.netty:netty-handler;4.1.97.Final
io.netty:netty-handler-proxy;4.1.97.Final
io.netty:netty-tcnative;2.0.61.Final
io.netty:netty-tcnative-boringssl-static;2.0.61.Final
io.netty:netty-transport-native-epoll;4.1.94.Final
io.netty:netty-transport-native-unix-common;4.1.94.Final
io.netty:netty-transport-native-kqueue;4.1.94.Final
io.projectreactor.netty:reactor-netty;1.0.34
io.projectreactor.netty:reactor-netty-http;1.0.34
io.projectreactor:reactor-core;3.4.31
io.netty:netty-transport-native-epoll;4.1.97.Final
io.netty:netty-transport-native-unix-common;4.1.97.Final
io.netty:netty-transport-native-kqueue;4.1.97.Final
io.projectreactor.netty:reactor-netty;1.0.36
io.projectreactor.netty:reactor-netty-http;1.0.36
io.projectreactor:reactor-core;3.4.32
io.vertx:vertx-codegen;4.4.4
io.vertx:vertx-core;4.4.4
jakarta.validation:jakarta.validation-api;2.0.2
Expand All @@ -94,7 +94,7 @@ org.apache.qpid:qpid-jms-client;0.53.0
org.apache.tinkerpop:gremlin-driver;3.2.4
org.asynchttpclient:async-http-client;2.12.1
org.codehaus.gmavenplus:gmavenplus-plugin;2.1.0
org.codehaus.groovy:groovy-jsr223;3.0.18
org.codehaus.groovy:groovy-jsr223;3.0.19
org.codehaus.janino:janino;3.1.10
org.conscrypt:conscrypt-openjdk-uber;2.2.1
org.glassfish.tyrus:tyrus-client;1.16
Expand All @@ -118,55 +118,55 @@ testdep_net.bytebuddy:byte-buddy;1.14.8
testdep_net.bytebuddy:byte-buddy-agent;1.14.8

## Spring boot dependency versions
org.springframework.boot:spring-boot-dependencies;2.7.14
org.springframework.boot:spring-boot-actuator;2.7.14
org.springframework.boot:spring-boot-actuator-autoconfigure;2.7.14
org.springframework.boot:spring-boot-autoconfigure-processor;2.7.14
org.springframework.boot:spring-boot-autoconfigure;2.7.14
org.springframework.boot:spring-boot-configuration-metadata;2.7.14
org.springframework.boot:spring-boot-configuration-processor;2.7.14
org.springframework.boot:spring-boot-maven-plugin;2.7.14
org.springframework.boot:spring-boot-starter-actuator;2.7.14
org.springframework.boot:spring-boot-starter-aop;2.7.14
org.springframework.boot:spring-boot-starter-cache;2.7.14
org.springframework.boot:spring-boot-starter-data-redis;2.7.14
org.springframework.boot:spring-boot-starter-data-jdbc;2.7.14
org.springframework.boot:spring-boot-starter-integration;2.7.14
org.springframework.boot:spring-boot-starter-logging;2.7.14
org.springframework.boot:spring-boot-starter-test;2.7.14
org.springframework.boot:spring-boot-starter-validation;2.7.14
org.springframework.boot:spring-boot-starter-web;2.7.14
org.springframework.boot:spring-boot-starter;2.7.14
org.springframework.boot:spring-boot-test;2.7.14
org.springframework.boot:spring-boot;2.7.14
org.springframework.data:spring-data-commons;2.7.14
org.springframework.data:spring-data-mongodb;3.4.14
org.springframework.data:spring-data-redis;2.7.14
org.springframework.boot:spring-boot-dependencies;2.7.16
org.springframework.boot:spring-boot-actuator;2.7.16
org.springframework.boot:spring-boot-actuator-autoconfigure;2.7.16
org.springframework.boot:spring-boot-autoconfigure-processor;2.7.16
org.springframework.boot:spring-boot-autoconfigure;2.7.16
org.springframework.boot:spring-boot-configuration-metadata;2.7.16
org.springframework.boot:spring-boot-configuration-processor;2.7.16
org.springframework.boot:spring-boot-maven-plugin;2.7.16
org.springframework.boot:spring-boot-starter-actuator;2.7.16
org.springframework.boot:spring-boot-starter-aop;2.7.16
org.springframework.boot:spring-boot-starter-cache;2.7.16
org.springframework.boot:spring-boot-starter-data-redis;2.7.16
org.springframework.boot:spring-boot-starter-data-jdbc;2.7.16
org.springframework.boot:spring-boot-starter-integration;2.7.16
org.springframework.boot:spring-boot-starter-logging;2.7.16
org.springframework.boot:spring-boot-starter-test;2.7.16
org.springframework.boot:spring-boot-starter-validation;2.7.16
org.springframework.boot:spring-boot-starter-web;2.7.16
org.springframework.boot:spring-boot-starter;2.7.16
org.springframework.boot:spring-boot-test;2.7.16
org.springframework.boot:spring-boot;2.7.16
org.springframework.data:spring-data-commons;2.7.16
org.springframework.data:spring-data-mongodb;3.4.16
org.springframework.data:spring-data-redis;2.7.16
org.springframework.experimental:spring-aot;0.11.4
org.springframework.experimental:spring-aot-maven-plugin;0.11.4
org.springframework.integration:spring-integration-core;5.5.18
org.springframework.integration:spring-integration-core;5.5.19
org.springframework.kafka:spring-kafka;2.9.11
org.springframework.security:spring-security-config;5.7.10
org.springframework.security:spring-security-core;5.7.10
org.springframework.security:spring-security-oauth2-client;5.7.10
org.springframework.security:spring-security-oauth2-resource-server;5.7.10
org.springframework.security:spring-security-oauth2-core;5.7.10
org.springframework.security:spring-security-oauth2-jose;5.7.10
org.springframework.security:spring-security-web;5.7.10
org.springframework:spring-beans;5.3.29
org.springframework:spring-context-support;5.3.29
org.springframework:spring-context;5.3.29
org.springframework:spring-core;5.3.29
org.springframework:spring-expression;5.3.29
org.springframework:spring-jdbc;5.3.29
org.springframework:spring-jms;5.3.29
org.springframework:spring-messaging;5.3.29
org.springframework:spring-tx;5.3.29
org.springframework:spring-web;5.3.29
org.springframework:spring-webmvc;5.3.29
org.springframework:spring-test;5.3.29
org.springframework.security:spring-security-config;5.7.11
org.springframework.security:spring-security-core;5.7.11
org.springframework.security:spring-security-oauth2-client;5.7.11
org.springframework.security:spring-security-oauth2-resource-server;5.7.11
org.springframework.security:spring-security-oauth2-core;5.7.11
org.springframework.security:spring-security-oauth2-jose;5.7.11
org.springframework.security:spring-security-web;5.7.11
org.springframework:spring-beans;5.3.30
org.springframework:spring-context-support;5.3.30
org.springframework:spring-context;5.3.30
org.springframework:spring-core;5.3.30
org.springframework:spring-expression;5.3.30
org.springframework:spring-jdbc;5.3.30
org.springframework:spring-jms;5.3.30
org.springframework:spring-messaging;5.3.30
org.springframework:spring-tx;5.3.30
org.springframework:spring-web;5.3.30
org.springframework:spring-webmvc;5.3.30
org.springframework:spring-test;5.3.30
org.springframework.retry:spring-retry;1.3.4
org.springframework.boot:spring-boot-starter-parent;2.7.14
org.springframework.boot:spring-boot-starter-parent;2.7.16

## Spring cloud dependency versions
org.springframework.cloud:spring-cloud-dependencies;2021.0.8
Expand Down Expand Up @@ -211,7 +211,7 @@ io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java8;1.28.0-al
io.opentelemetry.instrumentation:opentelemetry-spring-boot-starter;1.28.0-alpha
io.opentelemetry.instrumentation:opentelemetry-jdbc;1.28.0-alpha
io.opentelemetry.instrumentation:opentelemetry-logback-appender-1.0;1.28.0-alpha
io.projectreactor:reactor-test;3.4.31
io.projectreactor:reactor-test;3.4.32
io.github.hakky54:logcaptor;2.9.0
com.squareup.okio:okio;3.5.0
junit:junit;4.13.2
Expand All @@ -220,9 +220,9 @@ org.assertj:assertj-core;3.22.0
org.bouncycastle:bcprov-jdk15to18;1.76
org.bouncycastle:bcprov-jdk18on;1.76
org.bouncycastle:bcpkix-lts8on;2.73.3
org.eclipse.jetty:jetty-http;9.4.51.v20230217
org.eclipse.jetty:jetty-server;9.4.51.v20230217
org.eclipse.jetty:jetty-servlet;9.4.51.v20230217
org.eclipse.jetty:jetty-http;9.4.52.v20230823
org.eclipse.jetty:jetty-server;9.4.52.v20230823
org.eclipse.jetty:jetty-servlet;9.4.52.v20230823
org.eclipse.jgit:org.eclipse.jgit;4.5.7.201904151645-r
org.glassfish:javax.json;1.1.4
org.glassfish:jakarta.el;3.0.4
Expand Down
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
Expand Up @@ -66,44 +66,44 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
<version>4.1.94.Final</version> <!-- {x-version-update;io.netty:netty-handler;external_dependency} -->
<version>4.1.97.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.94.Final</version> <!-- {x-version-update;io.netty:netty-handler-proxy;external_dependency} -->
<version>4.1.97.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.94.Final</version> <!-- {x-version-update;io.netty:netty-buffer;external_dependency} -->
<version>4.1.97.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.94.Final</version> <!-- {x-version-update;io.netty:netty-codec-http;external_dependency} -->
<version>4.1.97.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.94.Final</version> <!-- {x-version-update;io.netty:netty-codec-http2;external_dependency} -->
<version>4.1.97.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.94.Final</version> <!-- {x-version-update;io.netty:netty-transport-native-unix-common;external_dependency} -->
<version>4.1.97.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.94.Final</version> <!-- {x-version-update;io.netty:netty-transport-native-epoll;external_dependency} -->
<version>4.1.97.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.94.Final</version> <!-- {x-version-update;io.netty:netty-transport-native-kqueue;external_dependency} -->
<version>4.1.97.Final</version> <!-- {x-version-update;io.netty:netty-transport-native-kqueue;external_dependency} -->
<classifier>osx-x86_64</classifier>
</dependency>
</dependencies>
Expand All @@ -118,14 +118,14 @@
<rules>
<bannedDependencies>
<includes>
<include>io.netty:netty-buffer:[4.1.94.Final]</include> <!-- {x-include-update;io.netty:netty-buffer;external_dependency} -->
<include>io.netty:netty-codec-http:[4.1.94.Final]</include> <!-- {x-include-update;io.netty:netty-codec-http;external_dependency} -->
<include>io.netty:netty-codec-http2:[4.1.94.Final]</include> <!-- {x-include-update;io.netty:netty-codec-http2;external_dependency} -->
<include>io.netty:netty-handler:[4.1.94.Final]</include> <!-- {x-include-update;io.netty:netty-handler;external_dependency} -->
<include>io.netty:netty-handler-proxy:[4.1.94.Final]</include> <!-- {x-include-update;io.netty:netty-handler-proxy;external_dependency} -->
<include>io.netty:netty-transport-native-unix-common:[4.1.94.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-unix-common;external_dependency} -->
<include>io.netty:netty-transport-native-epoll:[4.1.94.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-epoll;external_dependency} -->
<include>io.netty:netty-transport-native-kqueue:[4.1.94.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-kqueue;external_dependency} -->
<include>io.netty:netty-buffer:[4.1.97.Final]</include> <!-- {x-include-update;io.netty:netty-buffer;external_dependency} -->
<include>io.netty:netty-codec-http:[4.1.97.Final]</include> <!-- {x-include-update;io.netty:netty-codec-http;external_dependency} -->
<include>io.netty:netty-codec-http2:[4.1.97.Final]</include> <!-- {x-include-update;io.netty:netty-codec-http2;external_dependency} -->
<include>io.netty:netty-handler:[4.1.97.Final]</include> <!-- {x-include-update;io.netty:netty-handler;external_dependency} -->
<include>io.netty:netty-handler-proxy:[4.1.97.Final]</include> <!-- {x-include-update;io.netty:netty-handler-proxy;external_dependency} -->
<include>io.netty:netty-transport-native-unix-common:[4.1.97.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-unix-common;external_dependency} -->
<include>io.netty:netty-transport-native-epoll:[4.1.97.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-epoll;external_dependency} -->
<include>io.netty:netty-transport-native-kqueue:[4.1.97.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
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-test</artifactId>
<version>3.4.31</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
<version>3.4.32</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-test</artifactId>
<version>3.4.31</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
<version>3.4.32</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-test</artifactId>
<version>3.4.31</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
<version>3.4.32</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion sdk/communication/azure-communication-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-test</artifactId>
<version>3.4.31</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
<version>3.4.32</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion sdk/communication/azure-communication-identity/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-test</artifactId>
<version>3.4.31</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
<version>3.4.32</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion sdk/communication/azure-communication-jobrouter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-test</artifactId>
<version>3.4.31</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
<version>3.4.32</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-test</artifactId>
<version>3.4.31</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
<version>3.4.32</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion sdk/communication/azure-communication-phonenumbers/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-test</artifactId>
<version>3.4.31</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
<version>3.4.32</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion sdk/communication/azure-communication-rooms/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-test</artifactId>
<version>3.4.31</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
<version>3.4.32</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
Expand Down
Loading

0 comments on commit 71acaae

Please sign in to comment.