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.0.0 and Spring Cloud 2022.0.0-RC2 #32331

Closed
wants to merge 1 commit into from
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions common/perf-test-core/pom.xml
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.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.4.23]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
<include>io.projectreactor:reactor-core:[3.5.0]</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.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
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.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
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.1</version> <!-- {x-version-update;com.fasterxml.jackson.dataformat:jackson-dataformat-xml;external_dependency} -->
</dependency>
<dependency>
<groupId>com.fasterxml.woodstox</groupId>
Expand Down
226 changes: 113 additions & 113 deletions eng/versioning/external_dependencies.txt
@@ -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_2.7.4_managed_external_dependencies.txt
# If your version is different from sdk/spring/scripts/spring_boot_2.7.4_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.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.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 All @@ -39,41 +39,41 @@ com.microsoft.azure:qpid-proton-j-extensions;1.2.4
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;10.2.1.jre8
com.microsoft.sqlserver:mssql-jdbc;11.2.1.jre17
com.microsoft.azure:spring-data-cosmosdb;2.3.0
com.mysql:mysql-connector-j;8.0.31
com.squareup.okhttp3:mockwebserver;4.10.0
com.squareup.okhttp3:okhttp;4.10.0
com.zaxxer:HikariCP;4.0.3
com.zaxxer:HikariCP;5.0.1
commons-codec:commons-codec;1.15
commons-net:commons-net;3.6
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.9.4
io.micrometer:micrometer-registry-azure-monitor;1.9.4
io.micrometer:micrometer-registry-graphite;1.9.4
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.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-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.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.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
io.reactivex:rxjava;1.3.8
io.vertx:vertx-codegen;4.3.3
io.vertx:vertx-core;4.3.3
jakarta.validation:jakarta.validation-api;2.0.2
jakarta.xml.bind:jakarta.xml.bind-api;2.3.3
jakarta.validation:jakarta.validation-api;3.0.2
jakarta.xml.bind:jakarta.xml.bind-api;4.0.0
javax.annotation:javax.annotation-api;1.3.2
javax.json:javax.json-api;1.1.4
javax.servlet:javax.servlet-api;4.0.1
Expand All @@ -85,10 +85,10 @@ 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.1.2
org.apache.logging.log4j:log4j-api;2.17.2
org.apache.logging.log4j:log4j-core;2.17.2
org.apache.logging.log4j:log4j-slf4j-impl;2.17.2
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 @@ -98,87 +98,87 @@ 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;6.2.5.Final
org.hibernate.validator:hibernate-validator;8.0.0.Final
org.javatuples:javatuples;1.2
org.linguafranca.pwdb:KeePassJava2;2.1.4
org.graalvm.buildtools:junit-platform-native;0.9.10
org.graalvm.buildtools:native-maven-plugin;0.9.10
org.graalvm.sdk:graal-sdk;22.0.0.2
org.graalvm.nativeimage:svm;22.0.0.2
org.messaginghub:pooled-jms;1.2.4
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.3.7
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.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.17
net.bytebuddy:byte-buddy;1.12.19

