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.3.0 and Spring Cloud 2023.0.1 #40350

Merged
Merged
Show file tree
Hide file tree
Changes from 10 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
  •  
  •  
  •  
8 changes: 8 additions & 0 deletions .vscode/cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -999,6 +999,7 @@
"collectd",
"crac",
"cratedb",
"cyclonedx",
"datastax",
"dbcp",
"debezium",
Expand All @@ -1019,12 +1020,15 @@
"hikaricp",
"hivemq",
"hocon",
"hornetq",
"hppc",
"hqclient",
"hsqldb",
"humio",
"hystrix",
"inmemory",
"infinispan",
"informix",
"integ",
"iostreams",
"istack",
Expand All @@ -1039,6 +1043,8 @@
"jaxrs",
"jaxws",
"jcache",
"jcloud",
"jclouds",
"jdbi",
"jdom",
"jgit",
Expand Down Expand Up @@ -1093,6 +1099,7 @@
"proxool",
"qdrant",
"qpack",
"quarkus",
"questdb",
"quic",
"rabbitmq",
Expand All @@ -1115,6 +1122,7 @@
"stax",
"staxex",
"stree",
"sybasease",
"tcnative",
"tekton",
"testng",
Expand Down
6 changes: 3 additions & 3 deletions common/perf-test-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,12 @@
<rules>
<bannedDependencies>
<includes combine.children="append">
<include>com.fasterxml.jackson.core:jackson-databind:[2.15.4]</include> <!-- {x-include-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
<include>com.fasterxml.jackson.core:jackson-databind:[2.17.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} -->

<include>io.projectreactor:reactor-core:[3.6.5]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
<include>io.projectreactor:reactor-core:[3.6.6]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
<include>io.vertx:vertx-codegen:[4.5.7]</include> <!-- {x-include-update;io.vertx:vertx-codegen;external_dependency} -->
</includes>
</bannedDependencies>
Expand All @@ -72,7 +72,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.15.4</version> <!-- {x-version-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
<version>2.17.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 eng/bomgenerator/pom.xml
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.15.4</version> <!-- {x-version-update;com.fasterxml.jackson.dataformat:jackson-dataformat-xml;external_dependency} -->
<version>2.17.1</version> <!-- {x-version-update;com.fasterxml.jackson.dataformat:jackson-dataformat-xml;external_dependency} -->
</dependency>
</dependencies>
<build>
Expand Down
198 changes: 99 additions & 99 deletions eng/versioning/external_dependencies.txt
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
# 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.5_managed_external_dependencies.txt
# If your version is different from sdk/spring/scripts/spring_boot_3.2.5_managed_external_dependencies.txt,
# make sure the version is same to sdk/spring/scripts/spring_boot_3.3.0_managed_external_dependencies.txt
# If your version is different from sdk/spring/scripts/spring_boot_3.3.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.14
ch.qos.logback:logback-classic;1.5.6
com.azure.tools:azure-autorest-customization;1.0.0-beta.8
com.fasterxml.jackson.core:jackson-annotations;2.15.4
com.fasterxml.jackson.core:jackson-core;2.15.4
com.fasterxml.jackson.core:jackson-databind;2.15.4
com.fasterxml.jackson.dataformat:jackson-dataformat-avro;2.15.4
com.fasterxml.jackson.dataformat:jackson-dataformat-xml;2.15.4
com.fasterxml.jackson.datatype:jackson-datatype-jdk8;2.15.4
com.fasterxml.jackson.datatype:jackson-datatype-jsr310;2.15.4
com.fasterxml.jackson.module:jackson-module-parameter-names;2.15.4
com.fasterxml.jackson.module:jackson-module-scala_2.12;2.15.4
com.fasterxml.jackson.module:jackson-module-afterburner;2.15.4
com.fasterxml.jackson.core:jackson-annotations;2.17.1
com.fasterxml.jackson.core:jackson-core;2.17.1
com.fasterxml.jackson.core:jackson-databind;2.17.1
com.fasterxml.jackson.dataformat:jackson-dataformat-avro;2.17.1
com.fasterxml.jackson.dataformat:jackson-dataformat-xml;2.17.1
com.fasterxml.jackson.datatype:jackson-datatype-jdk8;2.17.1
com.fasterxml.jackson.datatype:jackson-datatype-jsr310;2.17.1
com.fasterxml.jackson.module:jackson-module-parameter-names;2.17.1
com.fasterxml.jackson.module:jackson-module-scala_2.12;2.17.1
com.fasterxml.jackson.module:jackson-module-afterburner;2.17.1
com.fasterxml.woodstox:woodstox-core;6.4.0
com.github.spotbugs:spotbugs;4.8.3
com.github.spotbugs:spotbugs-annotations;4.8.3
Expand All @@ -44,7 +44,7 @@ com.microsoft.azure:qpid-proton-j-extensions;1.2.5
com.microsoft.azure.sdk.iot:iot-service-client;1.30.0
com.microsoft.rest:client-runtime;1.7.4
com.microsoft.rest.v2:client-runtime;2.1.1
com.microsoft.sqlserver:mssql-jdbc;12.4.2.jre11
com.microsoft.sqlserver:mssql-jdbc;12.6.1.jre11
com.microsoft.azure:spring-data-cosmosdb;2.3.0
com.microsoft.azure:azure-functions-maven-plugin;1.30.0
com.microsoft.azure.functions:azure-functions-java-library;2.2.0
Expand All @@ -56,25 +56,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.12.1
io.micrometer:micrometer-core;1.12.5
io.micrometer:micrometer-registry-azure-monitor;1.12.5
io.micrometer:micrometer-registry-graphite;1.12.5
io.netty:netty-buffer;4.1.109.Final
io.netty:netty-common;4.1.109.Final
io.netty:netty-codec;4.1.109.Final
io.netty:netty-codec-http;4.1.109.Final
io.netty:netty-codec-http2;4.1.109.Final
io.netty:netty-transport;4.1.109.Final
io.netty:netty-handler;4.1.109.Final
io.netty:netty-handler-proxy;4.1.109.Final
io.micrometer:micrometer-core;1.13.0
io.micrometer:micrometer-registry-azure-monitor;1.13.0
io.micrometer:micrometer-registry-graphite;1.13.0
io.netty:netty-buffer;4.1.110.Final
io.netty:netty-common;4.1.110.Final
io.netty:netty-codec;4.1.110.Final
io.netty:netty-codec-http;4.1.110.Final
io.netty:netty-codec-http2;4.1.110.Final
io.netty:netty-transport;4.1.110.Final
io.netty:netty-handler;4.1.110.Final
io.netty:netty-handler-proxy;4.1.110.Final
io.netty:netty-tcnative;2.0.65.Final
io.netty:netty-tcnative-boringssl-static;2.0.65.Final
io.netty:netty-transport-native-epoll;4.1.109.Final
io.netty:netty-transport-native-unix-common;4.1.109.Final
io.netty:netty-transport-native-kqueue;4.1.109.Final
io.projectreactor.netty:reactor-netty;1.1.18
io.projectreactor.netty:reactor-netty-http;1.1.18
io.projectreactor:reactor-core;3.6.5
io.netty:netty-transport-native-epoll;4.1.110.Final
io.netty:netty-transport-native-unix-common;4.1.110.Final
io.netty:netty-transport-native-kqueue;4.1.110.Final
io.projectreactor.netty:reactor-netty;1.1.19
io.projectreactor.netty:reactor-netty-http;1.1.19
io.projectreactor:reactor-core;3.6.6
io.vertx:vertx-codegen;4.5.7
io.vertx:vertx-core;4.5.7
io.vertx:vertx-reactive-streams;4.5.7
Expand All @@ -86,13 +86,13 @@ javax.websocket:javax.websocket-api;1.1
org.apache.commons:commons-compress;1.26.0
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.commons:commons-lang3;3.14.0
org.apache.groovy:groovy;4.0.21
org.apache.httpcomponents:httpclient;4.5.14
org.apache.kafka:kafka-clients;3.6.2
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
org.apache.kafka:kafka-clients;3.7.0
org.apache.logging.log4j:log4j-api;2.23.1
org.apache.logging.log4j:log4j-core;2.23.1
org.apache.logging.log4j:log4j-slf4j-impl;2.23.1
org.apache.maven:maven-core;3.9.6
org.apache.maven.archetype:archetype-packaging;3.2.1
org.apache.maven.plugins:maven-archetype-plugin;3.2.1
Expand All @@ -111,72 +111,72 @@ org.javatuples:javatuples;1.2
org.openjfx:javafx-graphics;17.0.6
org.linguafranca.pwdb:KeePassJava2;2.1.4
org.graalvm.buildtools:junit-platform-native;0.9.19
org.graalvm.buildtools:native-maven-plugin;0.9.28
org.graalvm.buildtools:native-maven-plugin;0.10.2
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.2
org.messaginghub:pooled-jms;3.1.6
org.postgresql:postgresql;42.7.3
org.slf4j:slf4j-api;2.0.13
org.slf4j:slf4j-nop;2.0.13
org.slf4j:slf4j-simple;2.0.13
redis.clients:jedis;5.1.0
io.lettuce:lettuce-core;6.3.2.RELEASE
org.redisson:redisson;3.27.2
net.bytebuddy:byte-buddy;1.14.13
net.bytebuddy:byte-buddy-agent;1.14.13
net.bytebuddy:byte-buddy;1.14.16
net.bytebuddy:byte-buddy-agent;1.14.16
testdep_net.bytebuddy:byte-buddy;1.14.12
testdep_net.bytebuddy:byte-buddy-agent;1.14.12

## Spring boot dependency versions
org.springframework.boot:spring-boot-dependencies;3.2.5
org.springframework.boot:spring-boot-actuator;3.2.5
org.springframework.boot:spring-boot-actuator-autoconfigure;3.2.5
org.springframework.boot:spring-boot-autoconfigure-processor;3.2.5
org.springframework.boot:spring-boot-autoconfigure;3.2.5
org.springframework.boot:spring-boot-configuration-metadata;3.2.5
org.springframework.boot:spring-boot-configuration-processor;3.2.5
org.springframework.boot:spring-boot-maven-plugin;3.2.5
org.springframework.boot:spring-boot-starter-actuator;3.2.5
org.springframework.boot:spring-boot-starter-aop;3.2.5
org.springframework.boot:spring-boot-starter-cache;3.2.5
org.springframework.boot:spring-boot-starter-data-redis;3.2.5
org.springframework.boot:spring-boot-starter-data-jdbc;3.2.5
org.springframework.boot:spring-boot-starter-integration;3.2.5
org.springframework.boot:spring-boot-starter-logging;3.2.5
org.springframework.boot:spring-boot-starter-test;3.2.5
org.springframework.boot:spring-boot-starter-validation;3.2.5
org.springframework.boot:spring-boot-starter-web;3.2.5
org.springframework.boot:spring-boot-starter;3.2.5
org.springframework.boot:spring-boot-test;3.2.5
org.springframework.boot:spring-boot;3.2.5
org.springframework.data:spring-data-commons;3.2.5
org.springframework.data:spring-data-mongodb;4.2.5
org.springframework.data:spring-data-redis;3.2.5
org.springframework.boot:spring-boot-dependencies;3.3.0
org.springframework.boot:spring-boot-actuator;3.3.0
org.springframework.boot:spring-boot-actuator-autoconfigure;3.3.0
org.springframework.boot:spring-boot-autoconfigure-processor;3.3.0
org.springframework.boot:spring-boot-autoconfigure;3.3.0
org.springframework.boot:spring-boot-configuration-metadata;3.3.0
org.springframework.boot:spring-boot-configuration-processor;3.3.0
org.springframework.boot:spring-boot-maven-plugin;3.3.0
org.springframework.boot:spring-boot-starter-actuator;3.3.0
org.springframework.boot:spring-boot-starter-aop;3.3.0
org.springframework.boot:spring-boot-starter-cache;3.3.0
org.springframework.boot:spring-boot-starter-data-redis;3.3.0
org.springframework.boot:spring-boot-starter-data-jdbc;3.3.0
org.springframework.boot:spring-boot-starter-integration;3.3.0
org.springframework.boot:spring-boot-starter-logging;3.3.0
org.springframework.boot:spring-boot-starter-test;3.3.0
org.springframework.boot:spring-boot-starter-validation;3.3.0
org.springframework.boot:spring-boot-starter-web;3.3.0
org.springframework.boot:spring-boot-starter;3.3.0
org.springframework.boot:spring-boot-test;3.3.0
org.springframework.boot:spring-boot;3.3.0
org.springframework.data:spring-data-commons;3.3.0
org.springframework.data:spring-data-mongodb;4.3.0
org.springframework.data:spring-data-redis;3.3.0
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.4
org.springframework.kafka:spring-kafka;3.1.4
org.springframework.security:spring-security-config;6.2.4
org.springframework.security:spring-security-core;6.2.4
org.springframework.security:spring-security-oauth2-client;6.2.4
org.springframework.security:spring-security-oauth2-resource-server;6.2.4
org.springframework.security:spring-security-oauth2-core;6.2.4
org.springframework.security:spring-security-oauth2-jose;6.2.4
org.springframework.security:spring-security-web;6.2.4
org.springframework:spring-beans;6.1.6
org.springframework:spring-context-support;6.1.6
org.springframework:spring-context;6.1.6
org.springframework:spring-core;6.1.6
org.springframework:spring-expression;6.1.6
org.springframework:spring-jdbc;6.1.6
org.springframework:spring-jms;6.1.6
org.springframework:spring-messaging;6.1.6
org.springframework:spring-tx;6.1.6
org.springframework:spring-web;6.1.6
org.springframework:spring-webmvc;6.1.6
org.springframework:spring-test;6.1.6
org.springframework.retry:spring-retry;2.0.5
org.springframework.boot:spring-boot-starter-parent;3.2.5
org.springframework.integration:spring-integration-core;6.3.0
org.springframework.kafka:spring-kafka;3.2.0
org.springframework.security:spring-security-config;6.3.0
org.springframework.security:spring-security-core;6.3.0
org.springframework.security:spring-security-oauth2-client;6.3.0
org.springframework.security:spring-security-oauth2-resource-server;6.3.0
org.springframework.security:spring-security-oauth2-core;6.3.0
org.springframework.security:spring-security-oauth2-jose;6.3.0
org.springframework.security:spring-security-web;6.3.0
org.springframework:spring-beans;6.1.8
org.springframework:spring-context-support;6.1.8
org.springframework:spring-context;6.1.8
org.springframework:spring-core;6.1.8
org.springframework:spring-expression;6.1.8
org.springframework:spring-jdbc;6.1.8
org.springframework:spring-jms;6.1.8
org.springframework:spring-messaging;6.1.8
org.springframework:spring-tx;6.1.8
org.springframework:spring-web;6.1.8
org.springframework:spring-webmvc;6.1.8
org.springframework:spring-test;6.1.8
org.springframework.retry:spring-retry;2.0.6
org.springframework.boot:spring-boot-starter-parent;3.3.0

## Spring cloud dependency versions
org.springframework.cloud:spring-cloud-dependencies;2023.0.1
Expand Down Expand Up @@ -221,13 +221,13 @@ io.opentelemetry.instrumentation:opentelemetry-spring-boot-starter;2.4.0-alpha
io.opentelemetry.instrumentation:opentelemetry-jdbc;2.4.0-alpha
io.opentelemetry.instrumentation:opentelemetry-logback-appender-1.0;2.4.0-alpha

io.projectreactor:reactor-test;3.6.5
io.projectreactor:reactor-test;3.6.6
io.github.hakky54:logcaptor;2.9.0
com.squareup.okio:okio;3.9.0
com.squareup.okio:okio-jvm;3.9.0
junit:junit;4.13.2
commons-cli:commons-cli;1.3
org.assertj:assertj-core;3.24.2
org.assertj:assertj-core;3.25.3
org.bouncycastle:bcprov-jdk15to18;1.77
org.bouncycastle:bcprov-jdk18on;1.77
org.bouncycastle:bcpkix-lts8on;2.73.3
Expand Down Expand Up @@ -286,7 +286,7 @@ net.jonathangiles.tools:dependencyChecker-maven-plugin;1.0.6
net.jonathangiles.tools:whitelistgenerator-maven-plugin;1.0.2
org.apache.commons:commons-collections4;4.4
org.apache.commons:commons-text;1.10.0
org.apache.commons:commons-dbcp2;2.10.0
org.apache.commons:commons-dbcp2;2.12.0
org.apache.maven:maven-plugin-api;3.9.6
org.apache.maven:maven-project;2.2.1
org.apache.maven.plugin-tools:maven-plugin-annotations;3.12.0
Expand All @@ -299,15 +299,15 @@ org.apache.maven.plugins:maven-eclipse-plugin;2.10
org.apache.maven.plugins:maven-enforcer-plugin;3.4.1
org.apache.maven.plugins:maven-failsafe-plugin;3.2.5
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-install-plugin;3.1.2
org.apache.maven.plugins:maven-jar-plugin;3.4.1
org.apache.maven.plugins:maven-javadoc-plugin;3.6.3
org.apache.maven.plugins:maven-jxr-plugin;3.3.2
org.apache.maven.plugins:maven-plugin-plugin;3.12.0
org.apache.maven.plugins:maven-project-info-reports-plugin;3.5.0
org.apache.maven.plugins:maven-release-plugin;3.0.1
org.apache.maven.plugins:maven-resources-plugin;3.3.1
org.apache.maven.plugins:maven-shade-plugin;3.5.2
org.apache.maven.plugins:maven-shade-plugin;3.5.3
org.apache.maven.plugins:maven-site-plugin;3.12.1
org.apache.maven.plugins:maven-source-plugin;3.3.1
org.apache.maven.plugins:maven-surefire-plugin;3.2.5
Expand All @@ -323,7 +323,7 @@ org.eclipse.m2e:lifecycle-mapping;1.0.0
org.hdrhistogram:HdrHistogram;2.1.12
org.jacoco:jacoco-maven-plugin;0.8.12
org.jacoco:org.jacoco.agent;0.8.12
org.mockito:mockito-core;5.7.0
org.mockito:mockito-core;5.11.0
org.mockito:mockito-inline;4.11.0
org.moditect:moditect-maven-plugin;1.0.0.RC1
org.ow2.asm:asm;9.7
Expand All @@ -333,8 +333,8 @@ org.revapi:revapi-java-spi;0.23.6
org.revapi:revapi-reporter-json;0.4.5
org.revapi:revapi-maven-plugin;0.14.6
org.sonatype.plugins:nexus-staging-maven-plugin;1.6.8
org.testcontainers:testcontainers;1.19.7
org.testcontainers:junit-jupiter;1.19.7
org.testcontainers:testcontainers;1.19.8
org.testcontainers:junit-jupiter;1.19.8

# External Dependency Exceptions
# This section is for external dependencies whose versions were different than
Expand Down Expand Up @@ -452,6 +452,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.2
org.springframework.boot:spring-boot-starter-log4j2;3.2.5
org.springframework.boot:spring-boot-starter-log4j2;3.3.0
org.springframework.cloud:spring-cloud-stream-test-binder;4.1.1
org.springframework:spring-core-test;6.1.6
org.springframework:spring-core-test;6.1.8
2 changes: 1 addition & 1 deletion sdk/advisor/azure-resourcemanager-advisor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>5.7.0</version> <!-- {x-version-update;org.mockito:mockito-core;external_dependency} -->
<version>5.11.0</version> <!-- {x-version-update;org.mockito:mockito-core;external_dependency} -->
<scope>test</scope>
</dependency>
<!-- bytebuddy dependencies are required for mockito 4.11.0 to work with Java 21. Mockito 4.11.0 is the last release -->
Expand Down
Loading
Loading