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

Upgrade spring boot to 2.4.5 #20721

Merged
merged 11 commits into from
Apr 23, 2021
Merged

Upgrade spring boot to 2.4.5 #20721

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e1383e0
1. Update ROOT_POMS' version manually.
rujche Apr 16, 2021
b71e46c
2. Run command "python .\sdk\spring\scripts\update_spring_managed_ext…
rujche Apr 16, 2021
ff4b9a1
3. Run command "python .\eng\versioning\update_versions.py --ut exter…
rujche Apr 16, 2021
2d02fe2
4. Fix errors reported by command ".\eng\versioning\pom_file_version_…
rujche Apr 16, 2021
4c88487
Delete 'cosmos_org.mockito:mockito-core;1.10.19', use 'org.mockito:mo…
rujche Apr 19, 2021
55d83e6
Merge branch 'master' into upgrade-spring-boot-to-2.4.5
Apr 19, 2021
5b6d478
Fix compile error after upgrading mockito-core to 3.6.28.
rujche Apr 19, 2021
97c468b
Updated mockito API names
kushagraThapar Apr 19, 2021
6349852
Updated mockito API names again because of some local mess up
kushagraThapar Apr 19, 2021
90e4751
Fixed mockito failing test cases
kushagraThapar Apr 19, 2021
3dd9e2d
Merge branch 'master' into upgrade-spring-boot-to-2.4.5
Apr 23, 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
4 changes: 2 additions & 2 deletions common/perf-test-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
<!-- 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.3]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
<include>io.projectreactor:reactor-core:[3.4.5]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
Expand Down Expand Up @@ -130,7 +130,7 @@
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-core</artifactId>
<version>3.4.3</version> <!-- {x-version-update;io.projectreactor:reactor-core;external_dependency} -->
<version>3.4.5</version> <!-- {x-version-update;io.projectreactor:reactor-core;external_dependency} -->
</dependency>
</dependencies>
</project>
149 changes: 74 additions & 75 deletions eng/versioning/external_dependencies.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,25 +41,25 @@ 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.netty:netty-buffer;4.1.60.Final
io.netty:netty-common;4.1.60.Final
io.netty:netty-codec-http;4.1.60.Final
io.netty:netty-codec-http2;4.1.60.Final
io.netty:netty-transport;4.1.60.Final
io.netty:netty-handler;4.1.60.Final
io.netty:netty-handler-proxy;4.1.60.Final
io.netty:netty-tcnative;2.0.36.Final
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:reactor-core;3.4.3
io.micrometer:micrometer-core;1.6.6
io.micrometer:micrometer-registry-azure-monitor;1.6.6
io.micrometer:micrometer-registry-graphite;1.6.6
io.netty:netty-buffer;4.1.63.Final
io.netty:netty-common;4.1.63.Final
io.netty:netty-codec-http;4.1.63.Final
io.netty:netty-codec-http2;4.1.63.Final
io.netty:netty-transport;4.1.63.Final
io.netty:netty-handler;4.1.63.Final
io.netty:netty-handler-proxy;4.1.63.Final
io.netty:netty-tcnative;2.0.38.Final
io.netty:netty-tcnative-boringssl-static;2.0.38.Final
io.netty:netty-transport-native-epoll;4.1.63.Final
io.netty:netty-transport-native-unix-common;4.1.63.Final
io.netty:netty-transport-native-kqueue;4.1.63.Final
io.projectreactor.netty:reactor-netty;1.0.6
io.projectreactor:reactor-core;3.4.5
io.reactivex:rxjava;1.3.8
javax.annotation:javax.annotation-api;1.3.2
javax.json:javax.json-api;1.1.4
Expand Down Expand Up @@ -91,63 +91,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.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.boot:spring-boot-dependencies;2.4.5
org.springframework.boot:spring-boot-actuator-autoconfigure;2.4.5
org.springframework.boot:spring-boot-autoconfigure-processor;2.4.5
org.springframework.boot:spring-boot-autoconfigure;2.4.5
org.springframework.boot:spring-boot-configuration-processor;2.4.5
org.springframework.boot:spring-boot-starter-actuator;2.4.5
org.springframework.boot:spring-boot-starter-aop;2.4.5
org.springframework.boot:spring-boot-starter-cache;2.4.5
org.springframework.boot:spring-boot-starter-data-redis;2.4.5
org.springframework.boot:spring-boot-starter-logging;2.4.5
org.springframework.boot:spring-boot-starter-test;2.4.5
org.springframework.boot:spring-boot-starter-validation;2.4.5
org.springframework.boot:spring-boot-starter-web;2.4.5
org.springframework.boot:spring-boot-starter-webflux;2.4.5
org.springframework.boot:spring-boot-starter;2.4.5
org.springframework.boot:spring-boot;2.4.5
org.springframework.data:spring-data-commons;2.4.8
org.springframework.data:spring-data-mongodb;3.1.8
org.springframework.data:spring-data-redis;2.4.8
org.springframework.integration:spring-integration-core;5.4.6
org.springframework.kafka:spring-kafka;2.6.7
org.springframework.security:spring-security-config;5.4.6
org.springframework.security:spring-security-core;5.4.6
org.springframework.security:spring-security-oauth2-client;5.4.6
org.springframework.security:spring-security-oauth2-resource-server;5.4.6
org.springframework.security:spring-security-oauth2-core;5.4.6
org.springframework.security:spring-security-oauth2-jose;5.4.6
org.springframework.security:spring-security-web;5.4.6
org.springframework:spring-beans;5.3.6
org.springframework:spring-context-support;5.3.6
org.springframework:spring-context;5.3.6
org.springframework:spring-core;5.3.6
org.springframework:spring-expression;5.3.6
org.springframework:spring-jdbc;5.3.6
org.springframework:spring-jms;5.3.6
org.springframework:spring-messaging;5.3.6
org.springframework:spring-tx;5.3.6
org.springframework:spring-web;5.3.6
org.springframework:spring-webmvc;5.3.6
org.springframework:spring-webflux;5.3.6

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

## 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 +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.3
io.projectreactor:reactor-test;3.4.5
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.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.39.v20210325
org.eclipse.jetty:jetty-server;9.4.39.v20210325
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 +216,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.19
io.dropwizard.metrics:metrics-graphite;4.1.19
io.dropwizard.metrics:metrics-jvm;4.1.19
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 Expand Up @@ -288,7 +288,6 @@ cosmos_com.microsoft.data.encryption:azure-key-vault-keystoreprovider;0.1.0.jre8
cosmos_io.dropwizard.metrics:metrics-core;4.1.0
cosmos_io.dropwizard.metrics:metrics-graphite;4.1.0
cosmos_io.dropwizard.metrics:metrics-jvm;4.1.0
cosmos_org.mockito:mockito-core;1.10.19
cosmos_org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir;1.1.0
cosmos_org.hdrhistogram:HdrHistogram;2.1.12

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.4.3</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
<version>3.4.5</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion sdk/appconfiguration/azure-spring-cloud-test-appconfiguration-config/pom.xml
View file
Open in desktop
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.5</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-parent;external_dependency} -->
<relativePath/> <!-- lookup parent from repository -->
</parent>

Expand Down
14 changes: 7 additions & 7 deletions sdk/appconfiguration/spring-cloud-azure-appconfiguration-config-web/pom.xml
View file
Open in desktop
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.5</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.5</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.5</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.5]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-actuator;external_dependency} -->
<include>com.microsoft.azure:spring-cloud-azure-appconfiguration-config:[1.4.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.5]</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
Loading