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.11 and Spring Cloud 2021.0.7 #34875

Merged
merged 9 commits into from
May 24, 2023
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .vscode/cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -840,6 +840,7 @@
"astbuilder",
"atomikos",
"awaitility",
"awspring",
"Borca",
"brotli",
"bson",
Expand Down
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.27]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
<include>io.projectreactor:reactor-core:[3.4.29]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
Expand Down
17 changes: 17 additions & 0 deletions eng/code-quality-reports/src/main/resources/revapi/revapi.json
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,23 @@
"code": "java\\.annotation\\.removed",
"old": ".*? com\\.azure\\.security\\.keyvault\\.administration\\.models.*",
"justification": "Removing Jackson annotations from KeyVault Administration in transition to stream-style."
},
{
"regex": true,
"code" : "java.field.enumConstantOrderChanged",
"old" : "field com.mysql.cj.conf.PropertyKey.*",
"new" : "field com.mysql.cj.conf.PropertyKey.*",
"justification" : "Fix enum constants reordered."
},
{
"code" : "java.method.removed",
"old" : "method int com.mysql.cj.protocol.ServerSession::getOldStatusFlags()",
"justification" : "Fix method removed."
},
{
"code" : "java.method.removed",
"old" : "method void com.mysql.cj.protocol.ServerSession::setOldStatusFlags(int)",
"justification" : "Fix method removed."
}
]
}
Expand Down
162 changes: 81 additions & 81 deletions eng/versioning/external_dependencies.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# 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.9_managed_external_dependencies.txt
# If your version is different from sdk/spring/scripts/spring_boot_2.7.9_managed_external_dependencies.txt,
# make sure the version is same to sdk/spring/scripts/spring_boot_2.7.11_managed_external_dependencies.txt
# If your version is different from sdk/spring/scripts/spring_boot_2.7.11_managed_external_dependencies.txt,
# please discuss with Spring Integration team members:
# @chenrujun (rujche), @saragluna (xiada), @yiliuTo (yiliu6), @backwind1233 (zhihaoguo).
# Thanks.

# Format;
# groupId:artifactId;dependency-version
ch.qos.logback:logback-classic;1.2.11
ch.qos.logback:logback-classic;1.2.12
com.azure.tools:azure-autorest-customization;1.0.0-beta.7
com.fasterxml.jackson.core:jackson-annotations;2.13.5
com.fasterxml.jackson.core:jackson-core;2.13.5
Expand Down Expand Up @@ -42,33 +42,33 @@ com.microsoft.rest:client-runtime;1.7.4
com.microsoft.rest.v2:client-runtime;2.1.1
com.microsoft.sqlserver:mssql-jdbc;10.2.3.jre8
com.microsoft.azure:spring-data-cosmosdb;2.3.0
com.mysql:mysql-connector-j;8.0.32
com.mysql:mysql-connector-j;8.0.33
com.squareup.okhttp3:mockwebserver;4.10.0
com.squareup.okhttp3:okhttp;4.10.0
commons-codec:commons-codec;1.15
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.8
io.micrometer:micrometer-registry-azure-monitor;1.9.8
io.micrometer:micrometer-registry-graphite;1.9.8
io.netty:netty-buffer;4.1.89.Final
io.netty:netty-common;4.1.89.Final
io.netty:netty-codec;4.1.89.Final
io.netty:netty-codec-http;4.1.89.Final
io.netty:netty-codec-http2;4.1.89.Final
io.netty:netty-transport;4.1.89.Final
io.netty:netty-handler;4.1.89.Final
io.netty:netty-handler-proxy;4.1.89.Final
io.netty:netty-tcnative;2.0.56.Final
io.netty:netty-tcnative-boringssl-static;2.0.56.Final
io.netty:netty-transport-native-epoll;4.1.89.Final
io.netty:netty-transport-native-unix-common;4.1.89.Final
io.netty:netty-transport-native-kqueue;4.1.89.Final
io.projectreactor.netty:reactor-netty;1.0.28
io.projectreactor.netty:reactor-netty-http;1.0.28
io.projectreactor:reactor-core;3.4.27
io.micrometer:micrometer-core;1.9.10
io.micrometer:micrometer-registry-azure-monitor;1.9.10
io.micrometer:micrometer-registry-graphite;1.9.10
io.netty:netty-buffer;4.1.91.Final
io.netty:netty-common;4.1.91.Final
io.netty:netty-codec;4.1.91.Final
io.netty:netty-codec-http;4.1.91.Final
io.netty:netty-codec-http2;4.1.91.Final
io.netty:netty-transport;4.1.91.Final
io.netty:netty-handler;4.1.91.Final
io.netty:netty-handler-proxy;4.1.91.Final
io.netty:netty-tcnative;2.0.59.Final
io.netty:netty-tcnative-boringssl-static;2.0.59.Final
io.netty:netty-transport-native-epoll;4.1.91.Final
io.netty:netty-transport-native-unix-common;4.1.91.Final
io.netty:netty-transport-native-kqueue;4.1.91.Final
io.projectreactor.netty:reactor-netty;1.0.31
io.projectreactor.netty:reactor-netty-http;1.0.31
io.projectreactor:reactor-core;3.4.29
io.vertx:vertx-codegen;4.4.2
io.vertx:vertx-core;4.4.2
jakarta.validation:jakarta.validation-api;2.0.2
Expand All @@ -93,7 +93,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.15
org.codehaus.groovy:groovy-jsr223;3.0.17
org.codehaus.janino:janino;3.1.9
org.conscrypt:conscrypt-openjdk-uber;2.2.1
org.glassfish.tyrus:tyrus-client;1.16
Expand All @@ -115,65 +115,65 @@ org.redisson:redisson;3.17.0
net.bytebuddy:byte-buddy;1.12.23

