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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upgrade-spring-boot-to-2.6.0-M2 #24670

Closed
wants to merge 5 commits into from
Closed

upgrade-spring-boot-to-2.6.0-M2 #24670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6d1c160
* 1. Update ROOT_POMS' version manually.
ZhuXiaoBing-cn Oct 8, 2021
60e16bc
* Add spring milestone repo mirror.
ZhuXiaoBing-cn Oct 8, 2021
4ad53a6
* Add spring milestone repo mirror.
ZhuXiaoBing-cn Oct 8, 2021
db6bfec
* Fix the unit tests failure problem caused by the springboot version…
ZhuXiaoBing-cn Oct 8, 2021
c6f9dc4
* Modify the code according to checkstyle.
ZhuXiaoBing-cn Oct 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 44 additions & 44 deletions eng/versioning/external_dependencies.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,17 @@ com.microsoft.azure:qpid-proton-j-extensions;1.2.4
com.microsoft.azure.sdk.iot:iot-service-client;1.28.0
com.microsoft.rest:client-runtime;1.7.4
com.microsoft.rest.v2:client-runtime;2.1.1
com.microsoft.sqlserver:mssql-jdbc;9.2.1.jre8
com.microsoft.sqlserver:mssql-jdbc;9.4.0.jre8
com.microsoft.azure:spring-data-cosmosdb;2.3.0
com.squareup.okhttp3:okhttp;4.8.1
com.zaxxer:HikariCP;4.0.3
commons-codec:commons-codec;1.15
commons-net:commons-net;3.6
io.fabric8:kubernetes-client;4.13.3
io.fabric8:kubernetes-client;5.5.0
io.github.bonigarcia:webdrivermanager;4.3.1
io.micrometer:micrometer-core;1.7.3
io.micrometer:micrometer-registry-azure-monitor;1.7.3
io.micrometer:micrometer-registry-graphite;1.7.3
io.micrometer:micrometer-core;1.8.0-M2
io.micrometer:micrometer-registry-azure-monitor;1.8.0-M2
io.micrometer:micrometer-registry-graphite;1.8.0-M2
io.netty:netty-buffer;4.1.68.Final
io.netty:netty-common;4.1.68.Final
io.netty:netty-codec-http;4.1.68.Final
Expand Down Expand Up @@ -99,34 +99,34 @@ org.slf4j:slf4j-nop;1.7.32
org.slf4j:slf4j-simple;1.7.32

