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 2.7.4 and Spring Cloud 2021.0.4 #31107

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.3]</include> <!-- {x-include-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
<include>com.fasterxml.jackson.core:jackson-databind:[2.13.4]</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.22]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
<include>io.projectreactor:reactor-core:[3.4.23]</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.3</version> <!-- {x-version-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
<version>2.13.4</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
Expand Up @@ -37,7 +37,7 @@
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-xml</artifactId>
<version>2.13.3</version> <!-- {x-version-update;com.fasterxml.jackson.dataformat:jackson-dataformat-xml;external_dependency} -->
<version>2.13.4</version> <!-- {x-version-update;com.fasterxml.jackson.dataformat:jackson-dataformat-xml;external_dependency} -->
</dependency>
</dependencies>
<build>
Expand Down
172 changes: 86 additions & 86 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.3_managed_external_dependencies.txt
# If your version is different from sdk/spring/scripts/spring_boot_2.7.3_managed_external_dependencies.txt,
# 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,
# 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.3
com.fasterxml.jackson.core:jackson-core;2.13.3
com.fasterxml.jackson.core:jackson-databind;2.13.3
com.fasterxml.jackson.dataformat:jackson-dataformat-avro;2.13.3
com.fasterxml.jackson.dataformat:jackson-dataformat-xml;2.13.3
com.fasterxml.jackson.datatype:jackson-datatype-jdk8;2.13.3
com.fasterxml.jackson.datatype:jackson-datatype-jsr310;2.13.3
com.fasterxml.jackson.module:jackson-module-parameter-names;2.13.3
com.fasterxml.jackson.module:jackson-module-scala_2.12;2.13.3
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
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
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 @@ -48,24 +48,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.9.3
io.micrometer:micrometer-registry-azure-monitor;1.9.3
io.micrometer:micrometer-registry-graphite;1.9.3
io.netty:netty-buffer;4.1.79.Final
io.netty:netty-common;4.1.79.Final
io.netty:netty-codec-http;4.1.79.Final
io.netty:netty-codec-http2;4.1.79.Final
io.netty:netty-transport;4.1.79.Final
io.netty:netty-handler;4.1.79.Final
io.netty:netty-handler-proxy;4.1.79.Final
io.netty:netty-tcnative;2.0.53.Final
io.netty:netty-tcnative-boringssl-static;2.0.53.Final
io.netty:netty-transport-native-epoll;4.1.79.Final
io.netty:netty-transport-native-unix-common;4.1.79.Final
io.netty:netty-transport-native-kqueue;4.1.79.Final
io.projectreactor.netty:reactor-netty;1.0.22
io.projectreactor.netty:reactor-netty-http;1.0.22
io.projectreactor:reactor-core;3.4.22
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.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.reactivex:rxjava;1.3.8
io.vertx:vertx-codegen;4.3.3
io.vertx:vertx-core;4.3.3
Expand All @@ -83,7 +83,7 @@ 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.1
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
Expand All @@ -97,11 +97,11 @@ org.asynchttpclient:async-http-client;2.12.1
org.codehaus.gmavenplus:gmavenplus-plugin;1.13.1
org.codehaus.groovy:groovy-eclipse-batch;2.5.8-01
org.codehaus.groovy:groovy-eclipse-compiler;3.4.0-01
org.codehaus.groovy:groovy-jsr223;3.0.12
org.codehaus.janino:janino;3.1.7
org.codehaus.groovy:groovy-jsr223;3.0.13
org.codehaus.janino:janino;3.1.8
org.conscrypt:conscrypt-openjdk-uber;2.2.1
org.glassfish.tyrus:tyrus-client;1.16
org.hibernate.validator:hibernate-validator;6.2.4.Final
org.hibernate.validator:hibernate-validator;6.2.5.Final
org.javatuples:javatuples;1.2
org.linguafranca.pwdb:KeePassJava2;2.1.4
org.graalvm.buildtools:junit-platform-native;0.9.10
Expand All @@ -111,73 +111,73 @@ org.graalvm.nativeimage:svm;22.0.0.2
org.messaginghub:pooled-jms;1.2.4
org.powermock:powermock-api-mockito2;2.0.9
org.powermock:powermock-module-junit4;2.0.9
org.postgresql:postgresql;42.3.6
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.redisson:redisson;3.17.0
net.bytebuddy:byte-buddy;1.12.13
net.bytebuddy:byte-buddy;1.12.17

## Spring boot dependency versions
org.springframework.boot:spring-boot-dependencies;2.7.3
org.springframework.boot:spring-boot-actuator;2.7.3
org.springframework.boot:spring-boot-actuator-autoconfigure;2.7.3
org.springframework.boot:spring-boot-autoconfigure-processor;2.7.3
org.springframework.boot:spring-boot-autoconfigure;2.7.3
org.springframework.boot:spring-boot-configuration-metadata;2.7.3
org.springframework.boot:spring-boot-configuration-processor;2.7.3
org.springframework.boot:spring-boot-starter-actuator;2.7.3
org.springframework.boot:spring-boot-starter-aop;2.7.3
org.springframework.boot:spring-boot-starter-cache;2.7.3
org.springframework.boot:spring-boot-starter-data-redis;2.7.3
org.springframework.boot:spring-boot-starter-integration;2.7.3
org.springframework.boot:spring-boot-starter-logging;2.7.3
org.springframework.boot:spring-boot-starter-test;2.7.3
org.springframework.boot:spring-boot-starter-validation;2.7.3
org.springframework.boot:spring-boot-starter-web;2.7.3
org.springframework.boot:spring-boot-starter;2.7.3
org.springframework.boot:spring-boot-test;2.7.3
org.springframework.boot:spring-boot;2.7.3
org.springframework.data:spring-data-commons;2.7.2
org.springframework.data:spring-data-mongodb;3.4.2
org.springframework.data:spring-data-redis;2.7.2
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-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.experimental:spring-aot;0.11.4
org.springframework.integration:spring-integration-core;5.5.14
org.springframework.kafka:spring-kafka;2.8.8
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.3
org.springframework.security:spring-security-core;5.7.3
org.springframework.security:spring-security-oauth2-client;5.7.3
org.springframework.security:spring-security-oauth2-resource-server;5.7.3
org.springframework.security:spring-security-oauth2-core;5.7.3
org.springframework.security:spring-security-oauth2-jose;5.7.3
org.springframework.security:spring-security-web;5.7.3
org.springframework:spring-beans;5.3.22
org.springframework:spring-context-support;5.3.22
org.springframework:spring-context;5.3.22
org.springframework:spring-core;5.3.22
org.springframework:spring-expression;5.3.22
org.springframework:spring-jdbc;5.3.22
org.springframework:spring-jms;5.3.22
org.springframework:spring-messaging;5.3.22
org.springframework:spring-tx;5.3.22
org.springframework:spring-web;5.3.22
org.springframework:spring-webmvc;5.3.22
org.springframework:spring-test;5.3.22
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.3
org.springframework.boot:spring-boot-starter-parent;2.7.4

## Spring cloud dependency versions
org.springframework.cloud:spring-cloud-dependencies;2021.0.3
org.springframework.cloud:spring-cloud-starter-bootstrap;3.1.3
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.3
org.springframework.cloud:spring-cloud-sleuth-api;3.1.3
org.springframework.cloud:spring-cloud-starter-sleuth;3.1.3
org.springframework.cloud:spring-cloud-starter-stream-kafka;3.2.4
org.springframework.cloud:spring-cloud-stream-binder-test;3.2.4
org.springframework.cloud:spring-cloud-stream;3.2.4
org.springframework.cloud:spring-cloud-context;3.1.4
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

pl.pragmatists:JUnitParams;1.1.1

Expand Down Expand Up @@ -210,7 +210,7 @@ io.opentelemetry:opentelemetry-exporter-otlp;1.14.0
io.opentelemetry:opentelemetry-sdk-testing;1.14.0
io.opentelemetry:opentelemetry-sdk-extension-autoconfigure;1.14.0-alpha
io.opentelemetry:opentelemetry-sdk-logs;1.14.0-alpha
io.projectreactor:reactor-test;3.4.22
io.projectreactor:reactor-test;3.4.23
junit:junit;4.13.2
commons-cli:commons-cli;1.3
org.apache.maven:maven-compat;3.6.2
Expand All @@ -221,8 +221,8 @@ org.assertj:assertj-core;3.22.0
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.48.v20220622
org.eclipse.jetty:jetty-server;9.4.48.v20220622
org.eclipse.jetty:jetty-http;9.4.49.v20220914
org.eclipse.jetty:jetty-server;9.4.49.v20220914
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.2
commons-io:commons-io;2.11.0
commons-validator:commons-validator;1.6
io.dropwizard.metrics:metrics-core;4.2.11
io.dropwizard.metrics:metrics-graphite;4.2.11
io.dropwizard.metrics:metrics-jvm;4.2.11
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.reactivex.rxjava2:rxjava;2.2.21
net.java.dev.jna:jna-platform;5.6.0
net.oneandone.reflections8:reflections8;0.11.7
Expand Down