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.3 and Spring Cloud 2021.0.3 #30594

Merged
merged 1 commit into from Aug 25, 2022
Merged

External dependencies upgrade - Spring Boot 2.7.3 and Spring Cloud 2021.0.3 #30594

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 common/perf-test-core/pom.xml
View file
Open in desktop
Expand Up @@ -51,7 +51,7 @@
<!-- Special allowance for performance libraries as they aren't shipped. -->
<include>com.beust:jcommander:[1.78]</include> <!-- {x-include-update;com.beust:jcommander;external_dependency} -->

<include>io.projectreactor:reactor-core:[3.4.21]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
<include>io.projectreactor:reactor-core:[3.4.22]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
Expand Down
88 changes: 44 additions & 44 deletions eng/versioning/external_dependencies.txt
View file
Open in desktop
@@ -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.2_managed_external_dependencies.txt
# If your version is different from sdk/spring/scripts/spring_boot_2.7.2_managed_external_dependencies.txt,
# make sure the version is same to sdk/spring/scripts/spring_boot_2.7.3_managed_external_dependencies.txt
# If your version is different from sdk/spring/scripts/spring_boot_2.7.3_managed_external_dependencies.txt,
# please discuss with Spring Integration team members:
# @chenrujun (rujche), @saragluna (xiada), @yiliuTo (yiliu6), @backwind1233 (zhihaoguo).
# Thanks.
Expand All @@ -20,7 +20,7 @@ com.fasterxml.jackson.module:jackson-module-scala_2.12;2.13.3
com.github.spotbugs:spotbugs;4.2.2
com.github.spotbugs:spotbugs-annotations;4.2.2
com.github.spotbugs:spotbugs-maven-plugin;4.2.2
com.google.code.gson:gson;2.9.0
com.google.code.gson:gson;2.9.1
com.google.guava:guava;30.1.1-jre
com.h3xstream.findsecbugs:findsecbugs-plugin;1.9.0
com.microsoft.azure:azure-annotations;1.7.0
Expand Down Expand Up @@ -48,9 +48,9 @@ io.cloudevents:cloudevents-api;2.2.0
io.cloudevents:cloudevents-core;2.2.0
io.fabric8:kubernetes-client;5.10.2
io.github.bonigarcia:webdrivermanager;4.3.1
io.micrometer:micrometer-core;1.9.2
io.micrometer:micrometer-registry-azure-monitor;1.9.2
io.micrometer:micrometer-registry-graphite;1.9.2
io.micrometer:micrometer-core;1.9.3
io.micrometer:micrometer-registry-azure-monitor;1.9.3
io.micrometer:micrometer-registry-graphite;1.9.3
io.netty:netty-buffer;4.1.79.Final
io.netty:netty-common;4.1.79.Final
io.netty:netty-codec-http;4.1.79.Final
Expand All @@ -63,9 +63,9 @@ io.netty:netty-tcnative-boringssl-static;2.0.53.Final
io.netty:netty-transport-native-epoll;4.1.79.Final
io.netty:netty-transport-native-unix-common;4.1.79.Final
io.netty:netty-transport-native-kqueue;4.1.79.Final
io.projectreactor.netty:reactor-netty;1.0.21
io.projectreactor.netty:reactor-netty-http;1.0.21
io.projectreactor:reactor-core;3.4.21
io.projectreactor.netty:reactor-netty;1.0.22
io.projectreactor.netty:reactor-netty-http;1.0.22
io.projectreactor:reactor-core;3.4.22
io.reactivex:rxjava;1.3.8
io.vertx:vertx-codegen;4.2.7
io.vertx:vertx-core;4.2.7
Expand All @@ -76,7 +76,7 @@ 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.29
mysql:mysql-connector-java;8.0.30
org.apache.ant:ant;1.9.4
org.apache.avro:avro;1.11.0
org.apache.avro:avro-maven-plugin;1.11.0
Expand All @@ -97,11 +97,11 @@ org.asynchttpclient:async-http-client;2.12.1
org.codehaus.gmavenplus:gmavenplus-plugin;1.13.1
org.codehaus.groovy:groovy-eclipse-batch;2.5.8-01
org.codehaus.groovy:groovy-eclipse-compiler;3.4.0-01
org.codehaus.groovy:groovy-jsr223;3.0.11
org.codehaus.groovy:groovy-jsr223;3.0.12
org.codehaus.janino:janino;3.1.7
org.conscrypt:conscrypt-openjdk-uber;2.2.1
org.glassfish.tyrus:tyrus-client;1.16
org.hibernate.validator:hibernate-validator;6.2.3.Final
org.hibernate.validator:hibernate-validator;6.2.4.Final
org.javatuples:javatuples;1.2
org.linguafranca.pwdb:KeePassJava2;2.1.4
org.graalvm.buildtools:junit-platform-native;0.9.10
Expand All @@ -118,41 +118,41 @@ org.slf4j:slf4j-simple;1.7.36
redis.clients:jedis;4.2.3
io.lettuce:lettuce-core;6.2.0.RELEASE
org.redisson:redisson;3.17.0
net.bytebuddy:byte-buddy;1.12.9
net.bytebuddy:byte-buddy;1.12.13