## Spring boot dependency versions
org.springframework.boot:spring-boot-dependencies;2.5.4
org.springframework.boot:spring-boot-actuator-autoconfigure;2.5.4
org.springframework.boot:spring-boot-autoconfigure-processor;2.5.4
org.springframework.boot:spring-boot-autoconfigure;2.5.4
org.springframework.boot:spring-boot-configuration-processor;2.5.4
org.springframework.boot:spring-boot-starter-actuator;2.5.4
org.springframework.boot:spring-boot-starter-aop;2.5.4
org.springframework.boot:spring-boot-starter-cache;2.5.4
org.springframework.boot:spring-boot-starter-data-redis;2.5.4
org.springframework.boot:spring-boot-starter-logging;2.5.4
org.springframework.boot:spring-boot-starter-test;2.5.4
org.springframework.boot:spring-boot-starter-validation;2.5.4
org.springframework.boot:spring-boot-starter-web;2.5.4
org.springframework.boot:spring-boot-starter-webflux;2.5.4
org.springframework.boot:spring-boot-starter;2.5.4
org.springframework.boot:spring-boot;2.5.4
org.springframework.data:spring-data-commons;2.5.4
org.springframework.data:spring-data-mongodb;3.2.4
org.springframework.data:spring-data-redis;2.5.4
org.springframework.boot:spring-boot-dependencies;2.6.0-M2
org.springframework.boot:spring-boot-actuator-autoconfigure;2.6.0-M2
org.springframework.boot:spring-boot-autoconfigure-processor;2.6.0-M2
org.springframework.boot:spring-boot-autoconfigure;2.6.0-M2
org.springframework.boot:spring-boot-configuration-processor;2.6.0-M2
org.springframework.boot:spring-boot-starter-actuator;2.6.0-M2
org.springframework.boot:spring-boot-starter-aop;2.6.0-M2
org.springframework.boot:spring-boot-starter-cache;2.6.0-M2
org.springframework.boot:spring-boot-starter-data-redis;2.6.0-M2
org.springframework.boot:spring-boot-starter-logging;2.6.0-M2
org.springframework.boot:spring-boot-starter-test;2.6.0-M2
org.springframework.boot:spring-boot-starter-validation;2.6.0-M2
org.springframework.boot:spring-boot-starter-web;2.6.0-M2
org.springframework.boot:spring-boot-starter-webflux;2.6.0-M2
org.springframework.boot:spring-boot-starter;2.6.0-M2
org.springframework.boot:spring-boot;2.6.0-M2
org.springframework.data:spring-data-commons;2.6.0-M2
org.springframework.data:spring-data-mongodb;3.3.0-M2
org.springframework.data:spring-data-redis;2.6.0-M2
org.springframework.integration:spring-integration-core;5.5.3
org.springframework.kafka:spring-kafka;2.7.6
org.springframework.security:spring-security-config;5.5.2
org.springframework.security:spring-security-core;5.5.2
org.springframework.security:spring-security-oauth2-client;5.5.2
org.springframework.security:spring-security-oauth2-resource-server;5.5.2
org.springframework.security:spring-security-oauth2-core;5.5.2
org.springframework.security:spring-security-oauth2-jose;5.5.2
org.springframework.security:spring-security-web;5.5.2
org.springframework.kafka:spring-kafka;2.8.0-M2
org.springframework.security:spring-security-config;5.6.0-M2
org.springframework.security:spring-security-core;5.6.0-M2
org.springframework.security:spring-security-oauth2-client;5.6.0-M2
org.springframework.security:spring-security-oauth2-resource-server;5.6.0-M2
org.springframework.security:spring-security-oauth2-core;5.6.0-M2
org.springframework.security:spring-security-oauth2-jose;5.6.0-M2
org.springframework.security:spring-security-web;5.6.0-M2
org.springframework:spring-beans;5.3.9
org.springframework:spring-context-support;5.3.9
org.springframework:spring-context;5.3.9
Expand All @@ -140,16 +140,16 @@ org.springframework:spring-web;5.3.9
org.springframework:spring-webmvc;5.3.9
org.springframework:spring-webflux;5.3.9

org.springframework.boot:spring-boot-starter-parent;2.5.4
org.springframework.boot:spring-boot-starter-parent;2.6.0-M2

## Spring cloud dependency versions
org.springframework.cloud:spring-cloud-dependencies;2020.0.3
org.springframework.cloud:spring-cloud-starter-bootstrap;3.0.3
org.springframework.cloud:spring-cloud-bus;3.0.3
org.springframework.cloud:spring-cloud-context;3.0.3
org.springframework.cloud:spring-cloud-starter-stream-kafka;3.1.3
org.springframework.cloud:spring-cloud-stream-binder-test;3.1.3
org.springframework.cloud:spring-cloud-stream;3.1.3
org.springframework.cloud:spring-cloud-dependencies;2021.0.0-M1
org.springframework.cloud:spring-cloud-starter-bootstrap;3.1.0-M1
org.springframework.cloud:spring-cloud-bus;3.1.0-M1
org.springframework.cloud:spring-cloud-context;3.1.0-M1
org.springframework.cloud:spring-cloud-starter-stream-kafka;3.2.0-M1
org.springframework.cloud:spring-cloud-stream-binder-test;3.2.0-M1
org.springframework.cloud:spring-cloud-stream;3.2.0-M1

pl.pragmatists:JUnitParams;1.1.1

