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 3.2.1 and Spring Cloud 2023.0.0 #38161

Closed
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
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.6.0]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
<include>io.projectreactor:reactor-core:[3.6.1]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
Expand Down
2 changes: 1 addition & 1 deletion common/smoke-tests/pom.xml
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>1.7.36</version> <!-- {x-version-update;org.slf4j:slf4j-simple;external_dependency} -->
<version>2.0.9</version> <!-- {x-version-update;org.slf4j:slf4j-simple;external_dependency} -->
</dependency>

</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion eng/spotbugs-aggregate-report/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.6.2</version> <!-- {x-version-update;org.apache.maven.plugins:maven-javadoc-plugin;external_dependency} -->
<version>3.6.3</version> <!-- {x-version-update;org.apache.maven.plugins:maven-javadoc-plugin;external_dependency} -->
<configuration>
<!-- Added to override the -snippetpath arg which is not applicable here-->
<additionalOptions>-maxLineLength 120</additionalOptions>
Expand Down
166 changes: 83 additions & 83 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_3.2.0_managed_external_dependencies.txt
# If your version is different from sdk/spring/scripts/spring_boot_3.2.0_managed_external_dependencies.txt,
# make sure the version is same to sdk/spring/scripts/spring_boot_3.2.1_managed_external_dependencies.txt
# If your version is different from sdk/spring/scripts/spring_boot_3.2.1_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.11
ch.qos.logback:logback-classic;1.4.14
com.azure.tools:azure-autorest-customization;1.0.0-beta.8
com.fasterxml.jackson.core:jackson-annotations;2.15.3
com.fasterxml.jackson.core:jackson-core;2.15.3
Expand Down Expand Up @@ -52,25 +52,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;6.9.2
io.micrometer:micrometer-core;1.12.0
io.micrometer:micrometer-registry-azure-monitor;1.12.0
io.micrometer:micrometer-registry-graphite;1.12.0
io.netty:netty-buffer;4.1.101.Final
io.netty:netty-common;4.1.101.Final
io.netty:netty-codec;4.1.101.Final
io.netty:netty-codec-http;4.1.101.Final
io.netty:netty-codec-http2;4.1.101.Final
io.netty:netty-transport;4.1.101.Final
io.netty:netty-handler;4.1.101.Final
io.netty:netty-handler-proxy;4.1.101.Final
io.micrometer:micrometer-core;1.12.1
io.micrometer:micrometer-registry-azure-monitor;1.12.1
io.micrometer:micrometer-registry-graphite;1.12.1
io.netty:netty-buffer;4.1.104.Final
io.netty:netty-common;4.1.104.Final
io.netty:netty-codec;4.1.104.Final
io.netty:netty-codec-http;4.1.104.Final
io.netty:netty-codec-http2;4.1.104.Final
io.netty:netty-transport;4.1.104.Final
io.netty:netty-handler;4.1.104.Final
io.netty:netty-handler-proxy;4.1.104.Final
io.netty:netty-tcnative;2.0.62.Final
io.netty:netty-tcnative-boringssl-static;2.0.62.Final
io.netty:netty-transport-native-epoll;4.1.101.Final
io.netty:netty-transport-native-unix-common;4.1.101.Final
io.netty:netty-transport-native-kqueue;4.1.101.Final
io.projectreactor.netty:reactor-netty;1.1.13
io.projectreactor.netty:reactor-netty-http;1.1.13
io.projectreactor:reactor-core;3.6.0
io.netty:netty-transport-native-epoll;4.1.104.Final
io.netty:netty-transport-native-unix-common;4.1.104.Final
io.netty:netty-transport-native-kqueue;4.1.104.Final
io.projectreactor.netty:reactor-netty;1.1.14
io.projectreactor.netty:reactor-netty-http;1.1.14
io.projectreactor:reactor-core;3.6.1
io.vertx:vertx-codegen;4.5.0
io.vertx:vertx-core;4.5.0
io.vertx:vertx-reactive-streams;4.5.0
Expand All @@ -84,7 +84,7 @@ org.apache.avro:avro;1.11.3
org.apache.avro:avro-maven-plugin;1.11.3
org.apache.commons:commons-lang3;3.13.0
org.apache.httpcomponents:httpclient;4.5.14
org.apache.kafka:kafka-clients;3.6.0
org.apache.kafka:kafka-clients;3.6.1
org.apache.logging.log4j:log4j-api;2.21.1
org.apache.logging.log4j:log4j-core;2.21.1
org.apache.logging.log4j:log4j-slf4j-impl;2.21.1
Expand All @@ -97,7 +97,7 @@ 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;4.0.10
org.codehaus.janino:janino;3.1.10
org.codehaus.janino:janino;3.1.11
org.conscrypt:conscrypt-openjdk-uber;2.2.1
org.glassfish.tyrus:tyrus-client;1.16
org.hibernate.validator:hibernate-validator;8.0.1.Final
Expand All @@ -110,66 +110,66 @@ org.graalvm.sdk:graal-sdk;22.0.0.2
org.graalvm.nativeimage:svm;22.0.0.2
org.messaginghub:pooled-jms;3.1.5
org.postgresql:postgresql;42.6.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.3.2
org.slf4j:slf4j-api;2.0.9
org.slf4j:slf4j-nop;2.0.9
org.slf4j:slf4j-simple;2.0.9
redis.clients:jedis;5.0.2
io.lettuce:lettuce-core;6.3.0.RELEASE
org.redisson:redisson;3.17.0
net.bytebuddy:byte-buddy;1.14.10
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;3.2.0
org.springframework.boot:spring-boot-actuator;3.2.0
org.springframework.boot:spring-boot-actuator-autoconfigure;3.2.0
org.springframework.boot:spring-boot-autoconfigure-processor;3.2.0
org.springframework.boot:spring-boot-autoconfigure;3.2.0
org.springframework.boot:spring-boot-configuration-metadata;3.2.0
org.springframework.boot:spring-boot-configuration-processor;3.2.0
org.springframework.boot:spring-boot-maven-plugin;3.2.0
org.springframework.boot:spring-boot-starter-actuator;3.2.0
org.springframework.boot:spring-boot-starter-aop;3.2.0
org.springframework.boot:spring-boot-starter-cache;3.2.0
org.springframework.boot:spring-boot-starter-data-redis;3.2.0
org.springframework.boot:spring-boot-starter-data-jdbc;3.2.0
org.springframework.boot:spring-boot-starter-integration;3.2.0
org.springframework.boot:spring-boot-starter-logging;3.2.0
org.springframework.boot:spring-boot-starter-test;3.2.0
org.springframework.boot:spring-boot-starter-validation;3.2.0
org.springframework.boot:spring-boot-starter-web;3.2.0
org.springframework.boot:spring-boot-starter;3.2.0
org.springframework.boot:spring-boot-test;3.2.0
org.springframework.boot:spring-boot;3.2.0
org.springframework.data:spring-data-commons;3.2.0
org.springframework.data:spring-data-mongodb;4.2.0
org.springframework.data:spring-data-redis;3.2.0
org.springframework.boot:spring-boot-dependencies;3.2.1
org.springframework.boot:spring-boot-actuator;3.2.1
org.springframework.boot:spring-boot-actuator-autoconfigure;3.2.1
org.springframework.boot:spring-boot-autoconfigure-processor;3.2.1
org.springframework.boot:spring-boot-autoconfigure;3.2.1
org.springframework.boot:spring-boot-configuration-metadata;3.2.1
org.springframework.boot:spring-boot-configuration-processor;3.2.1
org.springframework.boot:spring-boot-maven-plugin;3.2.1
org.springframework.boot:spring-boot-starter-actuator;3.2.1
org.springframework.boot:spring-boot-starter-aop;3.2.1
org.springframework.boot:spring-boot-starter-cache;3.2.1
org.springframework.boot:spring-boot-starter-data-redis;3.2.1
org.springframework.boot:spring-boot-starter-data-jdbc;3.2.1
org.springframework.boot:spring-boot-starter-integration;3.2.1
org.springframework.boot:spring-boot-starter-logging;3.2.1
org.springframework.boot:spring-boot-starter-test;3.2.1
org.springframework.boot:spring-boot-starter-validation;3.2.1
org.springframework.boot:spring-boot-starter-web;3.2.1
org.springframework.boot:spring-boot-starter;3.2.1
org.springframework.boot:spring-boot-test;3.2.1
org.springframework.boot:spring-boot;3.2.1
org.springframework.data:spring-data-commons;3.2.1
org.springframework.data:spring-data-mongodb;4.2.1
org.springframework.data:spring-data-redis;3.2.1
org.springframework.experimental:spring-aot;0.11.4
org.springframework.experimental:spring-aot-maven-plugin;0.11.4
org.springframework.integration:spring-integration-core;6.2.0
org.springframework.kafka:spring-kafka;3.1.0
org.springframework.security:spring-security-config;6.2.0
org.springframework.security:spring-security-core;6.2.0
org.springframework.security:spring-security-oauth2-client;6.2.0
org.springframework.security:spring-security-oauth2-resource-server;6.2.0
org.springframework.security:spring-security-oauth2-core;6.2.0
org.springframework.security:spring-security-oauth2-jose;6.2.0
org.springframework.security:spring-security-web;6.2.0
org.springframework:spring-beans;6.1.1
org.springframework:spring-context-support;6.1.1
org.springframework:spring-context;6.1.1
org.springframework:spring-core;6.1.1
org.springframework:spring-expression;6.1.1
org.springframework:spring-jdbc;6.1.1
org.springframework:spring-jms;6.1.1
org.springframework:spring-messaging;6.1.1
org.springframework:spring-tx;6.1.1
org.springframework:spring-web;6.1.1
org.springframework:spring-webmvc;6.1.1
org.springframework:spring-test;6.1.1
org.springframework.retry:spring-retry;2.0.4
org.springframework.boot:spring-boot-starter-parent;3.2.0
org.springframework.integration:spring-integration-core;6.2.1
org.springframework.kafka:spring-kafka;3.1.1
org.springframework.security:spring-security-config;6.2.1
org.springframework.security:spring-security-core;6.2.1
org.springframework.security:spring-security-oauth2-client;6.2.1
org.springframework.security:spring-security-oauth2-resource-server;6.2.1
org.springframework.security:spring-security-oauth2-core;6.2.1
org.springframework.security:spring-security-oauth2-jose;6.2.1
org.springframework.security:spring-security-web;6.2.1
org.springframework:spring-beans;6.1.2
org.springframework:spring-context-support;6.1.2
org.springframework:spring-context;6.1.2
org.springframework:spring-core;6.1.2
org.springframework:spring-expression;6.1.2
org.springframework:spring-jdbc;6.1.2
org.springframework:spring-jms;6.1.2
org.springframework:spring-messaging;6.1.2
org.springframework:spring-tx;6.1.2
org.springframework:spring-web;6.1.2
org.springframework:spring-webmvc;6.1.2
org.springframework:spring-test;6.1.2
org.springframework.retry:spring-retry;2.0.5
org.springframework.boot:spring-boot-starter-parent;3.2.1

