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.

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

Update spring-boot's version to 2.4.4. #19968

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
109 changes: 55 additions & 54 deletions eng/versioning/external_dependencies.txt
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ com.squareup.okhttp3:okhttp;4.8.1
com.zaxxer:HikariCP;3.4.5
commons-codec:commons-codec;1.15
commons-net:commons-net;3.6
io.fabric8:kubernetes-client;4.10.3
io.fabric8:kubernetes-client;4.13.2
io.github.bonigarcia:webdrivermanager;4.3.1
io.micrometer:micrometer-core;1.6.4
io.micrometer:micrometer-registry-azure-monitor;1.6.4
io.micrometer:micrometer-registry-graphite;1.6.4
io.micrometer:micrometer-core;1.6.5
io.micrometer:micrometer-registry-azure-monitor;1.6.5
io.micrometer:micrometer-registry-graphite;1.6.5
io.netty:netty-buffer;4.1.60.Final
io.netty:netty-common;4.1.60.Final
io.netty:netty-codec-http;4.1.60.Final
Expand All @@ -58,7 +58,8 @@ io.netty:netty-tcnative-boringssl-static;2.0.36.Final
io.netty:netty-transport-native-epoll;4.1.60.Final
io.netty:netty-transport-native-unix-common;4.1.60.Final
io.netty:netty-transport-native-kqueue;4.1.60.Final
io.projectreactor.netty:reactor-netty;1.0.4
io.projectreactor.netty:reactor-netty;1.0.5
# Not upgrade reactor-core to 3.4.4, reason: https://github.com/reactor/reactor-core/issues/2663
io.projectreactor:reactor-core;3.4.3
io.reactivex:rxjava;1.3.8
javax.annotation:javax.annotation-api;1.3.2
Expand Down Expand Up @@ -91,63 +92,63 @@ 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.18
org.postgresql:postgresql;42.2.19
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
org.springframework.boot:spring-boot-dependencies;2.4.3
org.springframework.boot:spring-boot-actuator-autoconfigure;2.4.3
org.springframework.boot:spring-boot-autoconfigure-processor;2.4.3
org.springframework.boot:spring-boot-autoconfigure;2.4.3
org.springframework.boot:spring-boot-configuration-processor;2.4.3
org.springframework.boot:spring-boot-starter-actuator;2.4.3
org.springframework.boot:spring-boot-starter-aop;2.4.3
org.springframework.boot:spring-boot-starter-cache;2.4.3
org.springframework.boot:spring-boot-starter-data-redis;2.4.3
org.springframework.boot:spring-boot-starter-logging;2.4.3
org.springframework.boot:spring-boot-starter-test;2.4.3
org.springframework.boot:spring-boot-starter-validation;2.4.3
org.springframework.boot:spring-boot-starter-web;2.4.3
org.springframework.boot:spring-boot-starter-webflux;2.4.3
org.springframework.boot:spring-boot-starter;2.4.3
org.springframework.boot:spring-boot;2.4.3
org.springframework.data:spring-data-commons;2.4.5
org.springframework.data:spring-data-mongodb;3.1.5
org.springframework.data:spring-data-redis;2.4.5
org.springframework.integration:spring-integration-core;5.4.4
org.springframework.kafka:spring-kafka;2.6.6
org.springframework.boot:spring-boot-dependencies;2.4.4
org.springframework.boot:spring-boot-actuator-autoconfigure;2.4.4
org.springframework.boot:spring-boot-autoconfigure-processor;2.4.4
org.springframework.boot:spring-boot-autoconfigure;2.4.4
org.springframework.boot:spring-boot-configuration-processor;2.4.4
org.springframework.boot:spring-boot-starter-actuator;2.4.4
org.springframework.boot:spring-boot-starter-aop;2.4.4
org.springframework.boot:spring-boot-starter-cache;2.4.4
org.springframework.boot:spring-boot-starter-data-redis;2.4.4
org.springframework.boot:spring-boot-starter-logging;2.4.4
org.springframework.boot:spring-boot-starter-test;2.4.4
org.springframework.boot:spring-boot-starter-validation;2.4.4
org.springframework.boot:spring-boot-starter-web;2.4.4
org.springframework.boot:spring-boot-starter-webflux;2.4.4
org.springframework.boot:spring-boot-starter;2.4.4
org.springframework.boot:spring-boot;2.4.4
org.springframework.data:spring-data-commons;2.4.6
org.springframework.data:spring-data-mongodb;3.1.6
org.springframework.data:spring-data-redis;2.4.6
org.springframework.integration:spring-integration-core;5.4.5
org.springframework.kafka:spring-kafka;2.6.7
org.springframework.security:spring-security-config;5.4.5
org.springframework.security:spring-security-core;5.4.5
org.springframework.security:spring-security-oauth2-client;5.4.5
org.springframework.security:spring-security-oauth2-resource-server;5.4.5
org.springframework.security:spring-security-oauth2-core;5.4.5
org.springframework.security:spring-security-oauth2-jose;5.4.5
org.springframework.security:spring-security-web;5.4.5
org.springframework:spring-beans;5.3.4
org.springframework:spring-context-support;5.3.4
org.springframework:spring-context;5.3.4
org.springframework:spring-core;5.3.4
org.springframework:spring-expression;5.3.4
org.springframework:spring-jdbc;5.3.4
org.springframework:spring-jms;5.3.4
org.springframework:spring-messaging;5.3.4
org.springframework:spring-tx;5.3.4
org.springframework:spring-web;5.3.4
org.springframework:spring-webmvc;5.3.4
org.springframework:spring-webflux;5.3.4
org.springframework:spring-beans;5.3.5
org.springframework:spring-context-support;5.3.5
org.springframework:spring-context;5.3.5
org.springframework:spring-core;5.3.5
org.springframework:spring-expression;5.3.5
org.springframework:spring-jdbc;5.3.5
org.springframework:spring-jms;5.3.5
org.springframework:spring-messaging;5.3.5
org.springframework:spring-tx;5.3.5
org.springframework:spring-web;5.3.5
org.springframework:spring-webmvc;5.3.5
org.springframework:spring-webflux;5.3.5