Expand Down Expand Up @@ -184,7 +184,7 @@ org.apache.maven:maven-compat;3.6.2
org.apache.maven:maven-embedder;3.6.2
org.apache.maven.wagon:wagon-http;3.3.4
org.apache.maven.wagon:wagon-provider-api;3.3.4
org.assertj:assertj-core;3.19.0
org.assertj:assertj-core;3.20.2
org.bouncycastle:bcprov-jdk15on;1.68
org.eclipse.aether:aether-connector-basic;1.1.0
org.eclipse.aether:aether-transport-wagon;1.1.0
Expand Down Expand Up @@ -224,9 +224,9 @@ com.nimbusds:nimbus-jose-jwt;9.10.1
com.puppycrawl.tools:checkstyle;8.42
commons-io:commons-io;2.5
commons-validator:commons-validator;1.6
io.dropwizard.metrics:metrics-core;4.1.25
io.dropwizard.metrics:metrics-graphite;4.1.25
io.dropwizard.metrics:metrics-jvm;4.1.25
io.dropwizard.metrics:metrics-core;4.2.3
io.dropwizard.metrics:metrics-graphite;4.2.3
io.dropwizard.metrics:metrics-jvm;4.2.3
io.reactivex.rxjava2:rxjava;2.2.21
net.java.dev.jna:jna-platform;5.6.0
net.jonathangiles.tools:dependencyChecker-maven-plugin;1.0.6
Expand Down
14 changes: 7 additions & 7 deletions sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,18 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>2.5.4</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-web;external_dependency} -->
<version>2.6.0-M2</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.5.4</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-actuator;external_dependency} -->
<version>2.6.0-M2</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-actuator;external_dependency} -->
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-bus</artifactId>
<version>3.0.3</version> <!-- {x-version-update;org.springframework.cloud:spring-cloud-bus;external_dependency} -->
<version>3.1.0-M1</version> <!-- {x-version-update;org.springframework.cloud:spring-cloud-bus;external_dependency} -->
<optional>true</optional>
</dependency>
<dependency>
Expand Down Expand Up @@ -66,7 +66,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<version>2.5.4</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-test;external_dependency} -->
<version>2.6.0-M2</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-test;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -93,9 +93,9 @@
<rules>
<bannedDependencies>
<includes>
<include>org.springframework.boot:spring-boot-starter-actuator:[2.5.4]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-actuator;external_dependency} -->
<include>org.springframework.boot:spring-boot-starter-web:[2.5.4]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-web;external_dependency} -->
<include>org.springframework.cloud:spring-cloud-bus:[3.0.3]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-bus;external_dependency} -->
<include>org.springframework.boot:spring-boot-starter-actuator:[2.6.0-M2]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-actuator;external_dependency} -->
<include>org.springframework.boot:spring-boot-starter-web:[2.6.0-M2]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-web;external_dependency} -->
<include>org.springframework.cloud:spring-cloud-bus:[3.1.0-M1]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-bus;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
Expand Down
26 changes: 13 additions & 13 deletions sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,28 +20,28 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-autoconfigure-processor</artifactId>
<version>2.5.4</version> <!-- {x-version-update;org.springframework.boot:spring-boot-autoconfigure-processor;external_dependency} -->
<version>2.6.0-M2</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.5.4</version> <!-- {x-version-update;org.springframework.boot:spring-boot-autoconfigure;external_dependency} -->
<version>2.6.0-M2</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.5.4</version> <!-- {x-version-update;org.springframework.boot:spring-boot-configuration-processor;external_dependency} -->
<version>2.6.0-M2</version> <!-- {x-version-update;org.springframework.boot:spring-boot-configuration-processor;external_dependency} -->
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-bootstrap</artifactId>
<version>3.0.3</version> <!-- {x-version-update;org.springframework.cloud:spring-cloud-starter-bootstrap;external_dependency} -->
<version>3.1.0-M1</version> <!-- {x-version-update;org.springframework.cloud:spring-cloud-starter-bootstrap;external_dependency} -->
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-context</artifactId>
<version>3.0.3</version> <!-- {x-version-update;org.springframework.cloud:spring-cloud-context;external_dependency} -->
<version>3.1.0-M1</version> <!-- {x-version-update;org.springframework.cloud:spring-cloud-context;external_dependency} -->
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand Down Expand Up @@ -87,14 +87,14 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-actuator-autoconfigure</artifactId>
<version>2.5.4</version> <!-- {x-version-update;org.springframework.boot:spring-boot-actuator-autoconfigure;external_dependency} -->
<version>2.6.0-M2</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.5.4</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-test;external_dependency} -->
<version>2.6.0-M2</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-test;external_dependency} -->
<scope>test</scope>
</dependency>