## Spring cloud dependency versions
org.springframework.cloud:spring-cloud-dependencies;2023.0.0
Expand Down Expand Up @@ -217,7 +217,7 @@ io.opentelemetry.instrumentation:opentelemetry-spring-boot-starter;1.32.0-alpha
io.opentelemetry.instrumentation:opentelemetry-jdbc;1.32.0-alpha
io.opentelemetry.instrumentation:opentelemetry-logback-appender-1.0;1.32.0-alpha

io.projectreactor:reactor-test;3.6.0
io.projectreactor:reactor-test;3.6.1
io.github.hakky54:logcaptor;2.9.0
com.squareup.okio:okio;3.6.0
com.squareup.okio:okio-jvm;3.6.0
Expand All @@ -227,8 +227,8 @@ org.assertj:assertj-core;3.24.2
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.53.v20231009
org.eclipse.jetty:jetty-server;9.4.53.v20231009
org.eclipse.jetty:jetty-http;12.0.5
org.eclipse.jetty:jetty-server;12.0.5
org.eclipse.jetty:jetty-servlet;9.4.53.v20231009
org.eclipse.jgit:org.eclipse.jgit;4.5.7.201904151645-r
org.glassfish:javax.json;1.1.4
Expand Down Expand Up @@ -271,9 +271,9 @@ com.puppycrawl.tools:checkstyle;9.3
com.toasttab.android:gummy-bears-api-26;0.5.1
commons-io:commons-io;2.11.0
commons-validator:commons-validator;1.6
io.dropwizard.metrics:metrics-core;4.2.22
io.dropwizard.metrics:metrics-graphite;4.2.22
io.dropwizard.metrics:metrics-jvm;4.2.22
io.dropwizard.metrics:metrics-core;4.2.23
io.dropwizard.metrics:metrics-graphite;4.2.23
io.dropwizard.metrics:metrics-jvm;4.2.23
io.reactivex.rxjava2:rxjava;2.2.21
net.java.dev.jna:jna-platform;5.6.0
net.oneandone.reflections8:reflections8;0.11.7
Expand All @@ -296,7 +296,7 @@ org.apache.maven.plugins:maven-failsafe-plugin;3.1.2
org.apache.maven.plugins:maven-help-plugin;3.4.0
org.apache.maven.plugins:maven-install-plugin;3.1.1
org.apache.maven.plugins:maven-jar-plugin;3.3.0
org.apache.maven.plugins:maven-javadoc-plugin;3.6.2
org.apache.maven.plugins:maven-javadoc-plugin;3.6.3
org.apache.maven.plugins:maven-jxr-plugin;3.0.0
org.apache.maven.plugins:maven-plugin-plugin;3.6.4
org.apache.maven.plugins:maven-project-info-reports-plugin;3.0.0
Expand All @@ -318,7 +318,7 @@ org.eclipse.m2e:lifecycle-mapping;1.0.0
org.hdrhistogram:HdrHistogram;2.1.12
org.jacoco:jacoco-maven-plugin;0.8.11
org.jacoco:org.jacoco.agent;0.8.11
org.mockito:mockito-core;4.11.0
org.mockito:mockito-core;5.7.0
org.mockito:mockito-inline;4.11.0
org.moditect:moditect-maven-plugin;1.0.0.RC1
org.ow2.asm:asm;9.6
Expand Down Expand Up @@ -433,6 +433,6 @@ spring_redis.clients:jedis;3.8.0
# Spring Boot 3 dependency versions
jakarta.servlet:jakarta.servlet-api;6.0.0
jakarta.xml.bind:jakarta.xml.bind-api;4.0.1
org.springframework.boot:spring-boot-starter-log4j2;3.2.0
org.springframework.boot:spring-boot-starter-log4j2;3.2.1
org.springframework.cloud:spring-cloud-stream-test-binder;4.1.0
org.springframework:spring-core-test;6.1.1
org.springframework:spring-core-test;6.1.2
4 changes: 2 additions & 2 deletions sdk/advisor/azure-resourcemanager-advisor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,13 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>4.11.0</version> <!-- {x-version-update;org.mockito:mockito-core;external_dependency} -->
<version>5.7.0</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.9</version> <!-- {x-version-update;org.slf4j:slf4j-simple;external_dependency} -->
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions sdk/agrifood/azure-resourcemanager-agrifood/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,13 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>4.11.0</version> <!-- {x-version-update;org.mockito:mockito-core;external_dependency} -->
<version>5.7.0</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.9</version> <!-- {x-version-update;org.slf4j:slf4j-simple;external_dependency} -->
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions sdk/anomalydetector/azure-ai-anomalydetector/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,13 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>4.11.0</version> <!-- {x-version-update;org.mockito:mockito-core;external_dependency} -->
<version>5.7.0</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.9</version> <!-- {x-version-update;org.slf4j:slf4j-simple;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
Expand Down
Loading
Loading