org.springframework.boot:spring-boot-starter-parent;2.4.3
org.springframework.boot:spring-boot-starter-parent;2.4.4

## Spring cloud dependency versions
org.springframework.cloud:spring-cloud-dependencies;2020.0.1
org.springframework.cloud:spring-cloud-starter-bootstrap;3.0.1
org.springframework.cloud:spring-cloud-bus;3.0.1
org.springframework.cloud:spring-cloud-context;3.0.1
org.springframework.cloud:spring-cloud-starter-stream-kafka;3.1.1
org.springframework.cloud:spring-cloud-stream-binder-test;3.1.1
org.springframework.cloud:spring-cloud-stream;3.1.1
org.springframework.cloud:spring-cloud-dependencies;2020.0.2
org.springframework.cloud:spring-cloud-starter-bootstrap;3.0.2
org.springframework.cloud:spring-cloud-bus;3.0.2
org.springframework.cloud:spring-cloud-context;3.0.2
org.springframework.cloud:spring-cloud-starter-stream-kafka;3.1.2
org.springframework.cloud:spring-cloud-stream-binder-test;3.1.2
org.springframework.cloud:spring-cloud-stream;3.1.2

pl.pragmatists:JUnitParams;1.1.1

Expand Down Expand Up @@ -175,7 +176,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.3
io.projectreactor:reactor-test;3.4.4
junit:junit;4.13.2
commons-cli:commons-cli;1.3
org.apache.maven:maven-compat;3.6.2
Expand All @@ -186,8 +187,8 @@ org.assertj:assertj-core;3.18.1
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.36.v20210114
org.eclipse.jetty:jetty-server;9.4.36.v20210114
org.eclipse.jetty:jetty-http;9.4.38.v20210224
org.eclipse.jetty:jetty-server;9.4.38.v20210224
org.eclipse.jgit:org.eclipse.jgit;4.5.7.201904151645-r
org.hamcrest:hamcrest-all;1.3
org.hamcrest:hamcrest-library;2.2
Expand Down Expand Up @@ -216,13 +217,13 @@ 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;8.20.2
com.nimbusds:oauth2-oidc-sdk;8.36
com.nimbusds:oauth2-oidc-sdk;8.36.1
com.puppycrawl.tools:checkstyle;8.40
commons-io:commons-io;2.5
commons-validator:commons-validator;1.6
io.dropwizard.metrics:metrics-core;4.1.17
io.dropwizard.metrics:metrics-graphite;4.1.17
io.dropwizard.metrics:metrics-jvm;4.1.17
io.dropwizard.metrics:metrics-core;4.1.18
io.dropwizard.metrics:metrics-graphite;4.1.18
io.dropwizard.metrics:metrics-jvm;4.1.18
io.reactivex.rxjava2:rxjava;2.2.21
net.java.dev.jna:jna-platform;5.6.0
net.jonathangiles.tools:dependencyChecker-maven-plugin;1.0.5
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.3</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
<version>3.4.4</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 @@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.4.3</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-parent;external_dependency} -->
<version>2.4.4</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-parent;external_dependency} -->
<relativePath/> <!-- lookup parent from repository -->
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,19 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>2.4.3</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-web;external_dependency} -->
<version>2.4.4</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.4.3</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-actuator;external_dependency} -->
<version>2.4.4</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-actuator;external_dependency} -->
<optional>true</optional>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-bus</artifactId>
<version>3.0.1</version> <!-- {x-version-update;org.springframework.cloud:spring-cloud-bus;external_dependency} -->
<version>3.0.2</version> <!-- {x-version-update;org.springframework.cloud:spring-cloud-bus;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.4.3</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-test;external_dependency} -->
<version>2.4.4</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-test;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -83,10 +83,10 @@
<rules>
<bannedDependencies>
<includes>
<include>org.springframework.boot:spring-boot-starter-actuator:[2.4.3]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-actuator;external_dependency} -->
<include>org.springframework.boot:spring-boot-starter-actuator:[2.4.4]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-actuator;external_dependency} -->
<include>com.microsoft.azure:spring-cloud-azure-appconfiguration-config:[1.3.0-beta.1]</include> <!-- {x-include-update;com.microsoft.azure:spring-cloud-azure-appconfiguration-config;current} -->
<include>org.springframework.boot:spring-boot-starter-web:[2.4.3]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-web;external_dependency} -->
<include>org.springframework.cloud:spring-cloud-bus:[3.0.1]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-bus;external_dependency} -->
<include>org.springframework.boot:spring-boot-starter-web:[2.4.4]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-web;external_dependency} -->
<include>org.springframework.cloud:spring-cloud-bus:[3.0.2]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-bus;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
Expand Down
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.4.3</version> <!-- {x-version-update;org.springframework.boot:spring-boot-autoconfigure-processor;external_dependency} -->
<version>2.4.4</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.4.3</version> <!-- {x-version-update;org.springframework.boot:spring-boot-autoconfigure;external_dependency} -->
<version>2.4.4</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.4.3</version> <!-- {x-version-update;org.springframework.boot:spring-boot-configuration-processor;external_dependency} -->
<version>2.4.4</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>3.0.1</version> <!-- {x-version-update;org.springframework.cloud:spring-cloud-context;external_dependency} -->
<version>3.0.2</version> <!-- {x-version-update;org.springframework.cloud:spring-cloud-context;external_dependency} -->
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-bootstrap</artifactId>
<version>3.0.1</version> <!-- {x-version-update;org.springframework.cloud:spring-cloud-starter-bootstrap;external_dependency} -->
<version>3.0.2</version> <!-- {x-version-update;org.springframework.cloud:spring-cloud-starter-bootstrap;external_dependency} -->
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand All @@ -56,7 +56,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>5.3.4</version> <!-- {x-version-update;org.springframework:spring-web;external_dependency} -->
<version>5.3.5</version> <!-- {x-version-update;org.springframework:spring-web;external_dependency} -->
</dependency>
<!--Azure Java SDK-->
<dependency>
Expand Down Expand Up @@ -92,7 +92,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-actuator-autoconfigure</artifactId>
<version>2.4.3</version> <!-- {x-version-update;org.springframework.boot:spring-boot-actuator-autoconfigure;external_dependency} -->
<version>2.4.4</version> <!-- {x-version-update;org.springframework.boot:spring-boot-actuator-autoconfigure;external_dependency} -->
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
Expand All @@ -119,7 +119,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<version>2.4.3</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-test;external_dependency} -->
<version>2.4.4</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-test;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -166,13 +166,13 @@
<include>org.apache.commons:commons-lang3:[3.11]</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.1.7.Final]</include> <!-- {x-include-update;org.hibernate.validator:hibernate-validator;external_dependency} -->
<include>org.springframework.boot:spring-boot-autoconfigure-processor:[2.4.3]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-autoconfigure-processor;external_dependency} -->
<include>org.springframework.boot:spring-boot-autoconfigure:[2.4.3]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-autoconfigure;external_dependency} -->
<include>org.springframework.boot:spring-boot-actuator-autoconfigure:[2.4.3]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-actuator-autoconfigure;external_dependency} -->
<include>org.springframework.boot:spring-boot-configuration-processor:[2.4.3]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-configuration-processor;external_dependency} -->
<include>org.springframework.cloud:spring-cloud-context:[3.0.1]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-context;external_dependency} -->
<include>org.springframework.cloud:spring-cloud-starter-bootstrap:[3.0.1]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-starter-bootstrap;external_dependency} -->
<include>org.springframework:spring-web:[5.3.4]</include> <!-- {x-include-update;org.springframework:spring-web;external_dependency} -->
<include>org.springframework.boot:spring-boot-autoconfigure-processor:[2.4.4]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-autoconfigure-processor;external_dependency} -->
<include>org.springframework.boot:spring-boot-autoconfigure:[2.4.4]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-autoconfigure;external_dependency} -->
<include>org.springframework.boot:spring-boot-actuator-autoconfigure:[2.4.4]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-actuator-autoconfigure;external_dependency} -->
<include>org.springframework.boot:spring-boot-configuration-processor:[2.4.4]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-configuration-processor;external_dependency} -->
<include>org.springframework.cloud:spring-cloud-context:[3.0.2]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-context;external_dependency} -->
<include>org.springframework.cloud:spring-cloud-starter-bootstrap:[3.0.2]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-starter-bootstrap;external_dependency} -->
<include>org.springframework:spring-web:[5.3.5]</include> <!-- {x-include-update;org.springframework:spring-web;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
Expand Down
Loading