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

Jump to bottom

Update spring-boot's version to 2.3.4.RELEASE #15671

Merged
merged 5 commits into from
Oct 22, 2020
Merged

Update spring-boot's version to 2.3.4.RELEASE #15671

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
cdf3132
Update version of spring-boot-dependencies and spring-cloud-dependenc…
rujche Oct 22, 2020
844dfd4
Update version by command: 'python .\sdk\spring\scripts\update_versio…
rujche Oct 22, 2020
19907fd
Update version by command: 'python eng/versioning/update_versions.py …
rujche Oct 22, 2020
2e76804
Update netty-tcnative's version to 2.0.34.Final.
rujche Oct 22, 2020
b77478b
Fix pipeline failure.
rujche Oct 22, 2020
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
110 changes: 55 additions & 55 deletions eng/versioning/external_dependencies.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,23 +34,23 @@ com.zaxxer:HikariCP;3.4.5
commons-codec:commons-codec;1.14
commons-net:commons-net;3.6
io.fabric8:kubernetes-client;4.10.3
io.micrometer:micrometer-core;1.5.4
io.micrometer:micrometer-registry-azure-monitor;1.5.4
io.micrometer:micrometer-registry-graphite;1.5.4
io.netty:netty-buffer;4.1.51.Final
io.netty:netty-common;4.1.51.Final
io.netty:netty-codec-http;4.1.51.Final
io.netty:netty-codec-http2;4.1.51.Final
io.netty:netty-transport;4.1.51.Final
io.netty:netty-handler;4.1.51.Final
io.netty:netty-handler-proxy;4.1.51.Final
io.netty:netty-tcnative;2.0.31.Final
io.netty:netty-tcnative-boringssl-static;2.0.31.Final
io.netty:netty-transport-native-epoll;4.1.51.Final
io.netty:netty-transport-native-unix-common;4.1.51.Final
io.netty:netty-transport-native-kqueue;4.1.51.Final
io.projectreactor.netty:reactor-netty;0.9.11.RELEASE
io.projectreactor:reactor-core;3.3.9.RELEASE
io.micrometer:micrometer-core;1.5.5
io.micrometer:micrometer-registry-azure-monitor;1.5.5
io.micrometer:micrometer-registry-graphite;1.5.5
io.netty:netty-buffer;4.1.52.Final
io.netty:netty-common;4.1.52.Final
io.netty:netty-codec-http;4.1.52.Final
io.netty:netty-codec-http2;4.1.52.Final
io.netty:netty-transport;4.1.52.Final
io.netty:netty-handler;4.1.52.Final
io.netty:netty-handler-proxy;4.1.52.Final
io.netty:netty-tcnative;2.0.34.Final
io.netty:netty-tcnative-boringssl-static;2.0.34.Final
io.netty:netty-transport-native-epoll;4.1.52.Final
io.netty:netty-transport-native-unix-common;4.1.52.Final
io.netty:netty-transport-native-kqueue;4.1.52.Final
io.projectreactor.netty:reactor-netty;0.9.12.RELEASE
io.projectreactor:reactor-core;3.3.10.RELEASE
io.reactivex:rxjava;1.3.8
javax.annotation:javax.annotation-api;1.3.2
javax.servlet:javax.servlet-api;4.0.1
Expand Down Expand Up @@ -78,62 +78,62 @@ 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.14
org.postgresql:postgresql;42.2.16
org.slf4j:slf4j-api;1.7.30
org.slf4j:slf4j-nop;1.7.30
org.slf4j:slf4j-simple;1.7.30