## Spring boot dependency versions
org.springframework.boot:spring-boot-dependencies;2.7.2
org.springframework.boot:spring-boot-actuator;2.7.2
org.springframework.boot:spring-boot-actuator-autoconfigure;2.7.2
org.springframework.boot:spring-boot-autoconfigure-processor;2.7.2
org.springframework.boot:spring-boot-autoconfigure;2.7.2
org.springframework.boot:spring-boot-configuration-metadata;2.7.2
org.springframework.boot:spring-boot-configuration-processor;2.7.2
org.springframework.boot:spring-boot-starter-actuator;2.7.2
org.springframework.boot:spring-boot-starter-aop;2.7.2
org.springframework.boot:spring-boot-starter-cache;2.7.2
org.springframework.boot:spring-boot-starter-data-redis;2.7.2
org.springframework.boot:spring-boot-starter-integration;2.7.2
org.springframework.boot:spring-boot-starter-logging;2.7.2
org.springframework.boot:spring-boot-starter-test;2.7.2
org.springframework.boot:spring-boot-starter-validation;2.7.2
org.springframework.boot:spring-boot-starter-web;2.7.2
org.springframework.boot:spring-boot-starter;2.7.2
org.springframework.boot:spring-boot-test;2.7.2
org.springframework.boot:spring-boot;2.7.2
org.springframework.boot:spring-boot-dependencies;2.7.3
org.springframework.boot:spring-boot-actuator;2.7.3
org.springframework.boot:spring-boot-actuator-autoconfigure;2.7.3
org.springframework.boot:spring-boot-autoconfigure-processor;2.7.3
org.springframework.boot:spring-boot-autoconfigure;2.7.3
org.springframework.boot:spring-boot-configuration-metadata;2.7.3
org.springframework.boot:spring-boot-configuration-processor;2.7.3
org.springframework.boot:spring-boot-starter-actuator;2.7.3
org.springframework.boot:spring-boot-starter-aop;2.7.3
org.springframework.boot:spring-boot-starter-cache;2.7.3
org.springframework.boot:spring-boot-starter-data-redis;2.7.3
org.springframework.boot:spring-boot-starter-integration;2.7.3
org.springframework.boot:spring-boot-starter-logging;2.7.3
org.springframework.boot:spring-boot-starter-test;2.7.3
org.springframework.boot:spring-boot-starter-validation;2.7.3
org.springframework.boot:spring-boot-starter-web;2.7.3
org.springframework.boot:spring-boot-starter;2.7.3
org.springframework.boot:spring-boot-test;2.7.3
org.springframework.boot:spring-boot;2.7.3
org.springframework.data:spring-data-commons;2.7.2
org.springframework.data:spring-data-mongodb;3.4.2
org.springframework.data:spring-data-redis;2.7.2
org.springframework.experimental:spring-aot;0.11.4
org.springframework.integration:spring-integration-core;5.5.14
org.springframework.kafka:spring-kafka;2.8.8
org.springframework.security:spring-security-config;5.7.2
org.springframework.security:spring-security-core;5.7.2
org.springframework.security:spring-security-oauth2-client;5.7.2
org.springframework.security:spring-security-oauth2-resource-server;5.7.2
org.springframework.security:spring-security-oauth2-core;5.7.2
org.springframework.security:spring-security-oauth2-jose;5.7.2
org.springframework.security:spring-security-web;5.7.2
org.springframework.security:spring-security-config;5.7.3
org.springframework.security:spring-security-core;5.7.3
org.springframework.security:spring-security-oauth2-client;5.7.3
org.springframework.security:spring-security-oauth2-resource-server;5.7.3
org.springframework.security:spring-security-oauth2-core;5.7.3
org.springframework.security:spring-security-oauth2-jose;5.7.3
org.springframework.security:spring-security-web;5.7.3
org.springframework:spring-beans;5.3.22
org.springframework:spring-context-support;5.3.22
org.springframework:spring-context;5.3.22
Expand All @@ -166,7 +166,7 @@ org.springframework:spring-web;5.3.22
org.springframework:spring-webmvc;5.3.22
org.springframework:spring-test;5.3.22
org.springframework.retry:spring-retry;1.3.3
org.springframework.boot:spring-boot-starter-parent;2.7.2
org.springframework.boot:spring-boot-starter-parent;2.7.3

