Skip to content

Commit 3bfb548

Browse files
Upgrade to spring boot 2.5.4. (Azure#23709)
* 1. Update ROOT_POMS' version manually. * 2. Run command "python .\sdk\spring\scripts\update_spring_managed_external_dependencies.py". * 3. Run command "python .\eng\versioning\update_versions.py --ut external_dependency --sr". * 4. Test the compatibility of the integration test under the spring boot 2.4.10 version. * 5. Update changelog about compatible Spring Boot versions and Spring Cloud versions. * 6. Move key vault related tests.
1 parent c79207c commit 3bfb548

File tree

147 files changed

+778
-738
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

147 files changed

+778
-738
lines changed

common/perf-test-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<!-- special allowance for perf-test-core as it is not a shipping library: -->
6161
<include>com.beust:jcommander:[1.78]</include> <!-- {x-include-update;com.beust:jcommander;external_dependency} -->
6262

63-
<include>io.projectreactor:reactor-core:[3.4.8]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
63+
<include>io.projectreactor:reactor-core:[3.4.9]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
6464
</includes>
6565
</bannedDependencies>
6666
</rules>

eng/versioning/external_dependencies.txt

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -43,23 +43,23 @@ commons-codec:commons-codec;1.15
4343
commons-net:commons-net;3.6
4444
io.fabric8:kubernetes-client;4.13.3
4545
io.github.bonigarcia:webdrivermanager;4.3.1
46-
io.micrometer:micrometer-core;1.7.2
47-
io.micrometer:micrometer-registry-azure-monitor;1.7.2
48-
io.micrometer:micrometer-registry-graphite;1.7.2
49-
io.netty:netty-buffer;4.1.66.Final
50-
io.netty:netty-common;4.1.66.Final
51-
io.netty:netty-codec-http;4.1.66.Final
52-
io.netty:netty-codec-http2;4.1.66.Final
53-
io.netty:netty-transport;4.1.66.Final
54-
io.netty:netty-handler;4.1.66.Final
55-
io.netty:netty-handler-proxy;4.1.66.Final
46+
io.micrometer:micrometer-core;1.7.3
47+
io.micrometer:micrometer-registry-azure-monitor;1.7.3
48+
io.micrometer:micrometer-registry-graphite;1.7.3
49+
io.netty:netty-buffer;4.1.67.Final
50+
io.netty:netty-common;4.1.67.Final
51+
io.netty:netty-codec-http;4.1.67.Final
52+
io.netty:netty-codec-http2;4.1.67.Final
53+
io.netty:netty-transport;4.1.67.Final
54+
io.netty:netty-handler;4.1.67.Final
55+
io.netty:netty-handler-proxy;4.1.67.Final
5656
io.netty:netty-tcnative;2.0.40.Final
5757
io.netty:netty-tcnative-boringssl-static;2.0.40.Final
58-
io.netty:netty-transport-native-epoll;4.1.66.Final
59-
io.netty:netty-transport-native-unix-common;4.1.66.Final
60-
io.netty:netty-transport-native-kqueue;4.1.66.Final
61-
io.projectreactor.netty:reactor-netty;1.0.9
62-
io.projectreactor:reactor-core;3.4.8
58+
io.netty:netty-transport-native-epoll;4.1.67.Final
59+
io.netty:netty-transport-native-unix-common;4.1.67.Final
60+
io.netty:netty-transport-native-kqueue;4.1.67.Final
61+
io.projectreactor.netty:reactor-netty;1.0.10
62+
io.projectreactor:reactor-core;3.4.9
6363
io.reactivex:rxjava;1.3.8
6464
javax.annotation:javax.annotation-api;1.3.2
6565
javax.json:javax.json-api;1.1.4
@@ -97,34 +97,34 @@ org.slf4j:slf4j-nop;1.7.32
9797
org.slf4j:slf4j-simple;1.7.32
9898

9999
## Spring boot dependency versions
100-
org.springframework.boot:spring-boot-dependencies;2.5.3
101-
org.springframework.boot:spring-boot-actuator-autoconfigure;2.5.3
102-
org.springframework.boot:spring-boot-autoconfigure-processor;2.5.3
103-
org.springframework.boot:spring-boot-autoconfigure;2.5.3
104-
org.springframework.boot:spring-boot-configuration-processor;2.5.3
105-
org.springframework.boot:spring-boot-starter-actuator;2.5.3
106-
org.springframework.boot:spring-boot-starter-aop;2.5.3
107-
org.springframework.boot:spring-boot-starter-cache;2.5.3
108-
org.springframework.boot:spring-boot-starter-data-redis;2.5.3
109-
org.springframework.boot:spring-boot-starter-logging;2.5.3
110-
org.springframework.boot:spring-boot-starter-test;2.5.3
111-
org.springframework.boot:spring-boot-starter-validation;2.5.3
112-
org.springframework.boot:spring-boot-starter-web;2.5.3
113-
org.springframework.boot:spring-boot-starter-webflux;2.5.3
114-
org.springframework.boot:spring-boot-starter;2.5.3
115-
org.springframework.boot:spring-boot;2.5.3
116-
org.springframework.data:spring-data-commons;2.5.3
117-
org.springframework.data:spring-data-mongodb;3.2.3
118-
org.springframework.data:spring-data-redis;2.5.3
119-
org.springframework.integration:spring-integration-core;5.5.2
120-
org.springframework.kafka:spring-kafka;2.7.4
121-
org.springframework.security:spring-security-config;5.5.1
122-
org.springframework.security:spring-security-core;5.5.1
123-
org.springframework.security:spring-security-oauth2-client;5.5.1
124-
org.springframework.security:spring-security-oauth2-resource-server;5.5.1
125-
org.springframework.security:spring-security-oauth2-core;5.5.1
126-
org.springframework.security:spring-security-oauth2-jose;5.5.1
127-
org.springframework.security:spring-security-web;5.5.1
100+
org.springframework.boot:spring-boot-dependencies;2.5.4
101+
org.springframework.boot:spring-boot-actuator-autoconfigure;2.5.4
102+
org.springframework.boot:spring-boot-autoconfigure-processor;2.5.4
103+
org.springframework.boot:spring-boot-autoconfigure;2.5.4
104+
org.springframework.boot:spring-boot-configuration-processor;2.5.4
105+
org.springframework.boot:spring-boot-starter-actuator;2.5.4
106+
org.springframework.boot:spring-boot-starter-aop;2.5.4
107+
org.springframework.boot:spring-boot-starter-cache;2.5.4
108+
org.springframework.boot:spring-boot-starter-data-redis;2.5.4
109+
org.springframework.boot:spring-boot-starter-logging;2.5.4
110+
org.springframework.boot:spring-boot-starter-test;2.5.4
111+
org.springframework.boot:spring-boot-starter-validation;2.5.4
112+
org.springframework.boot:spring-boot-starter-web;2.5.4
113+
org.springframework.boot:spring-boot-starter-webflux;2.5.4
114+
org.springframework.boot:spring-boot-starter;2.5.4
115+
org.springframework.boot:spring-boot;2.5.4
116+
org.springframework.data:spring-data-commons;2.5.4
117+
org.springframework.data:spring-data-mongodb;3.2.4
118+
org.springframework.data:spring-data-redis;2.5.4
119+
org.springframework.integration:spring-integration-core;5.5.3
120+
org.springframework.kafka:spring-kafka;2.7.6
121+
org.springframework.security:spring-security-config;5.5.2
122+
org.springframework.security:spring-security-core;5.5.2
123+
org.springframework.security:spring-security-oauth2-client;5.5.2
124+
org.springframework.security:spring-security-oauth2-resource-server;5.5.2
125+
org.springframework.security:spring-security-oauth2-core;5.5.2
126+
org.springframework.security:spring-security-oauth2-jose;5.5.2
127+
org.springframework.security:spring-security-web;5.5.2
128128
org.springframework:spring-beans;5.3.9
129129
org.springframework:spring-context-support;5.3.9
130130
org.springframework:spring-context;5.3.9
@@ -138,7 +138,7 @@ org.springframework:spring-web;5.3.9
138138
org.springframework:spring-webmvc;5.3.9
139139
org.springframework:spring-webflux;5.3.9
140140

141-
org.springframework.boot:spring-boot-starter-parent;2.5.3
141+
org.springframework.boot:spring-boot-starter-parent;2.5.4
142142

143143
## Spring cloud dependency versions
144144
org.springframework.cloud:spring-cloud-dependencies;2020.0.3
@@ -175,7 +175,7 @@ io.opentelemetry:opentelemetry-api;1.0.0
175175
io.opentelemetry:opentelemetry-sdk;1.0.0
176176
io.opentelemetry:opentelemetry-exporter-logging;1.0.0
177177
io.opentelemetry:opentelemetry-exporter-jaeger;1.0.0
178-
io.projectreactor:reactor-test;3.4.8
178+
io.projectreactor:reactor-test;3.4.9
179179
junit:junit;4.13.2
180180
commons-cli:commons-cli;1.3
181181
org.apache.maven:maven-compat;3.6.2
@@ -217,7 +217,7 @@ com.azure:sdk-build-tools;1.0.0
217217
com.beust:jcommander;1.78
218218
com.google.code.findbugs:jsr305;3.0.2
219219
com.microsoft.azure:azure-webapp-maven-plugin;1.14.0
220-
com.nimbusds:nimbus-jose-jwt;9.10
220+
com.nimbusds:nimbus-jose-jwt;9.10.1
221221
com.puppycrawl.tools:checkstyle;8.42
222222
commons-io:commons-io;2.5
223223
commons-validator:commons-validator;1.6

sdk/appconfiguration/azure-data-appconfiguration/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
<dependency>
8585
<groupId>io.projectreactor</groupId>
8686
<artifactId>reactor-test</artifactId>
87-
<version>3.4.8</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
87+
<version>3.4.9</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
8888
<scope>test</scope>
8989
</dependency>
9090
<dependency>

sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@
2525
<dependency>
2626
<groupId>org.springframework.boot</groupId>
2727
<artifactId>spring-boot-starter-web</artifactId>
28-
<version>2.5.3</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-web;external_dependency} -->
28+
<version>2.5.4</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-web;external_dependency} -->
2929
</dependency>
3030
<dependency>
3131
<groupId>org.springframework.boot</groupId>
3232
<artifactId>spring-boot-starter-actuator</artifactId>
33-
<version>2.5.3</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-actuator;external_dependency} -->
33+
<version>2.5.4</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-actuator;external_dependency} -->
3434
<optional>true</optional>
3535
</dependency>
3636
<dependency>
@@ -66,7 +66,7 @@
6666
<dependency>
6767
<groupId>org.springframework.boot</groupId>
6868
<artifactId>spring-boot-starter-test</artifactId>
69-
<version>2.5.3</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-test;external_dependency} -->
69+
<version>2.5.4</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-test;external_dependency} -->
7070
<scope>test</scope>
7171
</dependency>
7272
<dependency>
@@ -93,8 +93,8 @@
9393
<rules>
9494
<bannedDependencies>
9595
<includes>
96-
<include>org.springframework.boot:spring-boot-starter-actuator:[2.5.3]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-actuator;external_dependency} -->
97-
<include>org.springframework.boot:spring-boot-starter-web:[2.5.3]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-web;external_dependency} -->
96+
<include>org.springframework.boot:spring-boot-starter-actuator:[2.5.4]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-actuator;external_dependency} -->
97+
<include>org.springframework.boot:spring-boot-starter-web:[2.5.4]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-web;external_dependency} -->
9898
<include>org.springframework.cloud:spring-cloud-bus:[3.0.3]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-bus;external_dependency} -->
9999
</includes>
100100
</bannedDependencies>

sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/pom.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,17 @@
2020
<dependency>
2121
<groupId>org.springframework.boot</groupId>
2222
<artifactId>spring-boot-autoconfigure-processor</artifactId>
23-
<version>2.5.3</version> <!-- {x-version-update;org.springframework.boot:spring-boot-autoconfigure-processor;external_dependency} -->
23+
<version>2.5.4</version> <!-- {x-version-update;org.springframework.boot:spring-boot-autoconfigure-processor;external_dependency} -->
2424
</dependency>
2525
<dependency>
2626
<groupId>org.springframework.boot</groupId>
2727
<artifactId>spring-boot-autoconfigure</artifactId>
28-
<version>2.5.3</version> <!-- {x-version-update;org.springframework.boot:spring-boot-autoconfigure;external_dependency} -->
28+
<version>2.5.4</version> <!-- {x-version-update;org.springframework.boot:spring-boot-autoconfigure;external_dependency} -->
2929
</dependency>
3030
<dependency>
3131
<groupId>org.springframework.boot</groupId>
3232
<artifactId>spring-boot-configuration-processor</artifactId>
33-
<version>2.5.3</version> <!-- {x-version-update;org.springframework.boot:spring-boot-configuration-processor;external_dependency} -->
33+
<version>2.5.4</version> <!-- {x-version-update;org.springframework.boot:spring-boot-configuration-processor;external_dependency} -->
3434
<optional>true</optional>
3535
</dependency>
3636
<dependency>
@@ -87,14 +87,14 @@
8787
<dependency>
8888
<groupId>org.springframework.boot</groupId>
8989
<artifactId>spring-boot-actuator-autoconfigure</artifactId>
90-
<version>2.5.3</version> <!-- {x-version-update;org.springframework.boot:spring-boot-actuator-autoconfigure;external_dependency} -->
90+
<version>2.5.4</version> <!-- {x-version-update;org.springframework.boot:spring-boot-actuator-autoconfigure;external_dependency} -->
9191
</dependency>
9292