## Spring boot dependency versions
# After you update spring-boot-dependencies' version, please run this script: /sdk/spring/scripts/sync_version_from_spring-boot-dependencies.py
org.springframework.boot:spring-boot-dependencies;2.3.3.RELEASE
org.springframework.boot:spring-boot-actuator-autoconfigure;2.3.3.RELEASE
org.springframework.boot:spring-boot-autoconfigure-processor;2.3.3.RELEASE
org.springframework.boot:spring-boot-autoconfigure;2.3.3.RELEASE
org.springframework.boot:spring-boot-configuration-processor;2.3.3.RELEASE
org.springframework.boot:spring-boot-starter-actuator;2.3.3.RELEASE
org.springframework.boot:spring-boot-starter-aop;2.3.3.RELEASE
org.springframework.boot:spring-boot-starter-cache;2.3.3.RELEASE
org.springframework.boot:spring-boot-starter-data-redis;2.3.3.RELEASE
org.springframework.boot:spring-boot-starter-logging;2.3.3.RELEASE
org.springframework.boot:spring-boot-starter-test;2.3.3.RELEASE
org.springframework.boot:spring-boot-starter-validation;2.3.3.RELEASE
org.springframework.boot:spring-boot-starter-web;2.3.3.RELEASE
org.springframework.boot:spring-boot-starter;2.3.3.RELEASE
org.springframework.boot:spring-boot;2.3.3.RELEASE
org.springframework.data:spring-data-commons;2.3.3.RELEASE
org.springframework.data:spring-data-mongodb;3.0.3.RELEASE
org.springframework.data:spring-data-redis;2.3.3.RELEASE
org.springframework.boot:spring-boot-dependencies;2.3.4.RELEASE
org.springframework.boot:spring-boot-actuator-autoconfigure;2.3.4.RELEASE
org.springframework.boot:spring-boot-autoconfigure-processor;2.3.4.RELEASE
org.springframework.boot:spring-boot-autoconfigure;2.3.4.RELEASE
org.springframework.boot:spring-boot-configuration-processor;2.3.4.RELEASE
org.springframework.boot:spring-boot-starter-actuator;2.3.4.RELEASE
org.springframework.boot:spring-boot-starter-aop;2.3.4.RELEASE
org.springframework.boot:spring-boot-starter-cache;2.3.4.RELEASE
org.springframework.boot:spring-boot-starter-data-redis;2.3.4.RELEASE
org.springframework.boot:spring-boot-starter-logging;2.3.4.RELEASE
org.springframework.boot:spring-boot-starter-test;2.3.4.RELEASE
org.springframework.boot:spring-boot-starter-validation;2.3.4.RELEASE
org.springframework.boot:spring-boot-starter-web;2.3.4.RELEASE
org.springframework.boot:spring-boot-starter;2.3.4.RELEASE
org.springframework.boot:spring-boot;2.3.4.RELEASE
org.springframework.data:spring-data-commons;2.3.4.RELEASE
org.springframework.data:spring-data-mongodb;3.0.4.RELEASE
org.springframework.data:spring-data-redis;2.3.4.RELEASE
org.springframework.integration:spring-integration-core;5.3.2.RELEASE
org.springframework.kafka:spring-kafka;2.5.5.RELEASE
org.springframework.kafka:spring-kafka;2.5.6.RELEASE
org.springframework.security:spring-security-config;5.3.4.RELEASE
org.springframework.security:spring-security-core;5.3.4.RELEASE
org.springframework.security:spring-security-oauth2-client;5.3.4.RELEASE
org.springframework.security:spring-security-oauth2-core;5.3.4.RELEASE
org.springframework.security:spring-security-oauth2-jose;5.3.4.RELEASE
org.springframework.security:spring-security-web;5.3.4.RELEASE
org.springframework:spring-beans;5.2.8.RELEASE
org.springframework:spring-context-support;5.2.8.RELEASE
org.springframework:spring-context;5.2.8.RELEASE
org.springframework:spring-core;5.2.8.RELEASE
org.springframework:spring-expression;5.2.8.RELEASE
org.springframework:spring-jdbc;5.2.8.RELEASE
org.springframework:spring-jms;5.2.8.RELEASE
org.springframework:spring-messaging;5.2.8.RELEASE
org.springframework:spring-tx;5.2.8.RELEASE
org.springframework:spring-web;5.2.8.RELEASE
org.springframework:spring-webmvc;5.2.8.RELEASE
org.springframework:spring-beans;5.2.9.RELEASE
org.springframework:spring-context-support;5.2.9.RELEASE
org.springframework:spring-context;5.2.9.RELEASE
org.springframework:spring-core;5.2.9.RELEASE
org.springframework:spring-expression;5.2.9.RELEASE
org.springframework:spring-jdbc;5.2.9.RELEASE
org.springframework:spring-jms;5.2.9.RELEASE
org.springframework:spring-messaging;5.2.9.RELEASE
org.springframework:spring-tx;5.2.9.RELEASE
org.springframework:spring-web;5.2.9.RELEASE
org.springframework:spring-webmvc;5.2.9.RELEASE

# spring-boot-starter-parent is not managed by spring-boot-dependencies or spring-cloud-dependencies.
org.springframework.boot:spring-boot-starter-parent;2.3.3.RELEASE

