Skip to content

Commit

Permalink
External dependencies upgrade - Spring Boot 3.0.0-RC1 and Spring Clou…
Browse files Browse the repository at this point in the history 
…d 2022.0.0-RC1 (#31808)

* Upgrade to Spring Boot RC1 and Spring Cloud RC1 version
* Make the compatibility tests pass by default when executing unit tests out with deprecation APIs
* Make the live and compatibility  tests pass by default when executing unit tests out with deprecation APIs
* Make the M5 version end of life, due to the new deprecated API in Spring Security
* Override the properties due to the failure of the azure-core module, which the MarkerIgnoringBase is marked as deprecated API
* Sync MySQL artifact name change
  • Loading branch information
@moarychan
moarychan committed Nov 2, 2022
1 parent bf14389 commit 8d6d989
Show file tree
Hide file tree
Showing 221 changed files with 2,541 additions and 2,374 deletions.
6 changes: 3 additions & 3 deletions common/perf-test-core/pom.xml
View file
Expand Up @@ -46,12 +46,12 @@
<rules>
<bannedDependencies>
<includes combine.children="append">
<include>com.fasterxml.jackson.core:jackson-databind:[2.13.4.2]</include> <!-- {x-include-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
<include>com.fasterxml.jackson.core:jackson-databind:[2.14.0-rc2]</include> <!-- {x-include-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->

<!-- 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.5.0-RC1]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
Expand All @@ -64,7 +64,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.13.4.2</version> <!-- {x-version-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
<version>2.14.0-rc2</version> <!-- {x-version-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
</dependency>
<dependency>
<groupId>com.beust</groupId>
Expand Down
2 changes: 1 addition & 1 deletion common/smoke-tests/pom.xml
View file
Expand Up @@ -154,7 +154,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.7.36</version> <!-- {x-version-update;org.slf4j:slf4j-simple;external_dependency} -->
<version>2.0.3</version> <!-- {x-version-update;org.slf4j:slf4j-simple;external_dependency} -->
</dependency>

</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion eng/bomgenerator/pom.xml
View file
Expand Up @@ -37,7 +37,7 @@
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-xml</artifactId>
<version>2.13.4</version> <!-- {x-version-update;com.fasterxml.jackson.dataformat:jackson-dataformat-xml;external_dependency} -->
<version>2.14.0-rc2</version> <!-- {x-version-update;com.fasterxml.jackson.dataformat:jackson-dataformat-xml;external_dependency} -->
</dependency>
</dependencies>
<build>
Expand Down
206 changes: 102 additions & 104 deletions eng/versioning/external_dependencies.txt
View file
@@ -1,22 +1,22 @@
# 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_3.0.0-M5_managed_external_dependencies.txt
# If your version is different from sdk/spring/scripts/spring_boot_3.0.0-M5_managed_external_dependencies.txt,
# make sure the version is same to sdk/spring/scripts/spring_boot_3.0.0-RC1_managed_external_dependencies.txt
# If your version is different from sdk/spring/scripts/spring_boot_3.0.0-RC1_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
com.fasterxml.jackson.core:jackson-annotations;2.13.4
com.fasterxml.jackson.core:jackson-core;2.13.4
com.fasterxml.jackson.core:jackson-databind;2.13.4.2
com.fasterxml.jackson.dataformat:jackson-dataformat-avro;2.13.4
com.fasterxml.jackson.dataformat:jackson-dataformat-xml;2.13.4
com.fasterxml.jackson.datatype:jackson-datatype-jdk8;2.13.4
com.fasterxml.jackson.datatype:jackson-datatype-jsr310;2.13.4
com.fasterxml.jackson.module:jackson-module-parameter-names;2.13.4
com.fasterxml.jackson.module:jackson-module-scala_2.12;2.13.4
ch.qos.logback:logback-classic;1.4.4
com.fasterxml.jackson.core:jackson-annotations;2.14.0-rc2
com.fasterxml.jackson.core:jackson-core;2.14.0-rc2
com.fasterxml.jackson.core:jackson-databind;2.14.0-rc2
com.fasterxml.jackson.dataformat:jackson-dataformat-avro;2.14.0-rc2
com.fasterxml.jackson.dataformat:jackson-dataformat-xml;2.14.0-rc2
com.fasterxml.jackson.datatype:jackson-datatype-jdk8;2.14.0-rc2
com.fasterxml.jackson.datatype:jackson-datatype-jsr310;2.14.0-rc2
com.fasterxml.jackson.module:jackson-module-parameter-names;2.14.0-rc2
com.fasterxml.jackson.module:jackson-module-scala_2.12;2.14.0-rc2
com.github.spotbugs:spotbugs;4.2.2
com.github.spotbugs:spotbugs-annotations;4.2.2
com.github.spotbugs:spotbugs-maven-plugin;4.2.2
Expand Down Expand Up @@ -49,24 +49,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.10.0-M6
io.micrometer:micrometer-registry-azure-monitor;1.10.0-M6
io.micrometer:micrometer-registry-graphite;1.10.0-M6
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.10.0-RC1
io.micrometer:micrometer-registry-azure-monitor;1.10.0-RC1
io.micrometer:micrometer-registry-graphite;1.10.0-RC1
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.1.0-RC1
io.projectreactor.netty:reactor-netty-http;1.1.0-RC1
io.projectreactor:reactor-core;3.5.0-RC1
io.reactivex:rxjava;1.3.8
io.vertx:vertx-codegen;4.3.3
io.vertx:vertx-core;4.3.3
Expand All @@ -78,17 +78,16 @@ 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
org.apache.commons:commons-compress;1.21
org.apache.commons:commons-lang3;3.12.0
org.apache.httpcomponents:httpclient;4.5.13
org.apache.kafka:kafka-clients;3.2.3
org.apache.logging.log4j:log4j-api;2.18.0
org.apache.logging.log4j:log4j-core;2.18.0
org.apache.logging.log4j:log4j-slf4j-impl;2.18.0
org.apache.kafka:kafka-clients;3.3.1
org.apache.logging.log4j:log4j-api;2.19.0
org.apache.logging.log4j:log4j-core;2.19.0
org.apache.logging.log4j:log4j-slf4j-impl;2.19.0
org.apache.maven:maven-core;3.5.4
org.apache.maven.archetype:archetype-packaging;3.2.0
org.apache.maven.archetype:maven-archetype-plugin;3.2.0
Expand All @@ -114,73 +113,71 @@ org.messaginghub:pooled-jms;3.0.0
org.powermock:powermock-api-mockito2;2.0.9
org.powermock:powermock-module-junit4;2.0.9
org.postgresql:postgresql;42.5.0
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.slf4j:slf4j-api;2.0.3
org.slf4j:slf4j-nop;2.0.3
org.slf4j:slf4j-simple;2.0.3
redis.clients:jedis;4.3.0
io.lettuce:lettuce-core;6.2.1.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;3.0.0-M5
org.springframework.boot:spring-boot-actuator;3.0.0-M5
org.springframework.boot:spring-boot-actuator-autoconfigure;3.0.0-M5
org.springframework.boot:spring-boot-autoconfigure-processor;3.0.0-M5
org.springframework.boot:spring-boot-autoconfigure;3.0.0-M5
org.springframework.boot:spring-boot-configuration-metadata;3.0.0-M5
org.springframework.boot:spring-boot-configuration-processor;3.0.0-M5
org.springframework.boot:spring-boot-dependencies;3.0.0-RC1
org.springframework.boot:spring-boot-actuator;3.0.0-RC1
org.springframework.boot:spring-boot-actuator-autoconfigure;3.0.0-RC1
org.springframework.boot:spring-boot-autoconfigure-processor;3.0.0-RC1
org.springframework.boot:spring-boot-autoconfigure;3.0.0-RC1
org.springframework.boot:spring-boot-configuration-metadata;3.0.0-RC1
org.springframework.boot:spring-boot-configuration-processor;3.0.0-RC1
org.springframework.boot:spring-boot-maven-plugin;3.0.0-M5
org.springframework.boot:spring-boot-starter-actuator;3.0.0-M5
org.springframework.boot:spring-boot-starter-aop;3.0.0-M5
org.springframework.boot:spring-boot-starter-cache;3.0.0-M5
org.springframework.boot:spring-boot-starter-data-redis;3.0.0-M5
org.springframework.boot:spring-boot-starter-integration;3.0.0-M5
org.springframework.boot:spring-boot-starter-logging;3.0.0-M5
org.springframework.boot:spring-boot-starter-test;3.0.0-M5
org.springframework.boot:spring-boot-starter-validation;3.0.0-M5
org.springframework.boot:spring-boot-starter-web;3.0.0-M5
org.springframework.boot:spring-boot-starter;3.0.0-M5
org.springframework.boot:spring-boot-test;3.0.0-M5
org.springframework.boot:spring-boot;3.0.0-M5
org.springframework.data:spring-data-commons;3.0.0-M6
org.springframework.data:spring-data-mongodb;4.0.0-M6
org.springframework.data:spring-data-redis;3.0.0-M6
org.springframework.boot:spring-boot-starter-actuator;3.0.0-RC1
org.springframework.boot:spring-boot-starter-aop;3.0.0-RC1
org.springframework.boot:spring-boot-starter-cache;3.0.0-RC1
org.springframework.boot:spring-boot-starter-data-redis;3.0.0-RC1
org.springframework.boot:spring-boot-starter-integration;3.0.0-RC1
org.springframework.boot:spring-boot-starter-logging;3.0.0-RC1
org.springframework.boot:spring-boot-starter-test;3.0.0-RC1
org.springframework.boot:spring-boot-starter-validation;3.0.0-RC1
org.springframework.boot:spring-boot-starter-web;3.0.0-RC1
org.springframework.boot:spring-boot-starter;3.0.0-RC1
org.springframework.boot:spring-boot-test;3.0.0-RC1
org.springframework.boot:spring-boot;3.0.0-RC1
org.springframework.data:spring-data-commons;3.0.0-RC1
org.springframework.data:spring-data-mongodb;4.0.0-RC1
org.springframework.data:spring-data-redis;3.0.0-RC1
org.springframework.experimental:spring-aot;0.11.4
org.springframework.integration:spring-integration-core;6.0.0-M5
org.springframework.kafka:spring-kafka;3.0.0-M6
org.springframework.security:spring-security-config;6.0.0-M7
org.springframework.security:spring-security-core;6.0.0-M7
org.springframework.security:spring-security-oauth2-client;6.0.0-M7
org.springframework.security:spring-security-oauth2-resource-server;6.0.0-M7
org.springframework.security:spring-security-oauth2-core;6.0.0-M7
org.springframework.security:spring-security-oauth2-jose;6.0.0-M7
org.springframework.security:spring-security-web;6.0.0-M7
org.springframework:spring-beans;6.0.0-M6
org.springframework:spring-context-support;6.0.0-M6
org.springframework:spring-context;6.0.0-M6
org.springframework:spring-core;6.0.0-M6
org.springframework:spring-expression;6.0.0-M6
org.springframework:spring-jdbc;6.0.0-M6
org.springframework:spring-jms;6.0.0-M6
org.springframework:spring-messaging;6.0.0-M6
org.springframework:spring-tx;6.0.0-M6
org.springframework:spring-web;6.0.0-M6
org.springframework:spring-webmvc;6.0.0-M6
org.springframework:spring-test;6.0.0-M6
org.springframework.retry:spring-retry;2.0.0-M1
org.springframework.boot:spring-boot-starter-parent;3.0.0-M5
org.springframework.integration:spring-integration-core;6.0.0-RC1
org.springframework.kafka:spring-kafka;3.0.0-RC1
org.springframework.security:spring-security-config;6.0.0-RC1
org.springframework.security:spring-security-core;6.0.0-RC1
org.springframework.security:spring-security-oauth2-client;6.0.0-RC1
org.springframework.security:spring-security-oauth2-resource-server;6.0.0-RC1
org.springframework.security:spring-security-oauth2-core;6.0.0-RC1
org.springframework.security:spring-security-oauth2-jose;6.0.0-RC1
org.springframework.security:spring-security-web;6.0.0-RC1
org.springframework:spring-beans;6.0.0-RC2
org.springframework:spring-context-support;6.0.0-RC2
org.springframework:spring-context;6.0.0-RC2
org.springframework:spring-core;6.0.0-RC2
org.springframework:spring-expression;6.0.0-RC2
org.springframework:spring-jdbc;6.0.0-RC2
org.springframework:spring-jms;6.0.0-RC2
org.springframework:spring-messaging;6.0.0-RC2
org.springframework:spring-tx;6.0.0-RC2
org.springframework:spring-web;6.0.0-RC2
org.springframework:spring-webmvc;6.0.0-RC2
org.springframework:spring-test;6.0.0-RC2
org.springframework.retry:spring-retry;2.0.0-RC2
org.springframework.boot:spring-boot-starter-parent;3.0.0-RC1

## Spring cloud dependency versions
org.springframework.cloud:spring-cloud-dependencies;2022.0.0-M5
org.springframework.cloud:spring-cloud-starter-bootstrap;4.0.0-M5
org.springframework.cloud:spring-cloud-bus;4.0.0-M5
org.springframework.cloud:spring-cloud-context;4.0.0-M5
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;4.0.0-M5
org.springframework.cloud:spring-cloud-stream-binder-test;4.0.0-M5
org.springframework.cloud:spring-cloud-stream;4.0.0-M5
org.springframework.cloud:spring-cloud-dependencies;2022.0.0-RC1
org.springframework.cloud:spring-cloud-starter-bootstrap;4.0.0-RC1
org.springframework.cloud:spring-cloud-bus;4.0.0-RC1
org.springframework.cloud:spring-cloud-context;4.0.0-RC1
org.springframework.cloud:spring-cloud-starter-stream-kafka;4.0.0-RC1
org.springframework.cloud:spring-cloud-stream-binder-test;4.0.0-RC1
org.springframework.cloud:spring-cloud-stream;4.0.0-RC1

pl.pragmatists:JUnitParams;1.1.1

Expand All @@ -204,16 +201,17 @@ com.microsoft.azure:azure-mgmt-storage;1.3.0
com.microsoft.azure:azure-storage;8.0.0
com.microsoft.azure:msal4j;1.13.2
com.microsoft.azure:msal4j-persistence-extension;1.1.0
com.mysql:mysql-connector-j;8.0.31
com.sun.activation:jakarta.activation;2.0.1
io.opentelemetry:opentelemetry-api;1.18.0
io.opentelemetry:opentelemetry-sdk;1.18.0
io.opentelemetry:opentelemetry-exporter-logging;1.18.0
io.opentelemetry:opentelemetry-exporter-jaeger;1.18.0
io.opentelemetry:opentelemetry-exporter-otlp;1.18.0
io.opentelemetry:opentelemetry-sdk-testing;1.18.0
io.opentelemetry:opentelemetry-sdk-extension-autoconfigure;1.18.0-alpha
io.opentelemetry:opentelemetry-sdk-logs;1.18.0-alpha
io.projectreactor:reactor-test;3.4.23
io.opentelemetry:opentelemetry-api;1.19.0
io.opentelemetry:opentelemetry-sdk;1.19.0
io.opentelemetry:opentelemetry-exporter-logging;1.19.0
io.opentelemetry:opentelemetry-exporter-jaeger;1.19.0
io.opentelemetry:opentelemetry-exporter-otlp;1.19.0
io.opentelemetry:opentelemetry-sdk-testing;1.19.0
io.opentelemetry:opentelemetry-sdk-extension-autoconfigure;1.19.0-alpha
io.opentelemetry:opentelemetry-sdk-logs;1.19.0-alpha
io.projectreactor:reactor-test;3.5.0-RC1
junit:junit;4.13.2
commons-cli:commons-cli;1.3
org.apache.maven:maven-compat;3.6.2
Expand Down Expand Up @@ -311,8 +309,8 @@ org.eclipse.m2e:lifecycle-mapping;1.0.0
org.hdrhistogram:HdrHistogram;2.1.12
org.jacoco:jacoco-maven-plugin;0.8.8
org.jacoco:org.jacoco.agent;0.8.8
org.mockito:mockito-core;4.8.0
org.mockito:mockito-inline;4.8.0
org.mockito:mockito-core;4.8.1
org.mockito:mockito-inline;4.8.1
org.moditect:moditect-maven-plugin;1.0.0.RC1
org.ow2.asm:asm;9.3
org.revapi:revapi;0.14.4
Expand Down
4 changes: 2 additions & 2 deletions sdk/agrifood/azure-resourcemanager-agrifood/pom.xml
View file
Expand Up @@ -72,13 +72,13 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>4.8.0</version> <!-- {x-version-update;org.mockito:mockito-core;external_dependency} -->
<version>4.8.1</version> <!-- {x-version-update;org.mockito:mockito-core;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.7.36</version> <!-- {x-version-update;org.slf4j:slf4j-simple;external_dependency} -->
<version>2.0.3</version> <!-- {x-version-update;org.slf4j:slf4j-simple;external_dependency} -->
<scope>test</scope>
</dependency>
</dependencies>
Expand Down

0 comments on commit 8d6d989

Please sign in to comment.