Skip to content

Commit

Permalink
Upgrade to spring boot 2.5.3 (Azure#23152)
Browse files Browse the repository at this point in the history
* 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".

* 5. Update changelog about compatible Spring Boot versions and Spring Cloud versions.
  • Loading branch information
Rujun Chen authored Jul 26, 2021
1 parent c19c63c commit 212ff33
Show file tree
Hide file tree
Showing 163 changed files with 1,135 additions and 1,016 deletions.
8 changes: 4 additions & 4 deletions common/perf-test-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,12 @@
<rules>
<bannedDependencies>
<includes>
<include>com.fasterxml.jackson.core:jackson-databind:[2.12.3]</include> <!-- {x-include-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
<include>com.fasterxml.jackson.core:jackson-databind:[2.12.4]</include> <!-- {x-include-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->

<!-- special allowance for perf-test-core as it is not a shipping library: -->
<include>com.beust:jcommander:[1.78]</include> <!-- {x-include-update;com.beust:jcommander;external_dependency} -->

<include>io.projectreactor:reactor-core:[3.4.7]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
<include>io.projectreactor:reactor-core:[3.4.8]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
Expand All @@ -73,7 +73,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.12.3</version> <!-- {x-version-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
<version>2.12.4</version> <!-- {x-version-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
</dependency>
<dependency>
<groupId>com.beust</groupId>
Expand All @@ -83,7 +83,7 @@
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-core</artifactId>
<version>3.4.7</version> <!-- {x-version-update;io.projectreactor:reactor-core;external_dependency} -->
<version>3.4.8</version> <!-- {x-version-update;io.projectreactor:reactor-core;external_dependency} -->
</dependency>
</dependencies>
</project>
2 changes: 1 addition & 1 deletion common/smoke-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.7.31</version> <!-- {x-version-update;org.slf4j:slf4j-simple;external_dependency} -->
<version>1.7.32</version> <!-- {x-version-update;org.slf4j:slf4j-simple;external_dependency} -->
</dependency>

</dependencies>
Expand Down
136 changes: 68 additions & 68 deletions eng/versioning/external_dependencies.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@

# Format;
# groupId:artifactId;dependency-version
com.fasterxml.jackson.core:jackson-annotations;2.12.3
com.fasterxml.jackson.core:jackson-core;2.12.3
com.fasterxml.jackson.core:jackson-databind;2.12.3
com.fasterxml.jackson.dataformat:jackson-dataformat-avro;2.12.3
com.fasterxml.jackson.dataformat:jackson-dataformat-xml;2.12.3
com.fasterxml.jackson.datatype:jackson-datatype-jdk8;2.12.3
com.fasterxml.jackson.datatype:jackson-datatype-jsr310;2.12.3
com.fasterxml.jackson.module:jackson-module-parameter-names;2.12.3
com.fasterxml.jackson.core:jackson-annotations;2.12.4
com.fasterxml.jackson.core:jackson-core;2.12.4
com.fasterxml.jackson.core:jackson-databind;2.12.4
com.fasterxml.jackson.dataformat:jackson-dataformat-avro;2.12.4
com.fasterxml.jackson.dataformat:jackson-dataformat-xml;2.12.4
com.fasterxml.jackson.datatype:jackson-datatype-jdk8;2.12.4
com.fasterxml.jackson.datatype:jackson-datatype-jsr310;2.12.4
com.fasterxml.jackson.module:jackson-module-parameter-names;2.12.4
com.github.spotbugs:spotbugs;4.2.0
com.github.spotbugs:spotbugs-annotations;4.2.0
com.github.spotbugs:spotbugs-maven-plugin;4.2.0
Expand Down Expand Up @@ -43,30 +43,30 @@ commons-codec:commons-codec;1.15
commons-net:commons-net;3.6
io.fabric8:kubernetes-client;4.13.3
io.github.bonigarcia:webdrivermanager;4.3.1
io.micrometer:micrometer-core;1.7.1
io.micrometer:micrometer-registry-azure-monitor;1.7.1
io.micrometer:micrometer-registry-graphite;1.7.1
io.netty:netty-buffer;4.1.65.Final
io.netty:netty-common;4.1.65.Final
io.netty:netty-codec-http;4.1.65.Final
io.netty:netty-codec-http2;4.1.65.Final
io.netty:netty-transport;4.1.65.Final
io.netty:netty-handler;4.1.65.Final
io.netty:netty-handler-proxy;4.1.65.Final
io.micrometer:micrometer-core;1.7.2
io.micrometer:micrometer-registry-azure-monitor;1.7.2
io.micrometer:micrometer-registry-graphite;1.7.2
io.netty:netty-buffer;4.1.66.Final
io.netty:netty-common;4.1.66.Final
io.netty:netty-codec-http;4.1.66.Final
io.netty:netty-codec-http2;4.1.66.Final
io.netty:netty-transport;4.1.66.Final
io.netty:netty-handler;4.1.66.Final
io.netty:netty-handler-proxy;4.1.66.Final
io.netty:netty-tcnative;2.0.40.Final
io.netty:netty-tcnative-boringssl-static;2.0.40.Final
io.netty:netty-transport-native-epoll;4.1.65.Final
io.netty:netty-transport-native-unix-common;4.1.65.Final
io.netty:netty-transport-native-kqueue;4.1.65.Final
io.projectreactor.netty:reactor-netty;1.0.8
io.projectreactor:reactor-core;3.4.7
io.netty:netty-transport-native-epoll;4.1.66.Final
io.netty:netty-transport-native-unix-common;4.1.66.Final
io.netty:netty-transport-native-kqueue;4.1.66.Final
io.projectreactor.netty:reactor-netty;1.0.9
io.projectreactor:reactor-core;3.4.8
io.reactivex:rxjava;1.3.8
javax.annotation:javax.annotation-api;1.3.2
javax.json:javax.json-api;1.1.4
javax.servlet:javax.servlet-api;4.0.1
javax.validation:validation-api;2.0.1.Final
javax.websocket:javax.websocket-api;1.1
mysql:mysql-connector-java;8.0.25
mysql:mysql-connector-java;8.0.26
net.minidev:json-smart;2.4.7
org.apache.ant:ant;1.9.4
org.apache.avro:avro;1.10.1
Expand All @@ -91,54 +91,54 @@ org.javatuples:javatuples;1.2
org.linguafranca.pwdb:KeePassJava2;2.1.4
org.powermock:powermock-api-mockito2;2.0.2
org.powermock:powermock-module-junit4;2.0.2
org.postgresql:postgresql;42.2.22
org.slf4j:slf4j-api;1.7.31
org.slf4j:slf4j-nop;1.7.31
org.slf4j:slf4j-simple;1.7.31
org.postgresql:postgresql;42.2.23
org.slf4j:slf4j-api;1.7.32
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.2
org.springframework.boot:spring-boot-actuator-autoconfigure;2.5.2
org.springframework.boot:spring-boot-autoconfigure-processor;2.5.2
org.springframework.boot:spring-boot-autoconfigure;2.5.2
org.springframework.boot:spring-boot-configuration-processor;2.5.2
org.springframework.boot:spring-boot-starter-actuator;2.5.2
org.springframework.boot:spring-boot-starter-aop;2.5.2
org.springframework.boot:spring-boot-starter-cache;2.5.2
org.springframework.boot:spring-boot-starter-data-redis;2.5.2
org.springframework.boot:spring-boot-starter-logging;2.5.2
org.springframework.boot:spring-boot-starter-test;2.5.2
org.springframework.boot:spring-boot-starter-validation;2.5.2
org.springframework.boot:spring-boot-starter-web;2.5.2
org.springframework.boot:spring-boot-starter-webflux;2.5.2
org.springframework.boot:spring-boot-starter;2.5.2
org.springframework.boot:spring-boot;2.5.2
org.springframework.data:spring-data-commons;2.5.2
org.springframework.data:spring-data-mongodb;3.2.2
org.springframework.data:spring-data-redis;2.5.2
org.springframework.integration:spring-integration-core;5.5.1
org.springframework.kafka:spring-kafka;2.7.3
org.springframework.boot:spring-boot-dependencies;2.5.3
org.springframework.boot:spring-boot-actuator-autoconfigure;2.5.3
org.springframework.boot:spring-boot-autoconfigure-processor;2.5.3
org.springframework.boot:spring-boot-autoconfigure;2.5.3
org.springframework.boot:spring-boot-configuration-processor;2.5.3
org.springframework.boot:spring-boot-starter-actuator;2.5.3
org.springframework.boot:spring-boot-starter-aop;2.5.3
org.springframework.boot:spring-boot-starter-cache;2.5.3
org.springframework.boot:spring-boot-starter-data-redis;2.5.3
org.springframework.boot:spring-boot-starter-logging;2.5.3
org.springframework.boot:spring-boot-starter-test;2.5.3
org.springframework.boot:spring-boot-starter-validation;2.5.3
org.springframework.boot:spring-boot-starter-web;2.5.3
org.springframework.boot:spring-boot-starter-webflux;2.5.3
org.springframework.boot:spring-boot-starter;2.5.3
org.springframework.boot:spring-boot;2.5.3
org.springframework.data:spring-data-commons;2.5.3
org.springframework.data:spring-data-mongodb;3.2.3
org.springframework.data:spring-data-redis;2.5.3
org.springframework.integration:spring-integration-core;5.5.2
org.springframework.kafka:spring-kafka;2.7.4
org.springframework.security:spring-security-config;5.5.1
org.springframework.security:spring-security-core;5.5.1
org.springframework.security:spring-security-oauth2-client;5.5.1
org.springframework.security:spring-security-oauth2-resource-server;5.5.1
org.springframework.security:spring-security-oauth2-core;5.5.1
org.springframework.security:spring-security-oauth2-jose;5.5.1
org.springframework.security:spring-security-web;5.5.1
org.springframework:spring-beans;5.3.8
org.springframework:spring-context-support;5.3.8
org.springframework:spring-context;5.3.8
org.springframework:spring-core;5.3.8
org.springframework:spring-expression;5.3.8
org.springframework:spring-jdbc;5.3.8
org.springframework:spring-jms;5.3.8
org.springframework:spring-messaging;5.3.8
org.springframework:spring-tx;5.3.8
org.springframework:spring-web;5.3.8
org.springframework:spring-webmvc;5.3.8
org.springframework:spring-webflux;5.3.8
org.springframework:spring-beans;5.3.9
org.springframework:spring-context-support;5.3.9
org.springframework:spring-context;5.3.9
org.springframework:spring-core;5.3.9
org.springframework:spring-expression;5.3.9
org.springframework:spring-jdbc;5.3.9
org.springframework:spring-jms;5.3.9
org.springframework:spring-messaging;5.3.9
org.springframework:spring-tx;5.3.9
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.2
org.springframework.boot:spring-boot-starter-parent;2.5.3

## Spring cloud dependency versions
org.springframework.cloud:spring-cloud-dependencies;2020.0.3
Expand Down Expand Up @@ -175,7 +175,7 @@ io.opentelemetry:opentelemetry-api;1.0.0
io.opentelemetry:opentelemetry-sdk;1.0.0
io.opentelemetry:opentelemetry-exporter-logging;1.0.0
io.opentelemetry:opentelemetry-exporter-jaeger;1.0.0
io.projectreactor:reactor-test;3.4.7
io.projectreactor:reactor-test;3.4.8
junit:junit;4.13.2
commons-cli:commons-cli;1.3
org.apache.maven:maven-compat;3.6.2
Expand All @@ -186,8 +186,8 @@ org.assertj:assertj-core;3.19.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.42.v20210604
org.eclipse.jetty:jetty-server;9.4.42.v20210604
org.eclipse.jetty:jetty-http;9.4.43.v20210629
org.eclipse.jetty:jetty-server;9.4.43.v20210629
org.eclipse.jgit:org.eclipse.jgit;4.5.7.201904151645-r
org.glassfish:javax.json;1.1.4
org.hamcrest:hamcrest-all;1.3
Expand Down Expand Up @@ -221,9 +221,9 @@ com.nimbusds:nimbus-jose-jwt;9.10
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.24
io.dropwizard.metrics:metrics-graphite;4.1.24
io.dropwizard.metrics:metrics-jvm;4.1.24
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.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
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 @@ -84,7 +84,7 @@
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-test</artifactId>
<version>3.4.7</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
<version>3.4.8</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 @@ -25,12 +25,12 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>2.5.2</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-web;external_dependency} -->
<version>2.5.3</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.2</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-actuator;external_dependency} -->
<version>2.5.3</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-actuator;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.2</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-test;external_dependency} -->
<version>2.5.3</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-test;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -93,8 +93,8 @@
<rules>
<bannedDependencies>
<includes>
<include>org.springframework.boot:spring-boot-starter-actuator:[2.5.2]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-actuator;external_dependency} -->
<include>org.springframework.boot:spring-boot-starter-web:[2.5.2]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-web;external_dependency} -->
<include>org.springframework.boot:spring-boot-starter-actuator:[2.5.3]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-actuator;external_dependency} -->
<include>org.springframework.boot:spring-boot-starter-web:[2.5.3]</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} -->
</includes>
</bannedDependencies>
Expand Down
Loading

0 comments on commit 212ff33

Please sign in to comment.