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.

Sign up for GitHub

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

Jump to bottom

External dependencies upgrade - Spring Boot 2.7.12 and Spring Cloud 2021.0.7 #35514

Closed
wants to merge 1 commit into from
Closed

External dependencies upgrade - Spring Boot 2.7.12 and Spring Cloud 2021.0.7 #35514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion eng/spotbugs-aggregate-report/pom.xml
View file
Open in desktop
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
72 changes: 36 additions & 36 deletions eng/versioning/external_dependencies.txt
View file
Open in desktop
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.12_managed_external_dependencies.txt
# If your version is different from sdk/spring/scripts/spring_boot_2.7.12_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.11
io.micrometer:micrometer-registry-azure-monitor;1.9.11
io.micrometer:micrometer-registry-graphite;1.9.11
io.netty:netty-buffer;4.1.93.Final
io.netty:netty-common;4.1.93.Final
io.netty:netty-codec;4.1.93.Final
Expand Down Expand Up @@ -115,32 +115,32 @@ 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.12
org.springframework.boot:spring-boot-actuator;2.7.12
org.springframework.boot:spring-boot-actuator-autoconfigure;2.7.12
org.springframework.boot:spring-boot-autoconfigure-processor;2.7.12
org.springframework.boot:spring-boot-autoconfigure;2.7.12
org.springframework.boot:spring-boot-configuration-metadata;2.7.12
org.springframework.boot:spring-boot-configuration-processor;2.7.12
org.springframework.boot:spring-boot-maven-plugin;2.7.12
org.springframework.boot:spring-boot-starter-actuator;2.7.12
org.springframework.boot:spring-boot-starter-aop;2.7.12
org.springframework.boot:spring-boot-starter-cache;2.7.12
org.springframework.boot:spring-boot-starter-data-redis;2.7.12
org.springframework.boot:spring-boot-starter-integration;2.7.12
org.springframework.boot:spring-boot-starter-logging;2.7.12
org.springframework.boot:spring-boot-starter-test;2.7.12
org.springframework.boot:spring-boot-starter-validation;2.7.12
org.springframework.boot:spring-boot-starter-web;2.7.12
org.springframework.boot:spring-boot-starter;2.7.12
org.springframework.boot:spring-boot-test;2.7.12
org.springframework.boot:spring-boot;2.7.12
org.springframework.data:spring-data-commons;2.7.12
org.springframework.data:spring-data-mongodb;3.4.12
org.springframework.data:spring-data-redis;2.7.12
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
Expand All @@ -162,7 +162,7 @@ org.springframework:spring-web;5.3.27
org.springframework:spring-webmvc;5.3.27
org.springframework:spring-test;5.3.27
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.12

## Spring cloud dependency versions
org.springframework.cloud:spring-cloud-dependencies;2021.0.7
Expand Down Expand Up @@ -260,26 +260,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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions sdk/applicationinsights/microsoft-azure-applicationinsights-query/pom.xml
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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-customsearch/pom.xml
View file
Open in desktop
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-customvision-prediction/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,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 @@ -77,7 +77,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-customvision-training/pom.xml
View file
Open in desktop
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