Expand Down Expand Up @@ -132,12 +132,12 @@
<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.hibernate.validator:hibernate-validator:[6.2.0.Final]</include> <!-- {x-include-update;org.hibernate.validator:hibernate-validator;external_dependency} -->
<include>org.springframework.boot:spring-boot-autoconfigure-processor:[2.5.4]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-autoconfigure-processor;external_dependency} -->
<include>org.springframework.boot:spring-boot-autoconfigure:[2.5.4]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-autoconfigure;external_dependency} -->
<include>org.springframework.boot:spring-boot-actuator-autoconfigure:[2.5.4]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-actuator-autoconfigure;external_dependency} -->
<include>org.springframework.boot:spring-boot-configuration-processor:[2.5.4]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-configuration-processor;external_dependency} -->
<include>org.springframework.cloud:spring-cloud-context:[3.0.3]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-context;external_dependency} -->
<include>org.springframework.cloud:spring-cloud-starter-bootstrap:[3.0.3]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-starter-bootstrap;external_dependency} -->
<include>org.springframework.boot:spring-boot-autoconfigure-processor:[2.6.0-M2]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-autoconfigure-processor;external_dependency} -->
<include>org.springframework.boot:spring-boot-autoconfigure:[2.6.0-M2]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-autoconfigure;external_dependency} -->
<include>org.springframework.boot:spring-boot-actuator-autoconfigure:[2.6.0-M2]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-actuator-autoconfigure;external_dependency} -->
<include>org.springframework.boot:spring-boot-configuration-processor:[2.6.0-M2]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-configuration-processor;external_dependency} -->
<include>org.springframework.cloud:spring-cloud-context:[3.1.0-M1]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-context;external_dependency} -->
<include>org.springframework.cloud:spring-cloud-starter-bootstrap:[3.1.0-M1]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-starter-bootstrap;external_dependency} -->
<include>org.springframework:spring-web:[5.3.9]</include> <!-- {x-include-update;org.springframework:spring-web;external_dependency} -->
</includes>
</bannedDependencies>
Expand Down
2 changes: 1 addition & 1 deletion sdk/appconfiguration/azure-spring-cloud-feature-management-web/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<version>2.5.4</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-test;external_dependency} -->
<version>2.6.0-M2</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-test;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
Expand Down
6 changes: 3 additions & 3 deletions sdk/appconfiguration/azure-spring-cloud-feature-management/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
<version>2.5.4</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter;external_dependency} -->
<version>2.6.0-M2</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter;external_dependency} -->
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand All @@ -44,7 +44,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<version>2.5.4</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-test;external_dependency} -->
<version>2.6.0-M2</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-test;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -73,7 +73,7 @@
<include>com.fasterxml.jackson.core:jackson-annotations:[2.11.4]</include> <!-- {x-include-update;appconfig_spring_com.fasterxml.jackson.core:jackson-annotations;external_dependency} -->
<include>com.fasterxml.jackson.core:jackson-databind:[2.11.4]</include> <!-- {x-include-update;appconfig_spring_com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
<include>io.projectreactor.netty:reactor-netty:[1.0.11]</include> <!-- {x-include-update;io.projectreactor.netty:reactor-netty;external_dependency} -->
<include>org.springframework.boot:spring-boot-starter:[2.5.4]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter;external_dependency} -->
<include>org.springframework.boot:spring-boot-starter:[2.6.0-M2]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter;external_dependency} -->
<include>org.springframework:spring-context:[5.3.9]</include> <!-- {x-include-update;org.springframework:spring-context;external_dependency} -->
</includes>
</bannedDependencies>
Expand Down
Loading