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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

External dependencies upgrade - Spring Boot 2.7.7 and Spring Cloud 2021.0.5 #32697

Merged
merged 1 commit into from
Dec 30, 2022
Merged
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
78 changes: 39 additions & 39 deletions eng/versioning/external_dependencies.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# 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.6_managed_external_dependencies.txt
# If your version is different from sdk/spring/scripts/spring_boot_2.7.6_managed_external_dependencies.txt,
# make sure the version is same to sdk/spring/scripts/spring_boot_2.7.7_managed_external_dependencies.txt
# If your version is different from sdk/spring/scripts/spring_boot_2.7.7_managed_external_dependencies.txt,
# please discuss with Spring Integration team members:
# @chenrujun (rujche), @saragluna (xiada), @yiliuTo (yiliu6), @backwind1233 (zhihaoguo).
# Thanks.
Expand Down Expand Up @@ -39,7 +39,7 @@ 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;10.2.2.jre8
com.microsoft.azure:spring-data-cosmosdb;2.3.0
com.mysql:mysql-connector-j;8.0.31
com.squareup.okhttp3:mockwebserver;4.10.0
Expand Down Expand Up @@ -83,7 +83,7 @@ org.apache.avro:avro;1.11.0
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.httpcomponents:httpclient;4.5.14
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
Expand Down Expand Up @@ -115,42 +115,42 @@ 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.19
net.bytebuddy:byte-buddy;1.12.20

## Spring boot dependency versions
org.springframework.boot:spring-boot-dependencies;2.7.6
org.springframework.boot:spring-boot-actuator;2.7.6
org.springframework.boot:spring-boot-actuator-autoconfigure;2.7.6
org.springframework.boot:spring-boot-autoconfigure-processor;2.7.6
org.springframework.boot:spring-boot-autoconfigure;2.7.6
org.springframework.boot:spring-boot-configuration-metadata;2.7.6
org.springframework.boot:spring-boot-configuration-processor;2.7.6
org.springframework.boot:spring-boot-dependencies;2.7.7
org.springframework.boot:spring-boot-actuator;2.7.7
org.springframework.boot:spring-boot-actuator-autoconfigure;2.7.7
org.springframework.boot:spring-boot-autoconfigure-processor;2.7.7
org.springframework.boot:spring-boot-autoconfigure;2.7.7
org.springframework.boot:spring-boot-configuration-metadata;2.7.7
org.springframework.boot:spring-boot-configuration-processor;2.7.7
org.springframework.boot:spring-boot-maven-plugin;2.7.4
org.springframework.boot:spring-boot-starter-actuator;2.7.6
org.springframework.boot:spring-boot-starter-aop;2.7.6
org.springframework.boot:spring-boot-starter-cache;2.7.6
org.springframework.boot:spring-boot-starter-data-redis;2.7.6
org.springframework.boot:spring-boot-starter-integration;2.7.6
org.springframework.boot:spring-boot-starter-logging;2.7.6
org.springframework.boot:spring-boot-starter-test;2.7.6
org.springframework.boot:spring-boot-starter-validation;2.7.6
org.springframework.boot:spring-boot-starter-web;2.7.6
org.springframework.boot:spring-boot-starter;2.7.6
org.springframework.boot:spring-boot-test;2.7.6
org.springframework.boot:spring-boot;2.7.6
org.springframework.boot:spring-boot-starter-actuator;2.7.7
org.springframework.boot:spring-boot-starter-aop;2.7.7
org.springframework.boot:spring-boot-starter-cache;2.7.7
org.springframework.boot:spring-boot-starter-data-redis;2.7.7
org.springframework.boot:spring-boot-starter-integration;2.7.7
org.springframework.boot:spring-boot-starter-logging;2.7.7
org.springframework.boot:spring-boot-starter-test;2.7.7
org.springframework.boot:spring-boot-starter-validation;2.7.7
org.springframework.boot:spring-boot-starter-web;2.7.7
org.springframework.boot:spring-boot-starter;2.7.7
org.springframework.boot:spring-boot-test;2.7.7
org.springframework.boot:spring-boot;2.7.7
org.springframework.data:spring-data-commons;2.7.6
org.springframework.data:spring-data-mongodb;3.4.6
org.springframework.data:spring-data-redis;2.7.6
org.springframework.experimental:spring-aot;0.11.4
org.springframework.integration:spring-integration-core;5.5.15
org.springframework.integration:spring-integration-core;5.5.16
org.springframework.kafka:spring-kafka;2.8.11
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.security:spring-security-config;5.7.6
org.springframework.security:spring-security-core;5.7.6
org.springframework.security:spring-security-oauth2-client;5.7.6
org.springframework.security:spring-security-oauth2-resource-server;5.7.6
org.springframework.security:spring-security-oauth2-core;5.7.6
org.springframework.security:spring-security-oauth2-jose;5.7.6
org.springframework.security:spring-security-web;5.7.6
org.springframework:spring-beans;5.3.24
org.springframework:spring-context-support;5.3.24
org.springframework:spring-context;5.3.24
Expand All @@ -164,7 +164,7 @@ org.springframework:spring-web;5.3.24
org.springframework:spring-webmvc;5.3.24
org.springframework:spring-test;5.3.24
org.springframework.retry:spring-retry;1.3.4
org.springframework.boot:spring-boot-starter-parent;2.7.6
org.springframework.boot:spring-boot-starter-parent;2.7.7

