Skip to content

Commit

Permalink
Make external depencencies' version align to spring-boot 2.6.3 (Azure…
Browse files Browse the repository at this point in the history 
…#27147)

* 1.Update 'ROOT_POMS' version manually.

* 2. Run command "python .\sdk\spring\scripts\update_spring_managed_external_dependencies.py".

* 3. Run command "python .\eng\versioning\update_versions.py --ut external_dependency --sr"

* fix pipeline
  • Loading branch information
@Netyyyy
Netyyyy authored Mar 1, 2022
1 parent 255e488 commit 85817f5
Show file tree
Hide file tree
Showing 150 changed files with 1,071 additions and 1,064 deletions.
2 changes: 1 addition & 1 deletion common/perf-test-core/pom.xml
View file
Original file line number Diff line number Diff line change
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.13]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
<include>io.projectreactor:reactor-core:[3.4.14]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
Expand Down
2 changes: 1 addition & 1 deletion common/smoke-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.7.32</version> <!-- {x-version-update;org.slf4j:slf4j-simple;external_dependency} -->
<version>1.7.33</version> <!-- {x-version-update;org.slf4j:slf4j-simple;external_dependency} -->
</dependency>

</dependencies>
Expand Down
6 changes: 6 additions & 0 deletions eng/code-quality-reports/src/main/resources/revapi/revapi.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,12 @@
"configuration": {
"ignore": true,
"differences": [
{
"regex": true,
"code": "java.class.defaultSerializationChanged",
"new": "class org.springframework.beans.factory.support.DefaultListableBeanFactory",
"justification": "We allow this in org.springframework.beans.factory.support.DefaultListableBeanFactory"
},
{
"regex": true,
"code": "java.class.nonPublicPartOfAPI",
Expand Down
128 changes: 64 additions & 64 deletions eng/versioning/external_dependencies.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,32 +46,32 @@ io.cloudevents:cloudevents-api;2.2.0
io.cloudevents:cloudevents-core;2.2.0
io.fabric8:kubernetes-client;5.9.0
io.github.bonigarcia:webdrivermanager;4.3.1
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.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.micrometer:micrometer-core;1.8.2
io.micrometer:micrometer-registry-azure-monitor;1.8.2
io.micrometer:micrometer-registry-graphite;1.8.2
io.netty:netty-buffer;4.1.73.Final
io.netty:netty-common;4.1.73.Final
io.netty:netty-codec-http;4.1.73.Final
io.netty:netty-codec-http2;4.1.73.Final
io.netty:netty-transport;4.1.73.Final
io.netty:netty-handler;4.1.73.Final
io.netty:netty-handler-proxy;4.1.73.Final
io.netty:netty-tcnative;2.0.47.Final
io.netty:netty-tcnative-boringssl-static;2.0.47.Final
io.netty:netty-transport-native-epoll;4.1.73.Final
io.netty:netty-transport-native-unix-common;4.1.73.Final
io.netty:netty-transport-native-kqueue;4.1.73.Final
io.projectreactor.netty:reactor-netty;1.0.15
io.projectreactor.netty:reactor-netty-http;1.0.15
io.projectreactor:reactor-core;3.4.14
io.reactivex:rxjava;1.3.8
jakarta.xml.bind:jakarta.xml.bind-api;2.3.3
javax.annotation:javax.annotation-api;1.3.2
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.27
mysql:mysql-connector-java;8.0.28
net.minidev:json-smart;2.4.7
org.apache.ant:ant;1.9.4
org.apache.avro:avro;1.10.1
Expand Down Expand Up @@ -104,62 +104,62 @@ org.graalvm.nativeimage:svm;21.3.0
org.powermock:powermock-api-mockito2;2.0.9
org.powermock:powermock-module-junit4;2.0.9
org.postgresql:postgresql;42.3.2
org.slf4j:slf4j-api;1.7.32
org.slf4j:slf4j-nop;1.7.32
org.slf4j:slf4j-simple;1.7.32
org.slf4j:slf4j-api;1.7.33
org.slf4j:slf4j-nop;1.7.33
org.slf4j:slf4j-simple;1.7.33

## Spring boot dependency versions
org.springframework.boot:spring-boot-dependencies;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-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.7
org.springframework.kafka:spring-kafka;2.8.1
org.springframework.boot:spring-boot-dependencies;2.6.3
org.springframework.boot:spring-boot-actuator-autoconfigure;2.6.3
org.springframework.boot:spring-boot-autoconfigure-processor;2.6.3
org.springframework.boot:spring-boot-autoconfigure;2.6.3
org.springframework.boot:spring-boot-configuration-processor;2.6.3
org.springframework.boot:spring-boot-starter-actuator;2.6.3
org.springframework.boot:spring-boot-starter-aop;2.6.3
org.springframework.boot:spring-boot-starter-cache;2.6.3
org.springframework.boot:spring-boot-starter-data-redis;2.6.3
org.springframework.boot:spring-boot-starter-logging;2.6.3
org.springframework.boot:spring-boot-starter-test;2.6.3
org.springframework.boot:spring-boot-starter-validation;2.6.3
org.springframework.boot:spring-boot-starter-web;2.6.3
org.springframework.boot:spring-boot-starter-webflux;2.6.3
org.springframework.boot:spring-boot-starter;2.6.3
org.springframework.boot:spring-boot;2.6.3
org.springframework.data:spring-data-commons;2.6.1
org.springframework.data:spring-data-mongodb;3.3.1
org.springframework.data:spring-data-redis;2.6.1
org.springframework.integration:spring-integration-core;5.5.8
org.springframework.kafka:spring-kafka;2.8.2
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-jdbc;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-beans;5.3.15
org.springframework:spring-context-support;5.3.15
org.springframework:spring-context;5.3.15
org.springframework:spring-core;5.3.15
org.springframework:spring-expression;5.3.15
org.springframework:spring-jdbc;5.3.15
org.springframework:spring-jms;5.3.15
org.springframework:spring-messaging;5.3.15
org.springframework:spring-tx;5.3.15
org.springframework:spring-web;5.3.15
org.springframework:spring-webmvc;5.3.15
org.springframework:spring-webflux;5.3.15

org.springframework.boot:spring-boot-starter-parent;2.6.2
org.springframework.boot:spring-boot-starter-parent;2.6.3

## Spring cloud dependency versions
org.springframework.cloud:spring-cloud-dependencies;2021.0.0
org.springframework.cloud:spring-cloud-starter-bootstrap;3.1.0
org.springframework.cloud:spring-cloud-dependencies;2021.0.1
org.springframework.cloud:spring-cloud-starter-bootstrap;3.1.1
org.springframework.cloud:spring-cloud-bus;3.1.0
org.springframework.cloud:spring-cloud-context;3.1.0
org.springframework.cloud:spring-cloud-starter-stream-kafka;3.2.1
org.springframework.cloud:spring-cloud-stream-binder-test;3.2.1
org.springframework.cloud:spring-cloud-stream;3.2.1
org.springframework.cloud:spring-cloud-context;3.1.1
org.springframework.cloud:spring-cloud-starter-stream-kafka;3.2.2
org.springframework.cloud:spring-cloud-stream-binder-test;3.2.2
org.springframework.cloud:spring-cloud-stream;3.2.2

pl.pragmatists:JUnitParams;1.1.1

Expand Down Expand Up @@ -187,7 +187,7 @@ io.opentelemetry:opentelemetry-api;1.11.0
io.opentelemetry:opentelemetry-sdk;1.11.0
io.opentelemetry:opentelemetry-exporter-logging;1.11.0
io.opentelemetry:opentelemetry-exporter-jaeger;1.11.0
io.projectreactor:reactor-test;3.4.13
io.projectreactor:reactor-test;3.4.14
junit:junit;4.13.2
commons-cli:commons-cli;1.3
org.apache.maven:maven-compat;3.6.2
Expand Down Expand Up @@ -243,7 +243,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
net.jonathangiles.tools:whitelistgenerator-maven-plugin;1.0.2
org.apache.commons:commons-collections4;4.2
org.apache.commons:commons-collections4;4.4
org.apache.commons:commons-text;1.6
org.apache.maven.plugins:maven-antrun-plugin;1.8
org.apache.maven.plugins:maven-assembly-plugin;3.2.0
Expand Down
32 changes: 16 additions & 16 deletions sdk/aot/azure-aot-graalvm-support-netty/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,44 +63,44 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
<version>4.1.72.Final</version> <!-- {x-version-update;io.netty:netty-handler;external_dependency} -->
<version>4.1.73.Final</version> <!-- {x-version-update;io.netty:netty-handler;external_dependency} -->
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler-proxy</artifactId>
<version>4.1.72.Final</version> <!-- {x-version-update;io.netty:netty-handler-proxy;external_dependency} -->
<version>4.1.73.Final</version> <!-- {x-version-update;io.netty:netty-handler-proxy;external_dependency} -->
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
<version>4.1.72.Final</version> <!-- {x-version-update;io.netty:netty-buffer;external_dependency} -->
<version>4.1.73.Final</version> <!-- {x-version-update;io.netty:netty-buffer;external_dependency} -->
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId>
<version>4.1.72.Final</version> <!-- {x-version-update;io.netty:netty-codec-http;external_dependency} -->
<version>4.1.73.Final</version> <!-- {x-version-update;io.netty:netty-codec-http;external_dependency} -->
</dependency>

<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http2</artifactId>
<version>4.1.72.Final</version> <!-- {x-version-update;io.netty:netty-codec-http2;external_dependency} -->
<version>4.1.73.Final</version> <!-- {x-version-update;io.netty:netty-codec-http2;external_dependency} -->
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-unix-common</artifactId>
<version>4.1.72.Final</version> <!-- {x-version-update;io.netty:netty-transport-native-unix-common;external_dependency} -->
<version>4.1.73.Final</version> <!-- {x-version-update;io.netty:netty-transport-native-unix-common;external_dependency} -->
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
<version>4.1.72.Final</version> <!-- {x-version-update;io.netty:netty-transport-native-epoll;external_dependency} -->
<version>4.1.73.Final</version> <!-- {x-version-update;io.netty:netty-transport-native-epoll;external_dependency} -->
<classifier>linux-x86_64</classifier>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-kqueue</artifactId>
<version>4.1.72.Final</version> <!-- {x-version-update;io.netty:netty-transport-native-kqueue;external_dependency} -->
<version>4.1.73.Final</version> <!-- {x-version-update;io.netty:netty-transport-native-kqueue;external_dependency} -->
<classifier>osx-x86_64</classifier>
</dependency>
</dependencies>
Expand All @@ -115,14 +115,14 @@
<rules>
<bannedDependencies>
<includes>
<include>io.netty:netty-buffer:[4.1.72.Final]</include> <!-- {x-include-update;io.netty:netty-buffer;external_dependency} -->
<include>io.netty:netty-codec-http:[4.1.72.Final]</include> <!-- {x-include-update;io.netty:netty-codec-http;external_dependency} -->
<include>io.netty:netty-codec-http2:[4.1.72.Final]</include> <!-- {x-include-update;io.netty:netty-codec-http2;external_dependency} -->
<include>io.netty:netty-handler:[4.1.72.Final]</include> <!-- {x-include-update;io.netty:netty-handler;external_dependency} -->
<include>io.netty:netty-handler-proxy:[4.1.72.Final]</include> <!-- {x-include-update;io.netty:netty-handler-proxy;external_dependency} -->
<include>io.netty:netty-transport-native-unix-common:[4.1.72.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-unix-common;external_dependency} -->
<include>io.netty:netty-transport-native-epoll:[4.1.72.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-epoll;external_dependency} -->
<include>io.netty:netty-transport-native-kqueue:[4.1.72.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-kqueue;external_dependency} -->
<include>io.netty:netty-buffer:[4.1.73.Final]</include> <!-- {x-include-update;io.netty:netty-buffer;external_dependency} -->
<include>io.netty:netty-codec-http:[4.1.73.Final]</include> <!-- {x-include-update;io.netty:netty-codec-http;external_dependency} -->
<include>io.netty:netty-codec-http2:[4.1.73.Final]</include> <!-- {x-include-update;io.netty:netty-codec-http2;external_dependency} -->
<include>io.netty:netty-handler:[4.1.73.Final]</include> <!-- {x-include-update;io.netty:netty-handler;external_dependency} -->
<include>io.netty:netty-handler-proxy:[4.1.73.Final]</include> <!-- {x-include-update;io.netty:netty-handler-proxy;external_dependency} -->
<include>io.netty:netty-transport-native-unix-common:[4.1.73.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-unix-common;external_dependency} -->
<include>io.netty:netty-transport-native-epoll:[4.1.73.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-epoll;external_dependency} -->
<include>io.netty:netty-transport-native-kqueue:[4.1.73.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-kqueue;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
Expand Down
2 changes: 1 addition & 1 deletion sdk/appconfiguration/azure-data-appconfiguration/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-test</artifactId>
<version>3.4.13</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
<version>3.4.14</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
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.2</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-web;external_dependency} -->
<version>2.6.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.6.2</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-actuator;external_dependency} -->
<version>2.6.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.6.2</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-test;external_dependency} -->
<version>2.6.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.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.boot:spring-boot-starter-actuator:[2.6.3]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-actuator;external_dependency} -->
<include>org.springframework.boot:spring-boot-starter-web:[2.6.3]</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

0 comments on commit 85817f5

Please sign in to comment.