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.6 and Spring Cloud 2021.0.5 #32341

Merged
merged 6 commits into from Dec 2, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
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.25]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
Expand Down
141 changes: 71 additions & 70 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.6_managed_external_dependencies.txt
# If your version is different from sdk/spring/scripts/spring_boot_2.7.6_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,24 +51,25 @@ 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.6
io.micrometer:micrometer-registry-azure-monitor;1.9.6
io.micrometer:micrometer-registry-graphite;1.9.6
io.netty:netty-buffer;4.1.85.Final
io.netty:netty-common;4.1.85.Final
io.netty:netty-codec;4.1.85.Final
io.netty:netty-codec-http;4.1.85.Final
io.netty:netty-codec-http2;4.1.85.Final
io.netty:netty-transport;4.1.85.Final
io.netty:netty-handler;4.1.85.Final
io.netty:netty-handler-proxy;4.1.85.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.85.Final
io.netty:netty-transport-native-unix-common;4.1.85.Final
io.netty:netty-transport-native-kqueue;4.1.85.Final
io.projectreactor.netty:reactor-netty;1.0.25
io.projectreactor.netty:reactor-netty-http;1.0.25
io.projectreactor:reactor-core;3.4.25
io.reactivex:rxjava;1.3.8
io.vertx:vertx-codegen;4.3.3
io.vertx:vertx-core;4.3.3
Expand Down Expand Up @@ -98,7 +99,7 @@ org.apache.tinkerpop:gremlin-driver;3.2.4
org.asynchttpclient:async-http-client;2.12.1
org.codehaus.gmavenplus:gmavenplus-plugin;2.0.0
org.codehaus.groovy:groovy-jsr223;3.0.13
org.codehaus.janino:janino;3.1.8
org.codehaus.janino:janino;3.1.9
org.conscrypt:conscrypt-openjdk-uber;2.2.1
org.glassfish.tyrus:tyrus-client;1.16
org.hibernate.validator:hibernate-validator;6.2.5.Final
Expand All @@ -111,74 +112,74 @@ org.graalvm.nativeimage:svm;22.0.0.2
org.messaginghub:pooled-jms;1.2.4
org.powermock:powermock-api-mockito2;2.0.9
org.powermock:powermock-module-junit4;2.0.9
org.postgresql:postgresql;42.3.7
org.postgresql:postgresql;42.3.8
org.slf4j:slf4j-api;1.7.36
org.slf4j:slf4j-nop;1.7.36
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.19

## 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.6
org.springframework.boot:spring-boot-actuator;2.7.6
org.springframework.boot:spring-boot-actuator-autoconfigure;2.7.6
org.springframework.boot:spring-boot-autoconfigure-processor;2.7.6
org.springframework.boot:spring-boot-autoconfigure;2.7.6
org.springframework.boot:spring-boot-configuration-metadata;2.7.6
org.springframework.boot:spring-boot-configuration-processor;2.7.6
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.6
org.springframework.boot:spring-boot-starter-aop;2.7.6
org.springframework.boot:spring-boot-starter-cache;2.7.6
org.springframework.boot:spring-boot-starter-data-redis;2.7.6
org.springframework.boot:spring-boot-starter-integration;2.7.6
org.springframework.boot:spring-boot-starter-logging;2.7.6
org.springframework.boot:spring-boot-starter-test;2.7.6
org.springframework.boot:spring-boot-starter-validation;2.7.6
org.springframework.boot:spring-boot-starter-web;2.7.6
org.springframework.boot:spring-boot-starter;2.7.6
org.springframework.boot:spring-boot-test;2.7.6
org.springframework.boot:spring-boot;2.7.6
org.springframework.data:spring-data-commons;2.7.6
org.springframework.data:spring-data-mongodb;3.4.6
org.springframework.data:spring-data-redis;2.7.6
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.kafka:spring-kafka;2.8.11
org.springframework.security:spring-security-config;5.7.5
org.springframework.security:spring-security-core;5.7.5
org.springframework.security:spring-security-oauth2-client;5.7.5
org.springframework.security:spring-security-oauth2-resource-server;5.7.5
org.springframework.security:spring-security-oauth2-core;5.7.5
org.springframework.security:spring-security-oauth2-jose;5.7.5
org.springframework.security:spring-security-web;5.7.5
org.springframework:spring-beans;5.3.23
org.springframework:spring-context-support;5.3.23
org.springframework:spring-context;5.3.23
org.springframework:spring-core;5.3.23
org.springframework:spring-expression;5.3.23
org.springframework:spring-jdbc;5.3.23
org.springframework:spring-jms;5.3.23
org.springframework:spring-messaging;5.3.23
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:spring-beans;5.3.24
org.springframework:spring-context-support;5.3.24
org.springframework:spring-context;5.3.24
org.springframework:spring-core;5.3.24
org.springframework:spring-expression;5.3.24
org.springframework:spring-jdbc;5.3.24
org.springframework:spring-jms;5.3.24
org.springframework:spring-messaging;5.3.24
org.springframework:spring-tx;5.3.24
org.springframework:spring-web;5.3.24
org.springframework:spring-webmvc;5.3.24
org.springframework:spring-test;5.3.24
org.springframework.retry:spring-retry;1.3.4
org.springframework.boot:spring-boot-starter-parent;2.7.6

