Skip to content

Commit

Permalink
External dependencies upgrade - Spring Boot 2.7.13 and Spring Cloud 2…
Browse files Browse the repository at this point in the history
…021.0.7 (#35709)

* Upgrade external dependencies to align with Spring Boot 2.7.13

* fix version tag

---------

Co-authored-by: github-actions <github-actions@github.com>
  • Loading branch information
Netyyyy and github-actions authored Jul 5, 2023
1 parent 03ca84c commit 84791c4
Show file tree
Hide file tree
Showing 208 changed files with 906 additions and 877 deletions.
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.3.1</version> <!-- {x-version-update;org.apache.maven.plugins:maven-javadoc-plugin;external_dependency} -->
<version>3.4.1</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
118 changes: 59 additions & 59 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.11_managed_external_dependencies.txt
# If your version is different from sdk/spring/scripts/spring_boot_2.7.11_managed_external_dependencies.txt,
# make sure the version is same to sdk/spring/scripts/spring_boot_2.7.13_managed_external_dependencies.txt
# If your version is different from sdk/spring/scripts/spring_boot_2.7.13_managed_external_dependencies.txt,
# please discuss with Spring Integration team members:
# @chenrujun (rujche), @saragluna (xiada), @yiliuTo (yiliu6), @backwind1233 (zhihaoguo).
# Thanks.
Expand Down Expand Up @@ -50,9 +50,9 @@ 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;5.12.3
io.micrometer:micrometer-core;1.9.10
io.micrometer:micrometer-registry-azure-monitor;1.9.10
io.micrometer:micrometer-registry-graphite;1.9.10
io.micrometer:micrometer-core;1.9.12
io.micrometer:micrometer-registry-azure-monitor;1.9.12
io.micrometer:micrometer-registry-graphite;1.9.12
io.netty:netty-buffer;4.1.94.Final
io.netty:netty-common;4.1.94.Final
io.netty:netty-codec;4.1.94.Final
Expand Down Expand Up @@ -115,54 +115,54 @@ org.redisson:redisson;3.17.0
net.bytebuddy:byte-buddy;1.12.23

## Spring boot dependency versions
org.springframework.boot:spring-boot-dependencies;2.7.11
org.springframework.boot:spring-boot-actuator;2.7.11
org.springframework.boot:spring-boot-actuator-autoconfigure;2.7.11
org.springframework.boot:spring-boot-autoconfigure-processor;2.7.11
org.springframework.boot:spring-boot-autoconfigure;2.7.11
org.springframework.boot:spring-boot-configuration-metadata;2.7.11
org.springframework.boot:spring-boot-configuration-processor;2.7.11
org.springframework.boot:spring-boot-maven-plugin;2.7.4
org.springframework.boot:spring-boot-starter-actuator;2.7.11
org.springframework.boot:spring-boot-starter-aop;2.7.11
org.springframework.boot:spring-boot-starter-cache;2.7.11
org.springframework.boot:spring-boot-starter-data-redis;2.7.11
org.springframework.boot:spring-boot-starter-integration;2.7.11
org.springframework.boot:spring-boot-starter-logging;2.7.11
org.springframework.boot:spring-boot-starter-test;2.7.11
org.springframework.boot:spring-boot-starter-validation;2.7.11
org.springframework.boot:spring-boot-starter-web;2.7.11
org.springframework.boot:spring-boot-starter;2.7.11
org.springframework.boot:spring-boot-test;2.7.11
org.springframework.boot:spring-boot;2.7.11
org.springframework.data:spring-data-commons;2.7.11
org.springframework.data:spring-data-mongodb;3.4.11
org.springframework.data:spring-data-redis;2.7.11
org.springframework.boot:spring-boot-dependencies;2.7.13
org.springframework.boot:spring-boot-actuator;2.7.13
org.springframework.boot:spring-boot-actuator-autoconfigure;2.7.13
org.springframework.boot:spring-boot-autoconfigure-processor;2.7.13
org.springframework.boot:spring-boot-autoconfigure;2.7.13
org.springframework.boot:spring-boot-configuration-metadata;2.7.13
org.springframework.boot:spring-boot-configuration-processor;2.7.13
org.springframework.boot:spring-boot-maven-plugin;2.7.13
org.springframework.boot:spring-boot-starter-actuator;2.7.13
org.springframework.boot:spring-boot-starter-aop;2.7.13
org.springframework.boot:spring-boot-starter-cache;2.7.13
org.springframework.boot:spring-boot-starter-data-redis;2.7.13
org.springframework.boot:spring-boot-starter-integration;2.7.13
org.springframework.boot:spring-boot-starter-logging;2.7.13
org.springframework.boot:spring-boot-starter-test;2.7.13
org.springframework.boot:spring-boot-starter-validation;2.7.13
org.springframework.boot:spring-boot-starter-web;2.7.13
org.springframework.boot:spring-boot-starter;2.7.13
org.springframework.boot:spring-boot-test;2.7.13
org.springframework.boot:spring-boot;2.7.13
org.springframework.data:spring-data-commons;2.7.13
org.springframework.data:spring-data-mongodb;3.4.13
org.springframework.data:spring-data-redis;2.7.13
org.springframework.experimental:spring-aot;0.11.4
org.springframework.experimental:spring-aot-maven-plugin;0.11.4
org.springframework.integration:spring-integration-core;5.5.17
org.springframework.integration:spring-integration-core;5.5.18
org.springframework.kafka:spring-kafka;2.8.11
org.springframework.security:spring-security-config;5.7.8
org.springframework.security:spring-security-core;5.7.8
org.springframework.security:spring-security-oauth2-client;5.7.8
org.springframework.security:spring-security-oauth2-resource-server;5.7.8
org.springframework.security:spring-security-oauth2-core;5.7.8
org.springframework.security:spring-security-oauth2-jose;5.7.8
org.springframework.security:spring-security-web;5.7.8
org.springframework:spring-beans;5.3.27
org.springframework:spring-context-support;5.3.27
org.springframework:spring-context;5.3.27
org.springframework:spring-core;5.3.27
org.springframework:spring-expression;5.3.27
org.springframework:spring-jdbc;5.3.27
org.springframework:spring-jms;5.3.27
org.springframework:spring-messaging;5.3.27
org.springframework:spring-tx;5.3.27
org.springframework:spring-web;5.3.27
org.springframework:spring-webmvc;5.3.27
org.springframework:spring-test;5.3.27
org.springframework.security:spring-security-config;5.7.9
org.springframework.security:spring-security-core;5.7.9
org.springframework.security:spring-security-oauth2-client;5.7.9
org.springframework.security:spring-security-oauth2-resource-server;5.7.9
org.springframework.security:spring-security-oauth2-core;5.7.9
org.springframework.security:spring-security-oauth2-jose;5.7.9
org.springframework.security:spring-security-web;5.7.9
org.springframework:spring-beans;5.3.28
org.springframework:spring-context-support;5.3.28
org.springframework:spring-context;5.3.28
org.springframework:spring-core;5.3.28
org.springframework:spring-expression;5.3.28
org.springframework:spring-jdbc;5.3.28
org.springframework:spring-jms;5.3.28
org.springframework:spring-messaging;5.3.28
org.springframework:spring-tx;5.3.28
org.springframework:spring-web;5.3.28
org.springframework:spring-webmvc;5.3.28
org.springframework:spring-test;5.3.28
org.springframework.retry:spring-retry;1.3.4
org.springframework.boot:spring-boot-starter-parent;2.7.11
org.springframework.boot:spring-boot-starter-parent;2.7.13

## Spring cloud dependency versions
org.springframework.cloud:spring-cloud-dependencies;2021.0.7
Expand Down Expand Up @@ -199,7 +199,7 @@ io.opentelemetry:opentelemetry-exporter-logging;1.27.0
io.opentelemetry:opentelemetry-exporter-jaeger;1.27.0
io.opentelemetry:opentelemetry-exporter-otlp;1.27.0
io.opentelemetry:opentelemetry-sdk-testing;1.27.0
io.projectreactor:reactor-test;3.4.29
io.projectreactor:reactor-test;3.4.30
junit:junit;4.13.2
commons-cli:commons-cli;1.3
org.assertj:assertj-core;3.22.0
Expand Down Expand Up @@ -246,9 +246,9 @@ com.nimbusds:nimbus-jose-jwt;9.31
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.18
io.dropwizard.metrics:metrics-graphite;4.2.18
io.dropwizard.metrics:metrics-jvm;4.2.18
io.dropwizard.metrics:metrics-core;4.2.19
io.dropwizard.metrics:metrics-graphite;4.2.19
io.dropwizard.metrics:metrics-jvm;4.2.19
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 @@ -259,26 +259,26 @@ org.apache.commons:commons-text;1.10.0
org.apache.maven:maven-plugin-api;3.8.6
org.apache.maven:maven-project;2.2.1
org.apache.maven.plugin-tools:maven-plugin-annotations;3.6.4
org.apache.maven.plugins:maven-antrun-plugin;1.8
org.apache.maven.plugins:maven-assembly-plugin;3.2.0
org.apache.maven.plugins:maven-antrun-plugin;3.0.0
org.apache.maven.plugins:maven-assembly-plugin;3.3.0
org.apache.maven.plugins:maven-checkstyle-plugin;3.1.2
org.apache.maven.plugins:maven-clean-plugin;3.2.0
org.apache.maven.plugins:maven-compiler-plugin;3.10.1
org.apache.maven.plugins:maven-eclipse-plugin;2.8
org.apache.maven.plugins:maven-enforcer-plugin;3.0.0-M3
org.apache.maven.plugins:maven-failsafe-plugin;3.1.0
org.apache.maven.plugins:maven-help-plugin;2.1.1
org.apache.maven.plugins:maven-help-plugin;3.2.0
org.apache.maven.plugins:maven-install-plugin;3.0.0-M1
org.apache.maven.plugins:maven-jar-plugin;3.1.2
org.apache.maven.plugins:maven-javadoc-plugin;3.3.1
org.apache.maven.plugins:maven-jar-plugin;3.2.2
org.apache.maven.plugins:maven-javadoc-plugin;3.4.1
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
org.apache.maven.plugins:maven-release-plugin;2.5.3
org.apache.maven.plugins:maven-resources-plugin;3.3.0
org.apache.maven.plugins:maven-shade-plugin;3.3.0
org.apache.maven.plugins:maven-site-plugin;3.7.1
org.apache.maven.plugins:maven-source-plugin;3.0.1
org.apache.maven.plugins:maven-source-plugin;3.2.1
org.apache.maven.plugins:maven-surefire-plugin;3.1.0
org.codehaus.mojo:build-helper-maven-plugin;3.3.0
org.codehaus.mojo:cobertura-maven-plugin;2.7
Expand Down
2 changes: 1 addition & 1 deletion sdk/aot/azure-aot-graalvm-samples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.2.0</version> <!-- {x-version-update;org.apache.maven.plugins:maven-assembly-plugin;external_dependency} -->
<version>3.3.0</version> <!-- {x-version-update;org.apache.maven.plugins:maven-assembly-plugin;external_dependency} -->
<configuration>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
Expand Down
6 changes: 3 additions & 3 deletions sdk/aot/azure-aot-graalvm-support-netty/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.3.1</version> <!-- {x-version-update;org.apache.maven.plugins:maven-javadoc-plugin;external_dependency} -->
<version>3.4.1</version> <!-- {x-version-update;org.apache.maven.plugins:maven-javadoc-plugin;external_dependency} -->
<executions>
<execution>
<id>attach-javadocs</id>
Expand All @@ -160,7 +160,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.2</version> <!-- {x-version-update;org.apache.maven.plugins:maven-jar-plugin;external_dependency} -->
<version>3.2.2</version> <!-- {x-version-update;org.apache.maven.plugins:maven-jar-plugin;external_dependency} -->
<executions>
<execution>
<id>empty-javadoc-jar-with-readme</id>
Expand All @@ -178,7 +178,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.8</version> <!-- {x-version-update;org.apache.maven.plugins:maven-antrun-plugin;external_dependency} -->
<version>3.0.0</version> <!-- {x-version-update;org.apache.maven.plugins:maven-antrun-plugin;external_dependency} -->
<executions>
<execution>
<id>copy-readme-to-javadocTemp</id>
Expand Down
6 changes: 3 additions & 3 deletions sdk/aot/azure-aot-graalvm-support/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.3.1</version> <!-- {x-version-update;org.apache.maven.plugins:maven-javadoc-plugin;external_dependency} -->
<version>3.4.1</version> <!-- {x-version-update;org.apache.maven.plugins:maven-javadoc-plugin;external_dependency} -->
<executions>
<execution>
<id>attach-javadocs</id>
Expand All @@ -116,7 +116,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.2</version> <!-- {x-version-update;org.apache.maven.plugins:maven-jar-plugin;external_dependency} -->
<version>3.2.2</version> <!-- {x-version-update;org.apache.maven.plugins:maven-jar-plugin;external_dependency} -->
<executions>
<execution>
<id>empty-javadoc-jar-with-readme</id>
Expand All @@ -134,7 +134,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.8</version> <!-- {x-version-update;org.apache.maven.plugins:maven-antrun-plugin;external_dependency} -->
<version>3.0.0</version> <!-- {x-version-update;org.apache.maven.plugins:maven-antrun-plugin;external_dependency} -->
<executions>
<execution>
<id>copy-readme-to-javadocTemp</id>
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 @@ -104,7 +104,7 @@
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-test</artifactId>
<version>3.4.29</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
<version>3.4.30</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 @@ -107,7 +107,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.2</version> <!-- {x-version-update;org.apache.maven.plugins:maven-jar-plugin;external_dependency} -->
<version>3.2.2</version> <!-- {x-version-update;org.apache.maven.plugins:maven-jar-plugin;external_dependency} -->
<configuration>
<archive>
<manifest>
Expand Down Expand Up @@ -145,7 +145,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.3.1</version> <!-- {x-version-update;org.apache.maven.plugins:maven-javadoc-plugin;external_dependency} -->
<version>3.4.1</version> <!-- {x-version-update;org.apache.maven.plugins:maven-javadoc-plugin;external_dependency} -->
<configuration>
<excludePackageNames>*.implementation.*;*.utils.*;com.microsoft.schemas._2003._10.serialization;*.blob.core.search</excludePackageNames>
<bottom>
Expand Down
2 changes: 1 addition & 1 deletion sdk/boms/spring-cloud-azure-dependencies/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.8</version> <!-- {x-version-update;org.apache.maven.plugins:maven-antrun-plugin;external_dependency} -->
<version>3.0.0</version> <!-- {x-version-update;org.apache.maven.plugins:maven-antrun-plugin;external_dependency} -->
<executions>
<execution>
<id>copy</id>
Expand Down
4 changes: 2 additions & 2 deletions sdk/cognitiveservices/ms-azure-cs-autosuggest/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.2</version> <!-- {x-version-update;org.apache.maven.plugins:maven-jar-plugin;external_dependency} -->
<version>3.2.2</version> <!-- {x-version-update;org.apache.maven.plugins:maven-jar-plugin;external_dependency} -->
<configuration>
<archive>
<manifest>
Expand All @@ -74,7 +74,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.3.1</version> <!-- {x-version-update;org.apache.maven.plugins:maven-javadoc-plugin;external_dependency} -->
<version>3.4.1</version> <!-- {x-version-update;org.apache.maven.plugins:maven-javadoc-plugin;external_dependency} -->
<configuration>
<excludePackageNames>*.implementation.*;*.utils.*;com.microsoft.schemas._2003._10.serialization;*.blob.core.search</excludePackageNames>
<bottom>
Expand Down
4 changes: 2 additions & 2 deletions sdk/cognitiveservices/ms-azure-cs-computervision/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.2</version> <!-- {x-version-update;org.apache.maven.plugins:maven-jar-plugin;external_dependency} -->
<version>3.2.2</version> <!-- {x-version-update;org.apache.maven.plugins:maven-jar-plugin;external_dependency} -->
<configuration>
<archive>
<manifest>
Expand All @@ -76,7 +76,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.3.1</version> <!-- {x-version-update;org.apache.maven.plugins:maven-javadoc-plugin;external_dependency} -->
<version>3.4.1</version> <!-- {x-version-update;org.apache.maven.plugins:maven-javadoc-plugin;external_dependency} -->
<configuration>
<excludePackageNames>*.implementation.*;*.utils.*;com.microsoft.schemas._2003._10.serialization;*.blob.core.search</excludePackageNames>
<bottom>
Expand Down
4 changes: 2 additions & 2 deletions sdk/cognitiveservices/ms-azure-cs-contentmoderator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.2</version> <!-- {x-version-update;org.apache.maven.plugins:maven-jar-plugin;external_dependency} -->
<version>3.2.2</version> <!-- {x-version-update;org.apache.maven.plugins:maven-jar-plugin;external_dependency} -->
<configuration>
<archive>
<manifest>
Expand All @@ -76,7 +76,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.3.1</version> <!-- {x-version-update;org.apache.maven.plugins:maven-javadoc-plugin;external_dependency} -->
<version>3.4.1</version> <!-- {x-version-update;org.apache.maven.plugins:maven-javadoc-plugin;external_dependency} -->
<configuration>
<excludePackageNames>*.implementation.*;*.utils.*;com.microsoft.schemas._2003._10.serialization;*.blob.core.search</excludePackageNames>
<bottom>
Expand Down
4 changes: 2 additions & 2 deletions sdk/cognitiveservices/ms-azure-cs-customimagesearch/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.2</version> <!-- {x-version-update;org.apache.maven.plugins:maven-jar-plugin;external_dependency} -->
<version>3.2.2</version> <!-- {x-version-update;org.apache.maven.plugins:maven-jar-plugin;external_dependency} -->
<configuration>
<archive>
<manifest>
Expand All @@ -74,7 +74,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.3.1</version> <!-- {x-version-update;org.apache.maven.plugins:maven-javadoc-plugin;external_dependency} -->
<version>3.4.1</version> <!-- {x-version-update;org.apache.maven.plugins:maven-javadoc-plugin;external_dependency} -->
<configuration>
<excludePackageNames>*.implementation.*;*.utils.*;com.microsoft.schemas._2003._10.serialization;*.blob.core.search</excludePackageNames>
<bottom>
Expand Down
Loading

0 comments on commit 84791c4

Please sign in to comment.