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

[For Test] Upgrade 'spring-boot-starter-parent' to 2.5.0-RC1. #20010

Closed
wants to merge 11 commits into from
Closed

[For Test] Upgrade 'spring-boot-starter-parent' to 2.5.0-RC1. #20010

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
b2d02d6
Update pom.py to support Spring milestone repo.
rujche Apr 23, 2021
5e12330
1. Update ROOT_POMS' version manually.
rujche Apr 23, 2021
d355e8d
2. Run command "python .\sdk\spring\scripts\update_spring_managed_ext…
rujche Apr 23, 2021
7ef13c7
3. Run command "python .\eng\versioning\update_versions.py --ut exter…
rujche Apr 23, 2021
b3ce191
4. Fix errors reported by command ".\eng\versioning\pom_file_version_…
rujche Apr 23, 2021
a8e9bb1
Add Spring Milestone Repository.
rujche Apr 23, 2021
7dc5d10
Fix pipeline failure.
rujche Apr 25, 2021
c18cf0f
Fix pipeline failure.
rujche Apr 25, 2021
b90e13d
Fix pipeline failure.
rujche Apr 25, 2021
5d86bff
Fix pipeline failure.
rujche Apr 25, 2021
19d7648
Fix pipeline failure.
rujche Apr 25, 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 @@ -51,7 +51,7 @@
<rules>
<bannedDependencies>
<includes>
<include>com.fasterxml.jackson.core:jackson-databind:[2.12.2]</include> <!-- {x-include-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
<include>com.fasterxml.jackson.core:jackson-databind:[2.12.3]</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} -->
Expand Down Expand Up @@ -120,7 +120,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.12.2</version> <!-- {x-version-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
<version>2.12.3</version> <!-- {x-version-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
</dependency>
<dependency>
<groupId>com.beust</groupId>
Expand Down
105 changes: 53 additions & 52 deletions eng/versioning/external_dependencies.txt
View file
Open in desktop
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.2
com.fasterxml.jackson.core:jackson-core;2.12.2
com.fasterxml.jackson.core:jackson-databind;2.12.2
com.fasterxml.jackson.dataformat:jackson-dataformat-avro;2.12.2
com.fasterxml.jackson.dataformat:jackson-dataformat-xml;2.12.2
com.fasterxml.jackson.datatype:jackson-datatype-jdk8;2.12.2
com.fasterxml.jackson.datatype:jackson-datatype-jsr310;2.12.2
com.fasterxml.jackson.module:jackson-module-parameter-names;2.12.2
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.github.spotbugs:spotbugs;4.2.0
com.github.spotbugs:spotbugs-annotations;4.2.0
com.github.spotbugs:spotbugs-maven-plugin;4.2.0
Expand All @@ -34,18 +34,18 @@ com.microsoft.azure:azure-servicebus-jms;0.0.7
com.microsoft.azure:qpid-proton-j-extensions;1.2.3
com.microsoft.rest:client-runtime;1.7.4
com.microsoft.rest.v2:client-runtime;2.1.1
com.microsoft.sqlserver:mssql-jdbc;8.4.1.jre8
com.microsoft.sqlserver:mssql-jdbc;9.2.1.jre8
com.microsoft.azure:spring-data-cosmosdb;2.3.0
com.microsoft.spring.data.gremlin:spring-data-gremlin;2.3.0
com.squareup.okhttp3:okhttp;4.8.1
com.zaxxer:HikariCP;3.4.5
com.zaxxer:HikariCP;4.0.3
commons-codec:commons-codec;1.15
commons-net:commons-net;3.6
io.fabric8:kubernetes-client;4.13.2
io.github.bonigarcia:webdrivermanager;4.3.1
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.micrometer:micrometer-core;1.7.0-RC1
io.micrometer:micrometer-registry-azure-monitor;1.7.0-RC1
io.micrometer:micrometer-registry-graphite;1.7.0-RC1
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
Expand All @@ -67,16 +67,16 @@ 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.23
net.minidev:json-smart;2.3
net.minidev:json-smart;2.4.2
org.apache.ant:ant;1.9.4
org.apache.avro:avro;1.10.1
org.apache.avro:avro-maven-plugin;1.10.1
org.apache.commons:commons-compress;1.20
org.apache.commons:commons-lang3;3.11
org.apache.commons:commons-lang3;3.12.0
org.apache.httpcomponents:httpclient;4.5.13
org.apache.logging.log4j:log4j-api;2.13.3
org.apache.logging.log4j:log4j-core;2.13.3
org.apache.logging.log4j:log4j-slf4j-impl;2.13.3
org.apache.logging.log4j:log4j-api;2.14.1
org.apache.logging.log4j:log4j-core;2.14.1
org.apache.logging.log4j:log4j-slf4j-impl;2.14.1
org.apache.qpid:proton-j;0.33.4
org.apache.qpid:qpid-jms-client;0.53.0
org.apache.tinkerpop:gremlin-driver;3.2.4
Expand All @@ -86,7 +86,7 @@ org.codehaus.groovy:groovy-eclipse-compiler;3.4.0-01
org.conscrypt:conscrypt-openjdk-uber;2.2.1
org.glassfish.tyrus:tyrus-container-grizzly;1.2.1
org.glassfish.tyrus.bundles:tyrus-standalone-client;1.16
org.hibernate.validator:hibernate-validator;6.1.7.Final
org.hibernate.validator:hibernate-validator;6.2.0.Final
org.javatuples:javatuples;1.2
org.linguafranca.pwdb:KeePassJava2;2.1.4
org.powermock:powermock-api-mockito2;2.0.2
Expand All @@ -97,34 +97,34 @@ 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.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.boot:spring-boot-dependencies;2.5.0-RC1
org.springframework.boot:spring-boot-actuator-autoconfigure;2.5.0-RC1
org.springframework.boot:spring-boot-autoconfigure-processor;2.5.0-RC1
org.springframework.boot:spring-boot-autoconfigure;2.5.0-RC1
org.springframework.boot:spring-boot-configuration-processor;2.5.0-RC1
org.springframework.boot:spring-boot-starter-actuator;2.5.0-RC1
org.springframework.boot:spring-boot-starter-aop;2.5.0-RC1
org.springframework.boot:spring-boot-starter-cache;2.5.0-RC1
org.springframework.boot:spring-boot-starter-data-redis;2.5.0-RC1
org.springframework.boot:spring-boot-starter-logging;2.5.0-RC1
org.springframework.boot:spring-boot-starter-test;2.5.0-RC1
org.springframework.boot:spring-boot-starter-validation;2.5.0-RC1
org.springframework.boot:spring-boot-starter-web;2.5.0-RC1
org.springframework.boot:spring-boot-starter-webflux;2.5.0-RC1
org.springframework.boot:spring-boot-starter;2.5.0-RC1
org.springframework.boot:spring-boot;2.5.0-RC1
org.springframework.data:spring-data-commons;2.5.0
org.springframework.data:spring-data-mongodb;3.2.0
org.springframework.data:spring-data-redis;2.5.0
org.springframework.integration:spring-integration-core;5.5.0-RC1
org.springframework.kafka:spring-kafka;2.7.0
org.springframework.security:spring-security-config;5.5.0-RC1
org.springframework.security:spring-security-core;5.5.0-RC1
org.springframework.security:spring-security-oauth2-client;5.5.0-RC1
org.springframework.security:spring-security-oauth2-resource-server;5.5.0-RC1
org.springframework.security:spring-security-oauth2-core;5.5.0-RC1
org.springframework.security:spring-security-oauth2-jose;5.5.0-RC1
org.springframework.security:spring-security-web;5.5.0-RC1
org.springframework:spring-beans;5.3.6
org.springframework:spring-context-support;5.3.6
org.springframework:spring-context;5.3.6
Expand All @@ -138,7 +138,7 @@ 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.5
org.springframework.boot:spring-boot-starter-parent;2.5.0-RC1

## Spring cloud dependency versions
org.springframework.cloud:spring-cloud-dependencies;2020.0.2
Expand Down Expand Up @@ -182,7 +182,7 @@ org.apache.maven:maven-compat;3.6.2
org.apache.maven:maven-embedder;3.6.2
org.apache.maven.wagon:wagon-http;3.3.4
org.apache.maven.wagon:wagon-provider-api;3.3.4
org.assertj:assertj-core;3.18.1
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
Expand Down Expand Up @@ -215,8 +215,8 @@ 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;8.20.2
com.nimbusds:oauth2-oidc-sdk;8.36.1
com.nimbusds:nimbus-jose-jwt;9.8.1
com.nimbusds:oauth2-oidc-sdk;9.3.3
com.puppycrawl.tools:checkstyle;8.40
commons-io:commons-io;2.5
commons-validator:commons-validator;1.6
Expand Down Expand Up @@ -260,7 +260,7 @@ org.eclipse.m2e:lifecycle-mapping;1.0.0
org.hdrhistogram:HdrHistogram;2.1.12
org.jacoco:jacoco-maven-plugin;0.8.5
org.jacoco:org.jacoco.agent;0.8.5
org.mockito:mockito-core;3.6.28
org.mockito:mockito-core;3.9.0
org.revapi:revapi-java;0.20.0
org.revapi:revapi-maven-plugin;0.11.2

Expand Down Expand Up @@ -348,3 +348,4 @@ storage_com.microsoft.azure:azure-storage;8.4.0

# sdk\spring\azure-spring-boot\pom.xml
spring_com.microsoft.azure:azure;1.34.0
spring_org.springframework.kafka:spring-kafka;2.6.6
10 changes: 9 additions & 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 @@ -5,10 +5,18 @@

<modelVersion>4.0.0</modelVersion>

<repositories>
<repository>
<id>repository.spring.milestone</id>
<name>Spring Milestone Repository</name>
<url>https://repo.spring.io/milestone</url>
</repository>
</repositories>

<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.4.5</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-parent;external_dependency} -->
<version>2.5.0-RC1</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-parent;external_dependency} -->
<relativePath/> <!-- lookup parent from repository -->
</parent>

Expand Down
12 changes: 6 additions & 6 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,12 +25,12 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>2.4.5</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-web;external_dependency} -->
<version>2.5.0-RC1</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.5</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-actuator;external_dependency} -->
<version>2.5.0-RC1</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-actuator;external_dependency} -->
<optional>true</optional>
<scope>compile</scope>
</dependency>
Expand All @@ -50,13 +50,13 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.6.28</version><!-- {x-version-update;org.mockito:mockito-core;external_dependency} -->
<version>3.9.0</version><!-- {x-version-update;org.mockito:mockito-core;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<version>2.4.5</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-test;external_dependency} -->
<version>2.5.0-RC1</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-test;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -83,9 +83,9 @@
<rules>
<bannedDependencies>
<includes>
<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>org.springframework.boot:spring-boot-starter-actuator:[2.5.0-RC1]</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.5]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-web;external_dependency} -->
<include>org.springframework.boot:spring-boot-starter-web:[2.5.0-RC1]</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>
Expand Down
Loading