## Spring cloud dependency versions
org.springframework.cloud:spring-cloud-dependencies;2021.0.4
org.springframework.cloud:spring-cloud-starter-bootstrap;3.1.4
org.springframework.cloud:spring-cloud-dependencies;2021.0.5
org.springframework.cloud:spring-cloud-starter-bootstrap;3.1.5
org.springframework.cloud:spring-cloud-bus;3.1.2
org.springframework.cloud:spring-cloud-context;3.1.4
org.springframework.cloud:spring-cloud-sleuth-api;3.1.4
org.springframework.cloud:spring-cloud-starter-sleuth;3.1.4
org.springframework.cloud:spring-cloud-starter-stream-kafka;3.2.5
org.springframework.cloud:spring-cloud-stream-binder-test;3.2.5
org.springframework.cloud:spring-cloud-stream;3.2.5
org.springframework.cloud:spring-cloud-context;3.1.5
org.springframework.cloud:spring-cloud-sleuth-api;3.1.5
org.springframework.cloud:spring-cloud-starter-sleuth;3.1.5
org.springframework.cloud:spring-cloud-starter-stream-kafka;3.2.6
org.springframework.cloud:spring-cloud-stream-binder-test;3.2.6
org.springframework.cloud:spring-cloud-stream;3.2.6

pl.pragmatists:JUnitParams;1.1.1

Expand Down Expand Up @@ -210,7 +211,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-logs;1.14.0-alpha
io.projectreactor:reactor-test;3.4.23
io.projectreactor:reactor-test;3.4.25
junit:junit;4.13.2
commons-cli:commons-cli;1.3
org.apache.maven:maven-compat;3.6.2
Expand Down Expand Up @@ -262,9 +263,9 @@ com.nimbusds:nimbus-jose-jwt;9.22
com.puppycrawl.tools:checkstyle;9.3
commons-io:commons-io;2.11.0
commons-validator:commons-validator;1.6
io.dropwizard.metrics:metrics-core;4.2.12
io.dropwizard.metrics:metrics-graphite;4.2.12
io.dropwizard.metrics:metrics-jvm;4.2.12
io.dropwizard.metrics:metrics-core;4.2.13
io.dropwizard.metrics:metrics-graphite;4.2.13
io.dropwizard.metrics:metrics-jvm;4.2.13
io.reactivex.rxjava2:rxjava;2.2.21
net.java.dev.jna:jna-platform;5.6.0
net.oneandone.reflections8:reflections8;0.11.7
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.85.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.85.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.85.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.85.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.85.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.85.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.85.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.85.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.85.Final]</include> <!-- {x-include-update;io.netty:netty-buffer;external_dependency} -->
<include>io.netty:netty-codec-http:[4.1.85.Final]</include> <!-- {x-include-update;io.netty:netty-codec-http;external_dependency} -->
<include>io.netty:netty-codec-http2:[4.1.85.Final]</include> <!-- {x-include-update;io.netty:netty-codec-http2;external_dependency} -->
<include>io.netty:netty-handler:[4.1.85.Final]</include> <!-- {x-include-update;io.netty:netty-handler;external_dependency} -->
<include>io.netty:netty-handler-proxy:[4.1.85.Final]</include> <!-- {x-include-update;io.netty:netty-handler-proxy;external_dependency} -->
<include>io.netty:netty-transport-native-unix-common:[4.1.85.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-unix-common;external_dependency} -->
<include>io.netty:netty-transport-native-epoll:[4.1.85.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-epoll;external_dependency} -->
<include>io.netty:netty-transport-native-kqueue:[4.1.85.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.25</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.6</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.6</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.6</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.6]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-actuator;external_dependency} -->
<include>org.springframework.boot:spring-boot-starter-web:[2.7.6]</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