## Spring boot dependency versions
org.springframework.boot:spring-boot-dependencies;2.7.4
org.springframework.boot:spring-boot-actuator;2.7.4
org.springframework.boot:spring-boot-actuator-autoconfigure;2.7.4
org.springframework.boot:spring-boot-autoconfigure-processor;2.7.4
org.springframework.boot:spring-boot-autoconfigure;2.7.4
org.springframework.boot:spring-boot-configuration-metadata;2.7.4
org.springframework.boot:spring-boot-configuration-processor;2.7.4
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;2.7.4
org.springframework.boot:spring-boot-starter-actuator;2.7.4
org.springframework.boot:spring-boot-starter-aop;2.7.4
org.springframework.boot:spring-boot-starter-cache;2.7.4
org.springframework.boot:spring-boot-starter-data-redis;2.7.4
org.springframework.boot:spring-boot-starter-integration;2.7.4
org.springframework.boot:spring-boot-starter-logging;2.7.4
org.springframework.boot:spring-boot-starter-test;2.7.4
org.springframework.boot:spring-boot-starter-validation;2.7.4
org.springframework.boot:spring-boot-starter-web;2.7.4
org.springframework.boot:spring-boot-starter;2.7.4
org.springframework.boot:spring-boot-test;2.7.4
org.springframework.boot:spring-boot;2.7.4
org.springframework.data:spring-data-commons;2.7.3
org.springframework.data:spring-data-mongodb;3.4.3
org.springframework.data:spring-data-redis;2.7.3
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;5.5.15
org.springframework.kafka:spring-kafka;2.8.9
org.springframework.security:spring-security-config;5.7.5
org.springframework.security:spring-security-core;5.7.5
org.springframework.security:spring-security-oauth2-client;5.7.5
org.springframework.security:spring-security-oauth2-resource-server;5.7.5
org.springframework.security:spring-security-oauth2-core;5.7.5
org.springframework.security:spring-security-oauth2-jose;5.7.5
org.springframework.security:spring-security-web;5.7.5
org.springframework:spring-beans;5.3.23
org.springframework:spring-context-support;5.3.23
org.springframework:spring-context;5.3.23
org.springframework:spring-core;5.3.23
org.springframework:spring-expression;5.3.23
org.springframework:spring-jdbc;5.3.23
org.springframework:spring-jms;5.3.23
org.springframework:spring-messaging;5.3.23
org.springframework:spring-tx;5.3.23
org.springframework:spring-web;5.3.23
org.springframework:spring-webmvc;5.3.23
org.springframework:spring-test;5.3.23
org.springframework.retry:spring-retry;1.3.3
org.springframework.boot:spring-boot-starter-parent;2.7.4
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;2021.0.4
org.springframework.cloud:spring-cloud-starter-bootstrap;3.1.4
org.springframework.cloud:spring-cloud-bus;3.1.2
org.springframework.cloud:spring-cloud-context;3.1.4
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-sleuth-api;3.1.4
org.springframework.cloud:spring-cloud-starter-sleuth;3.1.4
org.springframework.cloud:spring-cloud-starter-stream-kafka;3.2.5
org.springframework.cloud:spring-cloud-stream-binder-test;3.2.5
org.springframework.cloud:spring-cloud-stream;3.2.5
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

pl.pragmatists:JUnitParams;1.1.1

Expand All @@ -203,26 +203,26 @@ com.microsoft.azure:azure-storage;8.0.0
com.microsoft.azure:msal4j;1.13.3
com.microsoft.azure:msal4j-persistence-extension;1.1.0
com.sun.activation:jakarta.activation;1.2.2
io.opentelemetry:opentelemetry-api;1.14.0
io.opentelemetry:opentelemetry-sdk;1.14.0
io.opentelemetry:opentelemetry-exporter-logging;1.14.0
io.opentelemetry:opentelemetry-exporter-jaeger;1.14.0
io.opentelemetry:opentelemetry-exporter-otlp;1.14.0
io.opentelemetry:opentelemetry-sdk-testing;1.14.0
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-logs;1.14.0-alpha
io.projectreactor:reactor-test;3.4.23
io.projectreactor:reactor-test;3.5.0
junit:junit;4.13.2
commons-cli:commons-cli;1.3
org.apache.maven:maven-compat;3.6.2
org.apache.maven:maven-embedder;3.6.2
org.apache.maven.wagon:wagon-http;3.3.4
org.apache.maven.wagon:wagon-provider-api;3.3.4
org.assertj:assertj-core;3.22.0
org.assertj:assertj-core;3.23.1
org.bouncycastle:bcprov-jdk15on;1.68
org.eclipse.aether:aether-connector-basic;1.1.0
org.eclipse.aether:aether-transport-wagon;1.1.0
org.eclipse.jetty:jetty-http;9.4.49.v20220914
org.eclipse.jetty:jetty-server;9.4.49.v20220914
org.eclipse.jetty:jetty-http;11.0.12
org.eclipse.jetty:jetty-server;11.0.12
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 @@ -262,9 +262,9 @@ com.nimbusds:nimbus-jose-jwt;9.22
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 Expand Up @@ -307,8 +307,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.5.1
org.mockito:mockito-inline;4.5.1
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
Expand Up @@ -72,13 +72,13 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>4.5.1</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.4</version> <!-- {x-version-update;org.slf4j:slf4j-simple;external_dependency} -->
<scope>test</scope>
</dependency>
</dependencies>
Expand Down