## Spring boot dependency versions
org.springframework.boot:spring-boot-dependencies;2.7.9
org.springframework.boot:spring-boot-actuator;2.7.9
org.springframework.boot:spring-boot-actuator-autoconfigure;2.7.9
org.springframework.boot:spring-boot-autoconfigure-processor;2.7.9
org.springframework.boot:spring-boot-autoconfigure;2.7.9
org.springframework.boot:spring-boot-configuration-metadata;2.7.9
org.springframework.boot:spring-boot-configuration-processor;2.7.9
org.springframework.boot:spring-boot-dependencies;2.7.11
org.springframework.boot:spring-boot-actuator;2.7.11
org.springframework.boot:spring-boot-actuator-autoconfigure;2.7.11
org.springframework.boot:spring-boot-autoconfigure-processor;2.7.11
org.springframework.boot:spring-boot-autoconfigure;2.7.11
org.springframework.boot:spring-boot-configuration-metadata;2.7.11
org.springframework.boot:spring-boot-configuration-processor;2.7.11
org.springframework.boot:spring-boot-maven-plugin;2.7.4
org.springframework.boot:spring-boot-starter-actuator;2.7.9
org.springframework.boot:spring-boot-starter-aop;2.7.9
org.springframework.boot:spring-boot-starter-cache;2.7.9
org.springframework.boot:spring-boot-starter-data-redis;2.7.9
org.springframework.boot:spring-boot-starter-integration;2.7.9
org.springframework.boot:spring-boot-starter-logging;2.7.9
org.springframework.boot:spring-boot-starter-test;2.7.9
org.springframework.boot:spring-boot-starter-validation;2.7.9
org.springframework.boot:spring-boot-starter-web;2.7.9
org.springframework.boot:spring-boot-starter;2.7.9
org.springframework.boot:spring-boot-test;2.7.9
org.springframework.boot:spring-boot;2.7.9
org.springframework.data:spring-data-commons;2.7.8
org.springframework.data:spring-data-mongodb;3.4.8
org.springframework.data:spring-data-redis;2.7.8
org.springframework.boot:spring-boot-starter-actuator;2.7.11
org.springframework.boot:spring-boot-starter-aop;2.7.11
org.springframework.boot:spring-boot-starter-cache;2.7.11
org.springframework.boot:spring-boot-starter-data-redis;2.7.11
org.springframework.boot:spring-boot-starter-integration;2.7.11
org.springframework.boot:spring-boot-starter-logging;2.7.11
org.springframework.boot:spring-boot-starter-test;2.7.11
org.springframework.boot:spring-boot-starter-validation;2.7.11
org.springframework.boot:spring-boot-starter-web;2.7.11
org.springframework.boot:spring-boot-starter;2.7.11
org.springframework.boot:spring-boot-test;2.7.11
org.springframework.boot:spring-boot;2.7.11
org.springframework.data:spring-data-commons;2.7.11
org.springframework.data:spring-data-mongodb;3.4.11
org.springframework.data:spring-data-redis;2.7.11
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.16
org.springframework.integration:spring-integration-core;5.5.17
org.springframework.kafka:spring-kafka;2.8.11
org.springframework.security:spring-security-config;5.7.7
org.springframework.security:spring-security-core;5.7.7
org.springframework.security:spring-security-oauth2-client;5.7.7
org.springframework.security:spring-security-oauth2-resource-server;5.7.7
org.springframework.security:spring-security-oauth2-core;5.7.7
org.springframework.security:spring-security-oauth2-jose;5.7.7
org.springframework.security:spring-security-web;5.7.7
org.springframework:spring-beans;5.3.25
org.springframework:spring-context-support;5.3.25
org.springframework:spring-context;5.3.25
org.springframework:spring-core;5.3.25
org.springframework:spring-expression;5.3.25
org.springframework:spring-jdbc;5.3.25
org.springframework:spring-jms;5.3.25
org.springframework:spring-messaging;5.3.25
org.springframework:spring-tx;5.3.25
org.springframework:spring-web;5.3.25
org.springframework:spring-webmvc;5.3.25
org.springframework:spring-test;5.3.25
org.springframework.security:spring-security-config;5.7.8
org.springframework.security:spring-security-core;5.7.8
org.springframework.security:spring-security-oauth2-client;5.7.8
org.springframework.security:spring-security-oauth2-resource-server;5.7.8
org.springframework.security:spring-security-oauth2-core;5.7.8
org.springframework.security:spring-security-oauth2-jose;5.7.8
org.springframework.security:spring-security-web;5.7.8
org.springframework:spring-beans;5.3.27
org.springframework:spring-context-support;5.3.27
org.springframework:spring-context;5.3.27
org.springframework:spring-core;5.3.27
org.springframework:spring-expression;5.3.27
org.springframework:spring-jdbc;5.3.27
org.springframework:spring-jms;5.3.27
org.springframework:spring-messaging;5.3.27
org.springframework:spring-tx;5.3.27
org.springframework:spring-web;5.3.27
org.springframework:spring-webmvc;5.3.27
org.springframework:spring-test;5.3.27
org.springframework.retry:spring-retry;1.3.4
org.springframework.boot:spring-boot-starter-parent;2.7.9
org.springframework.boot:spring-boot-starter-parent;2.7.11