9393
<!-- Test Dependencies -->
9494
<dependency>
9595
<groupId>org.springframework.boot</groupId>
9696
<artifactId>spring-boot-starter-test</artifactId>
97-
<version>2.5.3</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-test;external_dependency} -->
97+
<version>2.5.4</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-test;external_dependency} -->
9898
<scope>test</scope>
9999
</dependency>
100100

@@ -132,10 +132,10 @@
132132
<include>org.apache.commons:commons-lang3:[3.12.0]</include> <!-- {x-include-update;org.apache.commons:commons-lang3;external_dependency} -->
133133
<include>org.apache.httpcomponents:httpclient:[4.5.13]</include> <!-- {x-include-update;org.apache.httpcomponents:httpclient;external_dependency} -->
134134
<include>org.hibernate.validator:hibernate-validator:[6.2.0.Final]</include> <!-- {x-include-update;org.hibernate.validator:hibernate-validator;external_dependency} -->
135-
<include>org.springframework.boot:spring-boot-autoconfigure-processor:[2.5.3]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-autoconfigure-processor;external_dependency} -->
136-
<include>org.springframework.boot:spring-boot-autoconfigure:[2.5.3]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-autoconfigure;external_dependency} -->
137-
<include>org.springframework.boot:spring-boot-actuator-autoconfigure:[2.5.3]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-actuator-autoconfigure;external_dependency} -->
138-
<include>org.springframework.boot:spring-boot-configuration-processor:[2.5.3]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-configuration-processor;external_dependency} -->
135+
<include>org.springframework.boot:spring-boot-autoconfigure-processor:[2.5.4]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-autoconfigure-processor;external_dependency} -->
136+
<include>org.springframework.boot:spring-boot-autoconfigure:[2.5.4]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-autoconfigure;external_dependency} -->
137+
<include>org.springframework.boot:spring-boot-actuator-autoconfigure:[2.5.4]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-actuator-autoconfigure;external_dependency} -->
138+
<include>org.springframework.boot:spring-boot-configuration-processor:[2.5.4]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-configuration-processor;external_dependency} -->
139139
<include>org.springframework.cloud:spring-cloud-context:[3.0.3]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-context;external_dependency} -->
140140
<include>org.springframework.cloud:spring-cloud-starter-bootstrap:[3.0.3]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-starter-bootstrap;external_dependency} -->
141141
<include>org.springframework:spring-web:[5.3.9]</include> <!-- {x-include-update;org.springframework:spring-web;external_dependency} -->