## Spring cloud dependency versions
# After you update spring-cloud-dependencies' version, please run this script: /sdk/spring/scripts/sync_version_from_spring-boot-dependencies.py
org.springframework.cloud:spring-cloud-dependencies;Hoxton.SR7
org.springframework.cloud:spring-cloud-dependencies;Hoxton.SR8
org.springframework.cloud:spring-cloud-bus;2.2.3.RELEASE
org.springframework.cloud:spring-cloud-context;2.2.4.RELEASE
org.springframework.cloud:spring-cloud-starter-stream-kafka;3.0.7.RELEASE
org.springframework.cloud:spring-cloud-stream-binder-test;3.0.7.RELEASE
org.springframework.cloud:spring-cloud-stream;3.0.7.RELEASE
org.springframework.cloud:spring-cloud-context;2.2.5.RELEASE
org.springframework.cloud:spring-cloud-starter-stream-kafka;3.0.8.RELEASE
org.springframework.cloud:spring-cloud-stream-binder-test;3.0.8.RELEASE
org.springframework.cloud:spring-cloud-stream;3.0.8.RELEASE

pl.pragmatists:JUnitParams;1.1.1

Expand All @@ -160,7 +160,7 @@ com.sun.activation:jakarta.activation;1.2.2
io.opentelemetry:opentelemetry-api;0.8.0
io.opentelemetry:opentelemetry-sdk;0.8.0
io.grpc:grpc-context;1.30.2
io.projectreactor:reactor-test;3.3.9.RELEASE
io.projectreactor:reactor-test;3.3.10.RELEASE
junit:junit;4.13.1
commons-cli:commons-cli;1.3
org.apache.maven:maven-compat;3.6.2
Expand Down Expand Up @@ -205,7 +205,7 @@ uk.org.lidalia:slf4j-test;1.2.0
com.azure:sdk-build-tools;1.0.0
com.beust:jcommander;1.78
com.google.code.findbugs:jsr305;3.0.2
com.nimbusds:nimbus-jose-jwt;7.9
com.nimbusds:nimbus-jose-jwt;8.19
com.nimbusds:oauth2-oidc-sdk;7.1.1
com.puppycrawl.tools:checkstyle;8.29
commons-io:commons-io;2.5
Expand Down
2 changes: 1 addition & 1 deletion sdk/appconfiguration/azure-data-appconfiguration/pom.xml
View file
Open in desktop
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.3.9.RELEASE</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
<version>3.3.10.RELEASE</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
Expand Down
10 changes: 5 additions & 5 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,12 +25,12 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>2.3.3.RELEASE</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-web;external_dependency} -->
<version>2.3.4.RELEASE</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.3.3.RELEASE</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-actuator;external_dependency} -->
<version>2.3.4.RELEASE</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-actuator;external_dependency} -->
<optional>true</optional>
<scope>compile</scope>
</dependency>
Expand All @@ -56,7 +56,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<version>2.3.3.RELEASE</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-test;external_dependency} -->
<version>2.3.4.RELEASE</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-test;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -83,8 +83,8 @@
<rules>
<bannedDependencies>
<includes>
<include>org.springframework.boot:spring-boot-starter-actuator:[2.3.3.RELEASE]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-actuator;external_dependency} -->
<include>org.springframework.boot:spring-boot-starter-web:[2.3.3.RELEASE]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-web;external_dependency} -->
<include>org.springframework.boot:spring-boot-starter-actuator:[2.3.4.RELEASE]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-actuator;external_dependency} -->
<include>org.springframework.boot:spring-boot-starter-web:[2.3.4.RELEASE]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-web;external_dependency} -->
<include>org.springframework.cloud:spring-cloud-bus:[2.2.3.RELEASE]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-bus;external_dependency} -->
</includes>
</bannedDependencies>
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,23 +20,23 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-autoconfigure-processor</artifactId>
<version>2.3.3.RELEASE</version> <!-- {x-version-update;org.springframework.boot:spring-boot-autoconfigure-processor;external_dependency} -->
<version>2.3.4.RELEASE</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.3.3.RELEASE</version> <!-- {x-version-update;org.springframework.boot:spring-boot-autoconfigure;external_dependency} -->
<version>2.3.4.RELEASE</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.3.3.RELEASE</version> <!-- {x-version-update;org.springframework.boot:spring-boot-configuration-processor;external_dependency} -->
<version>2.3.4.RELEASE</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-context</artifactId>
<version>2.2.4.RELEASE</version> <!-- {x-version-update;org.springframework.cloud:spring-cloud-context;external_dependency} -->
<version>2.2.5.RELEASE</version> <!-- {x-version-update;org.springframework.cloud:spring-cloud-context;external_dependency} -->
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand All @@ -51,7 +51,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>5.2.8.RELEASE</version> <!-- {x-version-update;org.springframework:spring-web;external_dependency} -->
<version>5.2.9.RELEASE</version> <!-- {x-version-update;org.springframework:spring-web;external_dependency} -->
</dependency>
<!--Azure Java SDK-->
<dependency>
Expand Down Expand Up @@ -97,7 +97,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-actuator-autoconfigure</artifactId>
<version>2.3.3.RELEASE</version> <!-- {x-version-update;org.springframework.boot:spring-boot-actuator-autoconfigure;external_dependency} -->
<version>2.3.4.RELEASE</version> <!-- {x-version-update;org.springframework.boot:spring-boot-actuator-autoconfigure;external_dependency} -->
</dependency>
<dependency>
<groupId>junit</groupId>
Expand All @@ -114,7 +114,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<version>2.3.3.RELEASE</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-test;external_dependency} -->
<version>2.3.4.RELEASE</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-test;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -161,12 +161,12 @@
<include>org.apache.commons:commons-lang3:[3.10]</include> <!-- {x-include-update;org.apache.commons:commons-lang3;external_dependency} -->
<include>org.apache.httpcomponents:httpclient:[4.5.12]</include> <!-- {x-include-update;org.apache.httpcomponents:httpclient;external_dependency} -->
<include>org.hibernate.validator:hibernate-validator:[6.1.5.Final]</include> <!-- {x-include-update;org.hibernate.validator:hibernate-validator;external_dependency} -->
<include>org.springframework.boot:spring-boot-autoconfigure-processor:[2.3.3.RELEASE]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-autoconfigure-processor;external_dependency} -->
<include>org.springframework.boot:spring-boot-autoconfigure:[2.3.3.RELEASE]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-autoconfigure;external_dependency} -->
<include>org.springframework.boot:spring-boot-actuator-autoconfigure:[2.3.3.RELEASE]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-actuator-autoconfigure;external_dependency} -->
<include>org.springframework.boot:spring-boot-configuration-processor:[2.3.3.RELEASE]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-configuration-processor;external_dependency} -->
<include>org.springframework.cloud:spring-cloud-context:[2.2.4.RELEASE]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-context;external_dependency} -->
<include>org.springframework:spring-web:[5.2.8.RELEASE]</include> <!-- {x-include-update;org.springframework:spring-web;external_dependency} -->
<include>org.springframework.boot:spring-boot-autoconfigure-processor:[2.3.4.RELEASE]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-autoconfigure-processor;external_dependency} -->
<include>org.springframework.boot:spring-boot-autoconfigure:[2.3.4.RELEASE]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-autoconfigure;external_dependency} -->
<include>org.springframework.boot:spring-boot-actuator-autoconfigure:[2.3.4.RELEASE]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-actuator-autoconfigure;external_dependency} -->
<include>org.springframework.boot:spring-boot-configuration-processor:[2.3.4.RELEASE]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-configuration-processor;external_dependency} -->
<include>org.springframework.cloud:spring-cloud-context:[2.2.5.RELEASE]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-context;external_dependency} -->
<include>org.springframework:spring-web:[5.2.9.RELEASE]</include> <!-- {x-include-update;org.springframework:spring-web;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
Expand Down
10 changes: 5 additions & 5 deletions 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,18 +19,18 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<version>2.3.3.RELEASE</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-test;external_dependency} -->
<version>2.3.4.RELEASE</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-test;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>5.2.8.RELEASE</version> <!-- {x-version-update;org.springframework:spring-web;external_dependency} -->
<version>5.2.9.RELEASE</version> <!-- {x-version-update;org.springframework:spring-web;external_dependency} -->
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>5.2.8.RELEASE</version> <!-- {x-version-update;org.springframework:spring-webmvc;external_dependency} -->
<version>5.2.9.RELEASE</version> <!-- {x-version-update;org.springframework:spring-webmvc;external_dependency} -->
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Expand Down Expand Up @@ -65,8 +65,8 @@
<includes>
<include>com.azure.spring:azure-spring-cloud-feature-management:[1.2.8-beta.1]</include> <!-- {x-include-update;com.azure.spring:azure-spring-cloud-feature-management;current} -->
<include>javax.servlet:javax.servlet-api:[4.0.1]</include> <!-- {x-include-update;javax.servlet:javax.servlet-api;external_dependency} -->
<include>org.springframework:spring-web:[5.2.8.RELEASE]</include> <!-- {x-include-update;org.springframework:spring-web;external_dependency} -->
<include>org.springframework:spring-webmvc:[5.2.8.RELEASE]</include> <!-- {x-include-update;org.springframework:spring-webmvc;external_dependency} -->
<include>org.springframework:spring-web:[5.2.9.RELEASE]</include> <!-- {x-include-update;org.springframework:spring-web;external_dependency} -->
<include>org.springframework:spring-webmvc:[5.2.9.RELEASE]</include> <!-- {x-include-update;org.springframework:spring-webmvc;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
Expand Down
Loading