## Spring cloud dependency versions
org.springframework.cloud:spring-cloud-dependencies;2021.0.3
Expand Down Expand Up @@ -209,7 +209,7 @@ io.opentelemetry:opentelemetry-exporter-jaeger;1.14.0
io.opentelemetry:opentelemetry-exporter-otlp;1.14.0
io.opentelemetry:opentelemetry-sdk-testing;1.14.0
io.opentelemetry:opentelemetry-sdk-extension-autoconfigure;1.14.0-alpha
io.projectreactor:reactor-test;3.4.21
io.projectreactor:reactor-test;3.4.22
junit:junit;4.13.2
commons-cli:commons-cli;1.3
org.apache.maven:maven-compat;3.6.2
Expand Down Expand Up @@ -261,9 +261,9 @@ com.nimbusds:nimbus-jose-jwt;9.22
com.puppycrawl.tools:checkstyle;9.2
commons-io:commons-io;2.11.0
commons-validator:commons-validator;1.6
io.dropwizard.metrics:metrics-core;4.2.10
io.dropwizard.metrics:metrics-graphite;4.2.10
io.dropwizard.metrics:metrics-jvm;4.2.10
io.dropwizard.metrics:metrics-core;4.2.11
io.dropwizard.metrics:metrics-graphite;4.2.11
io.dropwizard.metrics:metrics-jvm;4.2.11
io.reactivex.rxjava2:rxjava;2.2.21
net.java.dev.jna:jna-platform;5.6.0
net.oneandone.reflections8:reflections8;0.11.7
Expand Down
2 changes: 1 addition & 1 deletion sdk/appconfiguration/azure-data-appconfiguration/pom.xml
View file
Open in desktop
Expand Up @@ -93,7 +93,7 @@
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-test</artifactId>
<version>3.4.21</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
<version>3.4.22</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
Expand Up @@ -31,12 +31,12 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>2.7.2</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-web;external_dependency} -->
<version>2.7.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.7.2</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-actuator;external_dependency} -->
<version>2.7.3</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-actuator;external_dependency} -->
<optional>true</optional>
</dependency>
<dependency>
Expand Down Expand Up @@ -72,7 +72,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<version>2.7.2</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-test;external_dependency} -->
<version>2.7.3</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-test;external_dependency} -->
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -87,8 +87,8 @@
<rules>
<bannedDependencies>
<includes>
<include>org.springframework.boot:spring-boot-starter-actuator:[2.7.2]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-actuator;external_dependency} -->
<include>org.springframework.boot:spring-boot-starter-web:[2.7.2]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-web;external_dependency} -->
<include>org.springframework.boot:spring-boot-starter-actuator:[2.7.3]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-actuator;external_dependency} -->
<include>org.springframework.boot:spring-boot-starter-web:[2.7.3]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-web;external_dependency} -->
<include>org.springframework.cloud:spring-cloud-bus:[3.1.2]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-bus;external_dependency} -->
</includes>
</bannedDependencies>
Expand Down
22 changes: 11 additions & 11 deletions sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/pom.xml
View file
Open in desktop
Expand Up @@ -26,17 +26,17 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-autoconfigure-processor</artifactId>
<version>2.7.2</version> <!-- {x-version-update;org.springframework.boot:spring-boot-autoconfigure-processor;external_dependency} -->
<version>2.7.3</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.7.2</version> <!-- {x-version-update;org.springframework.boot:spring-boot-autoconfigure;external_dependency} -->
<version>2.7.3</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.7.2</version> <!-- {x-version-update;org.springframework.boot:spring-boot-configuration-processor;external_dependency} -->
<version>2.7.3</version> <!-- {x-version-update;org.springframework.boot:spring-boot-configuration-processor;external_dependency} -->
<optional>true</optional>
</dependency>
<dependency>
Expand Down Expand Up @@ -88,19 +88,19 @@
<dependency>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
<version>6.2.3.Final</version> <!-- {x-version-update;org.hibernate.validator:hibernate-validator;external_dependency} -->
<version>6.2.4.Final</version> <!-- {x-version-update;org.hibernate.validator:hibernate-validator;external_dependency} -->
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-actuator-autoconfigure</artifactId>
<version>2.7.2</version> <!-- {x-version-update;org.springframework.boot:spring-boot-actuator-autoconfigure;external_dependency} -->
<version>2.7.3</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.7.2</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-test;external_dependency} -->
<version>2.7.3</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-test;external_dependency} -->
<scope>test</scope>
</dependency>