sdk/appconfiguration/azure-spring-cloud-feature-management-web/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<dependency>
2020
<groupId>org.springframework.boot</groupId>
2121
<artifactId>spring-boot-starter-test</artifactId>
22-
<version>2.5.3</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-test;external_dependency} -->
22+
<version>2.5.4</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-test;external_dependency} -->
2323
<scope>test</scope>
2424
</dependency>
2525
<dependency>

sdk/appconfiguration/azure-spring-cloud-feature-management/pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<dependency>
2525
<groupId>org.springframework.boot</groupId>
2626
<artifactId>spring-boot-starter</artifactId>
27-
<version>2.5.3</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter;external_dependency} -->
27+
<version>2.5.4</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter;external_dependency} -->
2828
</dependency>
2929
<dependency>
3030
<groupId>com.fasterxml.jackson.core</groupId>
@@ -39,7 +39,7 @@
3939
<dependency>
4040
<groupId>io.projectreactor.netty</groupId>
4141
<artifactId>reactor-netty</artifactId>
42-
<version>1.0.9</version> <!-- {x-version-update;io.projectreactor.netty:reactor-netty;external_dependency} -->
42+
<version>1.0.10</version> <!-- {x-version-update;io.projectreactor.netty:reactor-netty;external_dependency} -->
4343
</dependency>
4444
<dependency>
4545
<groupId>junit</groupId>
@@ -56,7 +56,7 @@
5656
<dependency>
5757
<groupId>org.springframework.boot</groupId>
5858
<artifactId>spring-boot-starter-test</artifactId>
59-
<version>2.5.3</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-test;external_dependency} -->
59+
<version>2.5.4</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-test;external_dependency} -->
6060
<scope>test</scope>
6161
</dependency>
6262
<dependency>
@@ -84,8 +84,8 @@
8484
<includes>
8585
<include>com.fasterxml.jackson.core:jackson-annotations:[2.11.4]</include> <!-- {x-include-update;appconfig_spring_com.fasterxml.jackson.core:jackson-annotations;external_dependency} -->
8686
<include>com.fasterxml.jackson.core:jackson-databind:[2.11.4]</include> <!-- {x-include-update;appconfig_spring_com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
87-
<include>io.projectreactor.netty:reactor-netty:[1.0.9]</include> <!-- {x-include-update;io.projectreactor.netty:reactor-netty;external_dependency} -->
88-
<include>org.springframework.boot:spring-boot-starter:[2.5.3]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter;external_dependency} -->
87+
<include>io.projectreactor.netty:reactor-netty:[1.0.10]</include> <!-- {x-include-update;io.projectreactor.netty:reactor-netty;external_dependency} -->
88+
<include>org.springframework.boot:spring-boot-starter:[2.5.4]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter;external_dependency} -->
8989
<include>org.springframework:spring-context:[5.3.9]</include> <!-- {x-include-update;org.springframework:spring-context;external_dependency} -->
9090
</includes>
9191
</bannedDependencies>

sdk/appconfiguration/azure-spring-cloud-test-appconfiguration-config/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>org.springframework.boot</groupId>
1010
<artifactId>spring-boot-starter-parent</artifactId>
11-
<version>2.5.3</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-parent;external_dependency} -->
11+
<version>2.5.4</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-parent;external_dependency} -->
1212
<relativePath/> <!-- lookup parent from repository -->
1313
</parent>
1414

@@ -43,7 +43,7 @@
4343
<dependency>
4444
<groupId>org.springframework.boot</groupId>
4545
<artifactId>spring-boot-starter-test</artifactId>
46-
<version>2.5.3</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-test;external_dependency} -->
46+
<version>2.5.4</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-test;external_dependency} -->
4747
<scope>test</scope>
4848
</dependency>
4949
</dependencies>

0 commit comments

Comments
 (0)