## Spring cloud dependency versions
org.springframework.cloud:spring-cloud-dependencies;2021.0.5
org.springframework.cloud:spring-cloud-starter-bootstrap;3.1.5
org.springframework.cloud:spring-cloud-dependencies;2021.0.7
org.springframework.cloud:spring-cloud-starter-bootstrap;3.1.6
org.springframework.cloud:spring-cloud-bus;3.1.2
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
org.springframework.cloud:spring-cloud-context;3.1.6
org.springframework.cloud:spring-cloud-sleuth-api;3.1.8
org.springframework.cloud:spring-cloud-starter-sleuth;3.1.8
org.springframework.cloud:spring-cloud-starter-stream-kafka;3.2.8
org.springframework.cloud:spring-cloud-stream-binder-test;3.2.8
org.springframework.cloud:spring-cloud-stream;3.2.8

pl.pragmatists:JUnitParams;1.1.1

Expand Down Expand Up @@ -203,13 +203,13 @@ io.opentelemetry:opentelemetry-exporter-jaeger;1.23.0
io.opentelemetry:opentelemetry-exporter-otlp;1.23.0
io.opentelemetry:opentelemetry-sdk-testing;1.23.0
io.opentelemetry:opentelemetry-sdk-logs;1.23.0-alpha
io.projectreactor:reactor-test;3.4.27
io.projectreactor:reactor-test;3.4.29
junit:junit;4.13.2
commons-cli:commons-cli;1.3
org.assertj:assertj-core;3.22.0
org.bouncycastle:bcprov-jdk15on;1.68
org.eclipse.jetty:jetty-http;9.4.50.v20221201
org.eclipse.jetty:jetty-server;9.4.50.v20221201
org.eclipse.jetty:jetty-http;9.4.51.v20230217
org.eclipse.jetty:jetty-server;9.4.51.v20230217
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 Expand Up @@ -250,9 +250,9 @@ com.nimbusds:nimbus-jose-jwt;9.31
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.16
io.dropwizard.metrics:metrics-graphite;4.2.16
io.dropwizard.metrics:metrics-jvm;4.2.16
io.dropwizard.metrics:metrics-core;4.2.18
io.dropwizard.metrics:metrics-graphite;4.2.18
io.dropwizard.metrics:metrics-jvm;4.2.18
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
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.89.Final</version> <!-- {x-version-update;io.netty:netty-handler;external_dependency} -->
<version>4.1.91.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.89.Final</version> <!-- {x-version-update;io.netty:netty-handler-proxy;external_dependency} -->
<version>4.1.91.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.89.Final</version> <!-- {x-version-update;io.netty:netty-buffer;external_dependency} -->
<version>4.1.91.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.89.Final</version> <!-- {x-version-update;io.netty:netty-codec-http;external_dependency} -->
<version>4.1.91.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.89.Final</version> <!-- {x-version-update;io.netty:netty-codec-http2;external_dependency} -->
<version>4.1.91.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.89.Final</version> <!-- {x-version-update;io.netty:netty-transport-native-unix-common;external_dependency} -->
<version>4.1.91.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.89.Final</version> <!-- {x-version-update;io.netty:netty-transport-native-epoll;external_dependency} -->
<version>4.1.91.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.89.Final</version> <!-- {x-version-update;io.netty:netty-transport-native-kqueue;external_dependency} -->
<version>4.1.91.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.89.Final]</include> <!-- {x-include-update;io.netty:netty-buffer;external_dependency} -->
<include>io.netty:netty-codec-http:[4.1.89.Final]</include> <!-- {x-include-update;io.netty:netty-codec-http;external_dependency} -->
<include>io.netty:netty-codec-http2:[4.1.89.Final]</include> <!-- {x-include-update;io.netty:netty-codec-http2;external_dependency} -->
<include>io.netty:netty-handler:[4.1.89.Final]</include> <!-- {x-include-update;io.netty:netty-handler;external_dependency} -->
<include>io.netty:netty-handler-proxy:[4.1.89.Final]</include> <!-- {x-include-update;io.netty:netty-handler-proxy;external_dependency} -->
<include>io.netty:netty-transport-native-unix-common:[4.1.89.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-unix-common;external_dependency} -->
<include>io.netty:netty-transport-native-epoll:[4.1.89.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-epoll;external_dependency} -->
<include>io.netty:netty-transport-native-kqueue:[4.1.89.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-kqueue;external_dependency} -->
<include>io.netty:netty-buffer:[4.1.91.Final]</include> <!-- {x-include-update;io.netty:netty-buffer;external_dependency} -->
<include>io.netty:netty-codec-http:[4.1.91.Final]</include> <!-- {x-include-update;io.netty:netty-codec-http;external_dependency} -->
<include>io.netty:netty-codec-http2:[4.1.91.Final]</include> <!-- {x-include-update;io.netty:netty-codec-http2;external_dependency} -->
<include>io.netty:netty-handler:[4.1.91.Final]</include> <!-- {x-include-update;io.netty:netty-handler;external_dependency} -->
<include>io.netty:netty-handler-proxy:[4.1.91.Final]</include> <!-- {x-include-update;io.netty:netty-handler-proxy;external_dependency} -->
<include>io.netty:netty-transport-native-unix-common:[4.1.91.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-unix-common;external_dependency} -->
<include>io.netty:netty-transport-native-epoll:[4.1.91.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-epoll;external_dependency} -->
<include>io.netty:netty-transport-native-kqueue:[4.1.91.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 @@ -104,7 +104,7 @@
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-test</artifactId>
<version>3.4.27</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
<version>3.4.29</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.27</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
<version>3.4.29</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
Expand Down
Loading