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.

Sign up for GitHub

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

Jump to bottom

External dependencies upgrade - Spring Boot 3.0.0 and Spring Cloud 2022.0.0-RC3 #32512

Merged
merged 6 commits into from
Dec 9, 2022
Merged

External dependencies upgrade - Spring Boot 3.0.0 and Spring Cloud 2022.0.0-RC3 #32512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
37174af
Upgrade external dep to SB 3 and SC 2022.0.0-RC3
moarychan Dec 8, 2022
a6e7833
Cherry-pick the support file update
moarychan Dec 8, 2022
293b759
Remove unused parameter
moarychan Dec 8, 2022
1190dee
Fix version mismatch
moarychan Dec 8, 2022
07f8e2e
Sync https://github.com/Azure/azure-sdk-for-java/pull/31877
moarychan Dec 8, 2022
c092746
Fix warnings that occur when manually turning on `failOnWarning` swit…
moarychan Dec 8, 2022
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
4 changes: 2 additions & 2 deletions common/perf-test-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<rules>
<bannedDependencies>
<includes combine.children="append">
<include>com.fasterxml.jackson.core:jackson-databind:[2.14.0-rc3]</include> <!-- {x-include-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
<include>com.fasterxml.jackson.core:jackson-databind:[2.14.1]</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} -->
Expand All @@ -64,7 +64,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.14.0-rc3</version> <!-- {x-version-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
<version>2.14.1</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
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>2.0.3</version> <!-- {x-version-update;org.slf4j:slf4j-simple;external_dependency} -->
<version>2.0.4</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
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-xml</artifactId>
<version>2.14.0-rc3</version> <!-- {x-version-update;com.fasterxml.jackson.dataformat:jackson-dataformat-xml;external_dependency} -->
<version>2.14.1</version> <!-- {x-version-update;com.fasterxml.jackson.dataformat:jackson-dataformat-xml;external_dependency} -->
</dependency>
<dependency>
<groupId>com.fasterxml.woodstox</groupId>
Expand Down
174 changes: 87 additions & 87 deletions eng/versioning/external_dependencies.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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-RC2_managed_external_dependencies.txt
# If your version is different from sdk/spring/scripts/spring_boot_3.0.0-RC2_managed_external_dependencies.txt,
# make sure the version is same to sdk/spring/scripts/spring_boot_3.0.0_managed_external_dependencies.txt
# If your version is different from sdk/spring/scripts/spring_boot_3.0.0_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.4.4
com.fasterxml.jackson.core:jackson-annotations;2.14.0-rc3
com.fasterxml.jackson.core:jackson-core;2.14.0-rc3
com.fasterxml.jackson.core:jackson-databind;2.14.0-rc3
com.fasterxml.jackson.dataformat:jackson-dataformat-avro;2.14.0-rc3
com.fasterxml.jackson.dataformat:jackson-dataformat-xml;2.14.0-rc3
com.fasterxml.jackson.datatype:jackson-datatype-jdk8;2.14.0-rc3
com.fasterxml.jackson.datatype:jackson-datatype-jsr310;2.14.0-rc3
com.fasterxml.jackson.module:jackson-module-parameter-names;2.14.0-rc3
com.fasterxml.jackson.module:jackson-module-scala_2.12;2.14.0-rc3
ch.qos.logback:logback-classic;1.4.5
com.fasterxml.jackson.core:jackson-annotations;2.14.1
com.fasterxml.jackson.core:jackson-core;2.14.1
com.fasterxml.jackson.core:jackson-databind;2.14.1
com.fasterxml.jackson.dataformat:jackson-dataformat-avro;2.14.1
com.fasterxml.jackson.dataformat:jackson-dataformat-xml;2.14.1
com.fasterxml.jackson.datatype:jackson-datatype-jdk8;2.14.1
com.fasterxml.jackson.datatype:jackson-datatype-jsr310;2.14.1
com.fasterxml.jackson.module:jackson-module-parameter-names;2.14.1
com.fasterxml.jackson.module:jackson-module-scala_2.12;2.14.1
com.fasterxml.woodstox:woodstox-core;6.4.0
com.github.spotbugs:spotbugs;4.2.2
com.github.spotbugs:spotbugs-annotations;4.2.2
Expand Down Expand Up @@ -51,22 +51,22 @@ 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
io.micrometer:micrometer-registry-azure-monitor;1.10.0
io.micrometer:micrometer-registry-graphite;1.10.0
io.netty:netty-buffer;4.1.84.Final
io.netty:netty-common;4.1.84.Final
io.netty:netty-codec;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.micrometer:micrometer-core;1.10.2
io.micrometer:micrometer-registry-azure-monitor;1.10.2
io.micrometer:micrometer-registry-graphite;1.10.2
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.84.Final
io.netty:netty-transport-native-unix-common;4.1.84.Final
io.netty:netty-transport-native-kqueue;4.1.84.Final
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.1.0
io.projectreactor.netty:reactor-netty-http;1.1.0
io.projectreactor:reactor-core;3.5.0
Expand Down Expand Up @@ -100,7 +100,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;8.0.0.Final
Expand All @@ -113,72 +113,72 @@ org.graalvm.nativeimage:svm;22.0.0.2
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;2.0.3
org.slf4j:slf4j-nop;2.0.3
org.slf4j:slf4j-simple;2.0.3
org.postgresql:postgresql;42.5.1
org.slf4j:slf4j-api;2.0.4
org.slf4j:slf4j-nop;2.0.4
org.slf4j:slf4j-simple;2.0.4
redis.clients:jedis;4.3.1
io.lettuce:lettuce-core;6.2.1.RELEASE
org.redisson:redisson;3.17.0
net.bytebuddy:byte-buddy;1.12.18
net.bytebuddy:byte-buddy;1.12.19

## Spring boot dependency versions
org.springframework.boot:spring-boot-dependencies;3.0.0-RC2
org.springframework.boot:spring-boot-actuator;3.0.0-RC2
org.springframework.boot:spring-boot-actuator-autoconfigure;3.0.0-RC2
org.springframework.boot:spring-boot-autoconfigure-processor;3.0.0-RC2
org.springframework.boot:spring-boot-autoconfigure;3.0.0-RC2
org.springframework.boot:spring-boot-configuration-metadata;3.0.0-RC2
org.springframework.boot:spring-boot-configuration-processor;3.0.0-RC2
org.springframework.boot:spring-boot-dependencies;3.0.0
org.springframework.boot:spring-boot-actuator;3.0.0
org.springframework.boot:spring-boot-actuator-autoconfigure;3.0.0
org.springframework.boot:spring-boot-autoconfigure-processor;3.0.0
org.springframework.boot:spring-boot-autoconfigure;3.0.0
org.springframework.boot:spring-boot-configuration-metadata;3.0.0
org.springframework.boot:spring-boot-configuration-processor;3.0.0
org.springframework.boot:spring-boot-maven-plugin;3.0.0-M5
org.springframework.boot:spring-boot-starter-actuator;3.0.0-RC2
org.springframework.boot:spring-boot-starter-aop;3.0.0-RC2
org.springframework.boot:spring-boot-starter-cache;3.0.0-RC2
org.springframework.boot:spring-boot-starter-data-redis;3.0.0-RC2
org.springframework.boot:spring-boot-starter-integration;3.0.0-RC2
org.springframework.boot:spring-boot-starter-logging;3.0.0-RC2
org.springframework.boot:spring-boot-starter-test;3.0.0-RC2
org.springframework.boot:spring-boot-starter-validation;3.0.0-RC2
org.springframework.boot:spring-boot-starter-web;3.0.0-RC2
org.springframework.boot:spring-boot-starter;3.0.0-RC2
org.springframework.boot:spring-boot-test;3.0.0-RC2
org.springframework.boot:spring-boot;3.0.0-RC2
org.springframework.data:spring-data-commons;3.0.0-RC2
org.springframework.data:spring-data-mongodb;4.0.0-RC2
org.springframework.data:spring-data-redis;3.0.0-RC2
org.springframework.boot:spring-boot-starter-actuator;3.0.0
org.springframework.boot:spring-boot-starter-aop;3.0.0
org.springframework.boot:spring-boot-starter-cache;3.0.0
org.springframework.boot:spring-boot-starter-data-redis;3.0.0
org.springframework.boot:spring-boot-starter-integration;3.0.0
org.springframework.boot:spring-boot-starter-logging;3.0.0
org.springframework.boot:spring-boot-starter-test;3.0.0
org.springframework.boot:spring-boot-starter-validation;3.0.0
org.springframework.boot:spring-boot-starter-web;3.0.0
org.springframework.boot:spring-boot-starter;3.0.0
org.springframework.boot:spring-boot-test;3.0.0
org.springframework.boot:spring-boot;3.0.0
org.springframework.data:spring-data-commons;3.0.0
org.springframework.data:spring-data-mongodb;4.0.0
org.springframework.data:spring-data-redis;3.0.0
org.springframework.experimental:spring-aot;0.11.4
org.springframework.integration:spring-integration-core;6.0.0-RC2
org.springframework.kafka:spring-kafka;3.0.0-RC2
org.springframework.security:spring-security-config;6.0.0-RC2
org.springframework.security:spring-security-core;6.0.0-RC2
org.springframework.security:spring-security-oauth2-client;6.0.0-RC2
org.springframework.security:spring-security-oauth2-resource-server;6.0.0-RC2
org.springframework.security:spring-security-oauth2-core;6.0.0-RC2
org.springframework.security:spring-security-oauth2-jose;6.0.0-RC2
org.springframework.security:spring-security-web;6.0.0-RC2
org.springframework:spring-beans;6.0.0-RC4
org.springframework:spring-context-support;6.0.0-RC4
org.springframework:spring-context;6.0.0-RC4
org.springframework:spring-core;6.0.0-RC4
org.springframework:spring-expression;6.0.0-RC4
org.springframework:spring-jdbc;6.0.0-RC4
org.springframework:spring-jms;6.0.0-RC4
org.springframework:spring-messaging;6.0.0-RC4
org.springframework:spring-tx;6.0.0-RC4
org.springframework:spring-web;6.0.0-RC4
org.springframework:spring-webmvc;6.0.0-RC4
org.springframework:spring-test;6.0.0-RC4
org.springframework.retry:spring-retry;2.0.0-RC2
org.springframework.boot:spring-boot-starter-parent;3.0.0-RC2
org.springframework.integration:spring-integration-core;6.0.0
org.springframework.kafka:spring-kafka;3.0.0
org.springframework.security:spring-security-config;6.0.0
org.springframework.security:spring-security-core;6.0.0
org.springframework.security:spring-security-oauth2-client;6.0.0
org.springframework.security:spring-security-oauth2-resource-server;6.0.0
org.springframework.security:spring-security-oauth2-core;6.0.0
org.springframework.security:spring-security-oauth2-jose;6.0.0
org.springframework.security:spring-security-web;6.0.0
org.springframework:spring-beans;6.0.2
org.springframework:spring-context-support;6.0.2
org.springframework:spring-context;6.0.2
org.springframework:spring-core;6.0.2
org.springframework:spring-expression;6.0.2
org.springframework:spring-jdbc;6.0.2
org.springframework:spring-jms;6.0.2
org.springframework:spring-messaging;6.0.2
org.springframework:spring-tx;6.0.2
org.springframework:spring-web;6.0.2
org.springframework:spring-webmvc;6.0.2
org.springframework:spring-test;6.0.2
org.springframework.retry:spring-retry;2.0.0
org.springframework.boot:spring-boot-starter-parent;3.0.0

## Spring cloud dependency versions
org.springframework.cloud:spring-cloud-dependencies;2022.0.0-RC2
org.springframework.cloud:spring-cloud-starter-bootstrap;4.0.0-RC2
org.springframework.cloud:spring-cloud-bus;4.0.0-RC2
org.springframework.cloud:spring-cloud-context;4.0.0-RC2
org.springframework.cloud:spring-cloud-starter-stream-kafka;4.0.0-RC2
org.springframework.cloud:spring-cloud-stream-binder-test;4.0.0-RC2
org.springframework.cloud:spring-cloud-stream;4.0.0-RC2
org.springframework.cloud:spring-cloud-dependencies;2022.0.0-RC3
org.springframework.cloud:spring-cloud-starter-bootstrap;4.0.0-RC3
org.springframework.cloud:spring-cloud-bus;4.0.0-RC3
org.springframework.cloud:spring-cloud-context;4.0.0-RC3
org.springframework.cloud:spring-cloud-starter-stream-kafka;4.0.0-RC3
org.springframework.cloud:spring-cloud-stream-test-binder;4.0.0-RC3
org.springframework.cloud:spring-cloud-stream;4.0.0-RC3

pl.pragmatists:JUnitParams;1.1.1

Expand Down Expand Up @@ -261,9 +261,9 @@ com.nimbusds:nimbus-jose-jwt;9.24.4
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
2 changes: 1 addition & 1 deletion sdk/agrifood/azure-resourcemanager-agrifood/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>2.0.3</version> <!-- {x-version-update;org.slf4j:slf4j-simple;external_dependency} -->
<version>2.0.4</version> <!-- {x-version-update;org.slf4j:slf4j-simple;external_dependency} -->
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
32 changes: 16 additions & 16 deletions sdk/aot/azure-aot-graalvm-support-netty/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,44 +63,44 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
<version>4.1.84.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.84.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.84.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.84.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.84.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.84.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.84.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.84.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.84.Final]</include> <!-- {x-include-update;io.netty:netty-buffer;external_dependency} -->
<include>io.netty:netty-codec-http:[4.1.84.Final]</include> <!-- {x-include-update;io.netty:netty-codec-http;external_dependency} -->
<include>io.netty:netty-codec-http2:[4.1.84.Final]</include> <!-- {x-include-update;io.netty:netty-codec-http2;external_dependency} -->
<include>io.netty:netty-handler:[4.1.84.Final]</include> <!-- {x-include-update;io.netty:netty-handler;external_dependency} -->
<include>io.netty:netty-handler-proxy:[4.1.84.Final]</include> <!-- {x-include-update;io.netty:netty-handler-proxy;external_dependency} -->
<include>io.netty:netty-transport-native-unix-common:[4.1.84.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-unix-common;external_dependency} -->
<include>io.netty:netty-transport-native-epoll:[4.1.84.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-epoll;external_dependency} -->
<include>io.netty:netty-transport-native-kqueue:[4.1.84.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
Loading