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

Upgrade to springboot 2.6.2 and test compatibility of 2.5.8 in feature/azure-spring-cloud-4.0. #26374

Closed
wants to merge 3 commits into from
Closed

Upgrade to springboot 2.6.2 and test compatibility of 2.5.8 in feature/azure-spring-cloud-4.0. #26374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
211891b
ci test for springboot2.6.2 and 2.5.8
Netyyyy Jan 10, 2022
62e4d39
update sync_external_dependencies.py and run command `python .\sdk\sp…
Netyyyy Jan 10, 2022
94837d7
run command `python eng/versioning/update_versions.py --ut external_d…
Netyyyy Jan 10, 2022
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
6 changes: 3 additions & 3 deletions common/perf-test-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,12 @@
<rules>
<bannedDependencies>
<includes>
<include>com.fasterxml.jackson.core:jackson-databind:[2.13.0]</include> <!-- {x-include-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
<include>com.fasterxml.jackson.core:jackson-databind:[2.13.1]</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} -->

<include>io.projectreactor:reactor-core:[3.4.12]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
<include>io.projectreactor:reactor-core:[3.4.13]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
Expand All @@ -76,7 +76,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.13.0</version> <!-- {x-version-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
<version>2.13.1</version> <!-- {x-version-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
</dependency>
<dependency>
<groupId>com.beust</groupId>
Expand Down
172 changes: 86 additions & 86 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.13.0
com.fasterxml.jackson.core:jackson-core;2.13.0
com.fasterxml.jackson.core:jackson-databind;2.13.0
com.fasterxml.jackson.dataformat:jackson-dataformat-avro;2.13.0
com.fasterxml.jackson.dataformat:jackson-dataformat-xml;2.13.0
com.fasterxml.jackson.datatype:jackson-datatype-jdk8;2.13.0
com.fasterxml.jackson.datatype:jackson-datatype-jsr310;2.13.0
com.fasterxml.jackson.module:jackson-module-parameter-names;2.13.0
com.fasterxml.jackson.core:jackson-annotations;2.13.1
com.fasterxml.jackson.core:jackson-core;2.13.1
com.fasterxml.jackson.core:jackson-databind;2.13.1
com.fasterxml.jackson.dataformat:jackson-dataformat-avro;2.13.1
com.fasterxml.jackson.dataformat:jackson-dataformat-xml;2.13.1
com.fasterxml.jackson.datatype:jackson-datatype-jdk8;2.13.1
com.fasterxml.jackson.datatype:jackson-datatype-jsr310;2.13.1
com.fasterxml.jackson.module:jackson-module-parameter-names;2.13.1
com.github.spotbugs:spotbugs;4.2.2
com.github.spotbugs:spotbugs-annotations;4.2.2
com.github.spotbugs:spotbugs-maven-plugin;4.2.2
Expand All @@ -35,32 +35,32 @@ com.microsoft.azure:qpid-proton-j-extensions;1.2.4
com.microsoft.azure.sdk.iot:iot-service-client;1.30.0
com.microsoft.rest:client-runtime;1.7.4
com.microsoft.rest.v2:client-runtime;2.1.1
com.microsoft.sqlserver:mssql-jdbc;9.4.0.jre8
com.microsoft.sqlserver:mssql-jdbc;9.4.1.jre8
com.microsoft.azure:spring-data-cosmosdb;2.3.0
com.squareup.okhttp3:okhttp;4.9.2
com.zaxxer:HikariCP;4.0.3
commons-codec:commons-codec;1.15
commons-net:commons-net;3.6
io.fabric8:kubernetes-client;5.9.0
io.github.bonigarcia:webdrivermanager;4.3.1
io.micrometer:micrometer-core;1.8.0
io.micrometer:micrometer-registry-azure-monitor;1.8.0
io.micrometer:micrometer-registry-graphite;1.8.0
io.netty:netty-buffer;4.1.70.Final
io.netty:netty-common;4.1.70.Final
io.netty:netty-codec-http;4.1.70.Final
io.netty:netty-codec-http2;4.1.70.Final
io.netty:netty-transport;4.1.70.Final
io.netty:netty-handler;4.1.70.Final
io.netty:netty-handler-proxy;4.1.70.Final
io.micrometer:micrometer-core;1.8.1
io.micrometer:micrometer-registry-azure-monitor;1.8.1
io.micrometer:micrometer-registry-graphite;1.8.1
io.netty:netty-buffer;4.1.72.Final
io.netty:netty-common;4.1.72.Final
io.netty:netty-codec-http;4.1.72.Final
io.netty:netty-codec-http2;4.1.72.Final
io.netty:netty-transport;4.1.72.Final
io.netty:netty-handler;4.1.72.Final
io.netty:netty-handler-proxy;4.1.72.Final
io.netty:netty-tcnative;2.0.46.Final
io.netty:netty-tcnative-boringssl-static;2.0.46.Final
io.netty:netty-transport-native-epoll;4.1.70.Final
io.netty:netty-transport-native-unix-common;4.1.70.Final
io.netty:netty-transport-native-kqueue;4.1.70.Final
io.projectreactor.netty:reactor-netty;1.0.13
io.projectreactor.netty:reactor-netty-http;1.0.13
io.projectreactor:reactor-core;3.4.12
io.netty:netty-transport-native-epoll;4.1.72.Final
io.netty:netty-transport-native-unix-common;4.1.72.Final
io.netty:netty-transport-native-kqueue;4.1.72.Final
io.projectreactor.netty:reactor-netty;1.0.14
io.projectreactor.netty:reactor-netty-http;1.0.14
io.projectreactor:reactor-core;3.4.13
io.reactivex:rxjava;1.3.8
jakarta.validation:jakarta.validation-api;2.0.2
jakarta.xml.bind:jakarta.xml.bind-api;2.3.3
Expand All @@ -77,9 +77,9 @@ org.apache.avro:avro-maven-plugin;1.10.1
org.apache.commons:commons-compress;1.21
org.apache.commons:commons-lang3;3.12.0
org.apache.httpcomponents:httpclient;4.5.13
org.apache.logging.log4j:log4j-api;2.15.0
org.apache.logging.log4j:log4j-core;2.15.0
org.apache.logging.log4j:log4j-slf4j-impl;2.15.0
org.apache.logging.log4j:log4j-api;2.17.0
org.apache.logging.log4j:log4j-core;2.17.0
org.apache.logging.log4j:log4j-slf4j-impl;2.17.0
org.apache.qpid:proton-j;0.33.8
org.apache.qpid:qpid-jms-client;0.53.0
org.apache.tinkerpop:gremlin-driver;3.2.4
Expand All @@ -101,50 +101,50 @@ org.slf4j:slf4j-nop;1.7.32
org.slf4j:slf4j-simple;1.7.32

## Spring boot dependency versions
org.springframework.boot:spring-boot-dependencies;2.6.1
org.springframework.boot:spring-boot-actuator;2.6.1
org.springframework.boot:spring-boot-actuator-autoconfigure;2.6.1
org.springframework.boot:spring-boot-autoconfigure-processor;2.6.1
org.springframework.boot:spring-boot-autoconfigure;2.6.1
org.springframework.boot:spring-boot-configuration-processor;2.6.1
org.springframework.boot:spring-boot-starter-actuator;2.6.1
org.springframework.boot:spring-boot-starter-aop;2.6.1
org.springframework.boot:spring-boot-starter-cache;2.6.1
org.springframework.boot:spring-boot-starter-data-redis;2.6.1
org.springframework.boot:spring-boot-starter-integration;2.6.1
org.springframework.boot:spring-boot-starter-logging;2.6.1
org.springframework.boot:spring-boot-starter-test;2.6.1
org.springframework.boot:spring-boot-starter-validation;2.6.1
org.springframework.boot:spring-boot-starter-web;2.6.1
org.springframework.boot:spring-boot-starter-webflux;2.6.1
org.springframework.boot:spring-boot-starter;2.6.1
org.springframework.boot:spring-boot;2.6.1
org.springframework.boot:spring-boot-dependencies;2.6.2
org.springframework.boot:spring-boot-actuator;2.6.2
org.springframework.boot:spring-boot-actuator-autoconfigure;2.6.2
org.springframework.boot:spring-boot-autoconfigure-processor;2.6.2
org.springframework.boot:spring-boot-autoconfigure;2.6.2
org.springframework.boot:spring-boot-configuration-processor;2.6.2
org.springframework.boot:spring-boot-starter-actuator;2.6.2
org.springframework.boot:spring-boot-starter-aop;2.6.2
org.springframework.boot:spring-boot-starter-cache;2.6.2
org.springframework.boot:spring-boot-starter-data-redis;2.6.2
org.springframework.boot:spring-boot-starter-integration;2.6.2
org.springframework.boot:spring-boot-starter-logging;2.6.2
org.springframework.boot:spring-boot-starter-test;2.6.2
org.springframework.boot:spring-boot-starter-validation;2.6.2
org.springframework.boot:spring-boot-starter-web;2.6.2
org.springframework.boot:spring-boot-starter-webflux;2.6.2
org.springframework.boot:spring-boot-starter;2.6.2
org.springframework.boot:spring-boot;2.6.2
org.springframework.data:spring-data-commons;2.6.0
org.springframework.data:spring-data-mongodb;3.3.0
org.springframework.data:spring-data-redis;2.6.0
org.springframework.integration:spring-integration-core;5.5.6
org.springframework.kafka:spring-kafka;2.8.0
org.springframework.security:spring-security-config;5.6.0
org.springframework.security:spring-security-core;5.6.0
org.springframework.security:spring-security-oauth2-client;5.6.0
org.springframework.security:spring-security-oauth2-resource-server;5.6.0
org.springframework.security:spring-security-oauth2-core;5.6.0
org.springframework.security:spring-security-oauth2-jose;5.6.0
org.springframework.security:spring-security-web;5.6.0
org.springframework:spring-beans;5.3.13
org.springframework:spring-context-support;5.3.13
org.springframework:spring-context;5.3.13
org.springframework:spring-core;5.3.13
org.springframework:spring-expression;5.3.13
org.springframework:spring-jms;5.3.13
org.springframework:spring-messaging;5.3.13
org.springframework:spring-tx;5.3.13
org.springframework:spring-web;5.3.13
org.springframework:spring-webmvc;5.3.13
org.springframework:spring-webflux;5.3.13
org.springframework:spring-test;5.3.13
org.springframework.integration:spring-integration-core;5.5.7
org.springframework.kafka:spring-kafka;2.8.1
org.springframework.security:spring-security-config;5.6.1
org.springframework.security:spring-security-core;5.6.1
org.springframework.security:spring-security-oauth2-client;5.6.1
org.springframework.security:spring-security-oauth2-resource-server;5.6.1
org.springframework.security:spring-security-oauth2-core;5.6.1
org.springframework.security:spring-security-oauth2-jose;5.6.1
org.springframework.security:spring-security-web;5.6.1
org.springframework:spring-beans;5.3.14
org.springframework:spring-context-support;5.3.14
org.springframework:spring-context;5.3.14
org.springframework:spring-core;5.3.14
org.springframework:spring-expression;5.3.14
org.springframework:spring-jms;5.3.14
org.springframework:spring-messaging;5.3.14
org.springframework:spring-tx;5.3.14
org.springframework:spring-web;5.3.14
org.springframework:spring-webmvc;5.3.14
org.springframework:spring-webflux;5.3.14
org.springframework:spring-test;5.3.14
org.springframework.retry:spring-retry;1.3.1
org.springframework.boot:spring-boot-starter-parent;2.6.1
org.springframework.boot:spring-boot-starter-parent;2.6.2

## Spring cloud dependency versions
org.springframework.cloud:spring-cloud-dependencies;2021.0.0
Expand Down Expand Up @@ -182,7 +182,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.12
io.projectreactor:reactor-test;3.4.13
junit:junit;4.13.2
commons-cli:commons-cli;1.3
org.apache.maven:maven-compat;3.6.2
Expand All @@ -200,20 +200,20 @@ org.glassfish:javax.json;1.1.4
org.glassfish:jakarta.el;3.0.4
org.hamcrest:hamcrest-all;1.3
org.hamcrest:hamcrest-library;2.2
org.junit.jupiter:junit-jupiter;5.8.1
org.junit.jupiter:junit-jupiter-api;5.8.1
org.junit.jupiter:junit-jupiter-engine;5.8.1
org.junit.jupiter:junit-jupiter-migrationsupport;5.8.1
org.junit.jupiter:junit-jupiter-params;5.8.1
org.junit.platform:junit-platform-commons;1.8.1
org.junit.platform:junit-platform-console;1.8.1
org.junit.platform:junit-platform-engine;1.8.1
org.junit.platform:junit-platform-launcher;1.8.1
org.junit.platform:junit-platform-reporting;1.8.1
org.junit.platform:junit-platform-runner;1.8.1
org.junit.platform:junit-platform-suite-api;1.8.1
org.junit.platform:junit-platform-testkit;1.8.1
org.junit.vintage:junit-vintage-engine;5.8.1
org.junit.jupiter:junit-jupiter;5.8.2
org.junit.jupiter:junit-jupiter-api;5.8.2
org.junit.jupiter:junit-jupiter-engine;5.8.2
org.junit.jupiter:junit-jupiter-migrationsupport;5.8.2
org.junit.jupiter:junit-jupiter-params;5.8.2
org.junit.platform:junit-platform-commons;1.8.2
org.junit.platform:junit-platform-console;1.8.2
org.junit.platform:junit-platform-engine;1.8.2
org.junit.platform:junit-platform-launcher;1.8.2
org.junit.platform:junit-platform-reporting;1.8.2
org.junit.platform:junit-platform-runner;1.8.2
org.junit.platform:junit-platform-suite-api;1.8.2
org.junit.platform:junit-platform-testkit;1.8.2
org.junit.vintage:junit-vintage-engine;5.8.2
org.openjdk.jmh:jmh-core;1.22
org.openjdk.jmh:jmh-generator-annprocess;1.22
org.spockframework:spock-core;2.0-M4-groovy-2.5
Expand All @@ -231,9 +231,9 @@ com.nimbusds:nimbus-jose-jwt;9.10.1
com.puppycrawl.tools:checkstyle;9.2
commons-io:commons-io;2.7
commons-validator:commons-validator;1.6
io.dropwizard.metrics:metrics-core;4.2.4
io.dropwizard.metrics:metrics-graphite;4.2.4
io.dropwizard.metrics:metrics-jvm;4.2.4
io.dropwizard.metrics:metrics-core;4.2.7
io.dropwizard.metrics:metrics-graphite;4.2.7
io.dropwizard.metrics:metrics-jvm;4.2.7
io.reactivex.rxjava2:rxjava;2.2.21
net.java.dev.jna:jna-platform;5.6.0
net.jonathangiles.tools:dependencyChecker-maven-plugin;1.0.6
Expand Down
6 changes: 3 additions & 3 deletions sdk/agrifood/azure-verticals-agrifood-farming/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,19 +61,19 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.8.1</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-api;external_dependency} -->
<version>5.8.2</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-api;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>5.8.1</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-engine;external_dependency} -->
<version>5.8.2</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-engine;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<version>5.8.1</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-params;external_dependency} -->
<version>5.8.2</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-params;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
Expand Down
6 changes: 3 additions & 3 deletions sdk/anomalydetector/azure-ai-anomalydetector/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,19 +53,19 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.8.1</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-api;external_dependency} -->
<version>5.8.2</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-api;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>5.8.1</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-engine;external_dependency} -->
<version>5.8.2</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-engine;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<version>5.8.1</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-params;external_dependency} -->
<version>5.8.2</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-params;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
Expand Down
8 changes: 4 additions & 4 deletions sdk/appconfiguration/azure-data-appconfiguration/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,19 +71,19 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.8.1</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-api;external_dependency} -->
<version>5.8.2</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-api;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>5.8.1</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-engine;external_dependency} -->
<version>5.8.2</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-engine;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<version>5.8.1</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-params;external_dependency} -->
<version>5.8.2</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-params;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -95,7 +95,7 @@
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-test</artifactId>
<version>3.4.12</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
<version>3.4.13</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
Expand Down
12 changes: 6 additions & 6 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 @@ -31,12 +31,12 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>2.6.1</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-web;external_dependency} -->
<version>2.6.2</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.6.1</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-actuator;external_dependency} -->
<version>2.6.2</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-actuator;external_dependency} -->
<optional>true</optional>
</dependency>
<dependency>
Expand All @@ -48,7 +48,7 @@
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<version>5.8.1</version> <!-- {x-version-update;org.junit.vintage:junit-vintage-engine;external_dependency} -->
<version>5.8.2</version> <!-- {x-version-update;org.junit.vintage:junit-vintage-engine;external_dependency} -->
<scope>test</scope>
<exclusions>
<exclusion>
Expand All @@ -72,7 +72,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<version>2.6.1</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-test;external_dependency} -->
<version>2.6.2</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-test;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -99,8 +99,8 @@
<rules>
<bannedDependencies>
<includes>
<include>org.springframework.boot:spring-boot-starter-actuator:[2.6.1]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-actuator;external_dependency} -->
<include>org.springframework.boot:spring-boot-starter-web:[2.6.1]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-web;external_dependency} -->
<include>org.springframework.boot:spring-boot-starter-actuator:[2.6.2]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-actuator;external_dependency} -->
<include>org.springframework.boot:spring-boot-starter-web:[2.6.2]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-web;external_dependency} -->
<include>org.springframework.cloud:spring-cloud-bus:[3.1.0]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-bus;external_dependency} -->
</includes>
</bannedDependencies>
Expand Down
Loading