Expand Down Expand Up @@ -137,11 +137,11 @@
<include>javax.annotation:javax.annotation-api:[1.3.2]</include> <!-- {x-include-update;javax.annotation:javax.annotation-api;external_dependency} -->
<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.3.Final]</include> <!-- {x-include-update;org.hibernate.validator:hibernate-validator;external_dependency} -->
<include>org.springframework.boot:spring-boot-autoconfigure-processor:[2.7.2]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-autoconfigure-processor;external_dependency} -->
<include>org.springframework.boot:spring-boot-autoconfigure:[2.7.2]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-autoconfigure;external_dependency} -->
<include>org.springframework.boot:spring-boot-actuator-autoconfigure:[2.7.2]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-actuator-autoconfigure;external_dependency} -->
<include>org.springframework.boot:spring-boot-configuration-processor:[2.7.2]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-configuration-processor;external_dependency} -->
<include>org.hibernate.validator:hibernate-validator:[6.2.4.Final]</include> <!-- {x-include-update;org.hibernate.validator:hibernate-validator;external_dependency} -->
<include>org.springframework.boot:spring-boot-autoconfigure-processor:[2.7.3]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-autoconfigure-processor;external_dependency} -->
<include>org.springframework.boot:spring-boot-autoconfigure:[2.7.3]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-autoconfigure;external_dependency} -->
<include>org.springframework.boot:spring-boot-actuator-autoconfigure:[2.7.3]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-actuator-autoconfigure;external_dependency} -->
<include>org.springframework.boot:spring-boot-configuration-processor:[2.7.3]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-configuration-processor;external_dependency} -->
<include>org.springframework.cloud:spring-cloud-context:[3.1.3]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-context;external_dependency} -->
<include>org.springframework.cloud:spring-cloud-starter-bootstrap:[3.1.3]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-starter-bootstrap;external_dependency} -->
<include>org.springframework:spring-web:[5.3.22]</include> <!-- {x-include-update;org.springframework:spring-web;external_dependency} -->
Expand Down
2 changes: 1 addition & 1 deletion sdk/appconfiguration/azure-spring-cloud-feature-management-web/pom.xml
View file
Open in desktop
Expand Up @@ -23,7 +23,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<version>2.7.2</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-test;external_dependency} -->
<version>2.7.3</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-test;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
Expand Down