## Spring cloud dependency versions
org.springframework.cloud:spring-cloud-dependencies;2021.0.5
Expand Down Expand Up @@ -207,7 +207,7 @@ 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-sdk-logs;1.14.0-alpha
io.projectreactor:reactor-test;3.4.25
io.projectreactor:reactor-test;3.4.26
junit:junit;4.13.2
commons-cli:commons-cli;1.3
org.apache.maven:maven-compat;3.6.2
Expand All @@ -218,8 +218,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.49.v20220914
org.eclipse.jetty:jetty-server;9.4.49.v20220914
org.eclipse.jetty:jetty-http;9.4.50.v20221201
org.eclipse.jetty:jetty-server;9.4.50.v20221201
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 @@ -259,9 +259,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.13
io.dropwizard.metrics:metrics-graphite;4.2.13
io.dropwizard.metrics:metrics-jvm;4.2.13
io.dropwizard.metrics:metrics-core;4.2.14
io.dropwizard.metrics:metrics-graphite;4.2.14
io.dropwizard.metrics:metrics-jvm;4.2.14
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/appconfiguration/azure-data-appconfiguration/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-test</artifactId>
<version>3.4.25</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
<version>3.4.26</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>2.7.6</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-web;external_dependency} -->
<version>2.7.7</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-web;external_dependency} -->
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
<version>2.7.6</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-actuator;external_dependency} -->
<version>2.7.7</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-actuator;external_dependency} -->
<optional>true</optional>
</dependency>
<dependency>
Expand Down Expand Up @@ -72,7 +72,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<version>2.7.6</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-test;external_dependency} -->
<version>2.7.7</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-test;external_dependency} -->
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -87,8 +87,8 @@
<rules>
<bannedDependencies>
<includes>
<include>org.springframework.boot:spring-boot-starter-actuator:[2.7.6]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-actuator;external_dependency} -->
<include>org.springframework.boot:spring-boot-starter-web:[2.7.6]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-web;external_dependency} -->
<include>org.springframework.boot:spring-boot-starter-actuator:[2.7.7]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-actuator;external_dependency} -->
<include>org.springframework.boot:spring-boot-starter-web:[2.7.7]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-web;external_dependency} -->
<include>org.springframework.cloud:spring-cloud-bus:[3.1.2]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-bus;external_dependency} -->
</includes>
</bannedDependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,17 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-autoconfigure-processor</artifactId>
<version>2.7.6</version> <!-- {x-version-update;org.springframework.boot:spring-boot-autoconfigure-processor;external_dependency} -->
<version>2.7.7</version> <!-- {x-version-update;org.springframework.boot:spring-boot-autoconfigure-processor;external_dependency} -->
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-autoconfigure</artifactId>
<version>2.7.6</version> <!-- {x-version-update;org.springframework.boot:spring-boot-autoconfigure;external_dependency} -->
<version>2.7.7</version> <!-- {x-version-update;org.springframework.boot:spring-boot-autoconfigure;external_dependency} -->
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<version>2.7.6</version> <!-- {x-version-update;org.springframework.boot:spring-boot-configuration-processor;external_dependency} -->
<version>2.7.7</version> <!-- {x-version-update;org.springframework.boot:spring-boot-configuration-processor;external_dependency} -->
<optional>true</optional>
</dependency>
<dependency>
Expand Down Expand Up @@ -93,14 +93,14 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-actuator-autoconfigure</artifactId>
<version>2.7.6</version> <!-- {x-version-update;org.springframework.boot:spring-boot-actuator-autoconfigure;external_dependency} -->
<version>2.7.7</version> <!-- {x-version-update;org.springframework.boot:spring-boot-actuator-autoconfigure;external_dependency} -->
</dependency>

<!-- Test Dependencies -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<version>2.7.6</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-test;external_dependency} -->
<version>2.7.7</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-test;external_dependency} -->
<scope>test</scope>
</dependency>

Expand Down Expand Up @@ -136,12 +136,12 @@
<include>com.fasterxml.jackson.core:jackson-databind:[2.13.4.2]</include> <!-- {x-include-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
<include>javax.annotation:javax.annotation-api:[1.3.2]</include> <!-- {x-include-update;javax.annotation:javax.annotation-api;external_dependency} -->
<include>org.apache.commons:commons-lang3:[3.12.0]</include> <!-- {x-include-update;org.apache.commons:commons-lang3;external_dependency} -->
<include>org.apache.httpcomponents:httpclient:[4.5.13]</include> <!-- {x-include-update;org.apache.httpcomponents:httpclient;external_dependency} -->
<include>org.apache.httpcomponents:httpclient:[4.5.14]</include> <!-- {x-include-update;org.apache.httpcomponents:httpclient;external_dependency} -->
<include>org.hibernate.validator:hibernate-validator:[6.2.5.Final]</include> <!-- {x-include-update;org.hibernate.validator:hibernate-validator;external_dependency} -->
<include>org.springframework.boot:spring-boot-autoconfigure-processor:[2.7.6]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-autoconfigure-processor;external_dependency} -->
<include>org.springframework.boot:spring-boot-autoconfigure:[2.7.6]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-autoconfigure;external_dependency} -->
<include>org.springframework.boot:spring-boot-actuator-autoconfigure:[2.7.6]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-actuator-autoconfigure;external_dependency} -->
<include>org.springframework.boot:spring-boot-configuration-processor:[2.7.6]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-configuration-processor;external_dependency} -->
<include>org.springframework.boot:spring-boot-autoconfigure-processor:[2.7.7]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-autoconfigure-processor;external_dependency} -->
<include>org.springframework.boot:spring-boot-autoconfigure:[2.7.7]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-autoconfigure;external_dependency} -->
<include>org.springframework.boot:spring-boot-actuator-autoconfigure:[2.7.7]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-actuator-autoconfigure;external_dependency} -->
<include>org.springframework.boot:spring-boot-configuration-processor:[2.7.7]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-configuration-processor;external_dependency} -->
<include>org.springframework.cloud:spring-cloud-context:[3.1.5]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-context;external_dependency} -->
<include>org.springframework.cloud:spring-cloud-starter-bootstrap:[3.1.5]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-starter-bootstrap;external_dependency} -->
<include>org.springframework:spring-web:[5.3.24]</include> <!-- {x-include-update;org.springframework:spring-web;external_dependency} -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<version>2.7.6</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-test;external_dependency} -->
<version>2.7.7</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-test;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
<version>2.7.6</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter;external_dependency} -->
<version>2.7.7</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter;external_dependency} -->
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand All @@ -48,7 +48,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<version>2.7.6</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-test;external_dependency} -->
<version>2.7.7</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-test;external_dependency} -->
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -65,7 +65,7 @@
<include>com.fasterxml.jackson.core:jackson-annotations:[2.13.4]</include> <!-- {x-include-update;com.fasterxml.jackson.core:jackson-annotations;external_dependency} -->
<include>com.fasterxml.jackson.core:jackson-databind:[2.13.4.2]</include> <!-- {x-include-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
<include>io.projectreactor.netty:reactor-netty:[1.0.26]</include> <!-- {x-include-update;io.projectreactor.netty:reactor-netty;external_dependency} -->
<include>org.springframework.boot:spring-boot-starter:[2.7.6]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter;external_dependency} -->
<include>org.springframework.boot:spring-boot-starter:[2.7.7]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter;external_dependency} -->
<include>org.springframework:spring-context:[5.3.24]</include> <!-- {x-include-update;org.springframework:spring-context;external_dependency} -->
</includes>
</bannedDependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.7.6</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-parent;external_dependency} -->
<version>2.7.7</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-parent;external_dependency} -->
<relativePath/> <!-- lookup parent from repository -->
</parent>

Expand Down Expand Up @@ -38,7 +38,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<version>2.7.6</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-test;external_dependency} -->
<version>2.7.7</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-test;external_dependency} -->
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-test</artifactId>
<version>3.4.25</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
<version>3.4.26</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
Expand Down