Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
1c059a6
Update SPRING_BOOT_VERSION and SPRING_CLOUD_VERSION in get_spring_boo…
Netyyyy Apr 26, 2022
4fbde61
Run command python .\sdk\spring\scripts\get_spring_boot_managed_exter…
Netyyyy Apr 26, 2022
80deefd
Update SPRING_BOOT_VERSION in sync_external_dependencies.py
Netyyyy Apr 26, 2022
c0f3c92
Run command python .\sdk\spring\scripts\sync_external_dependencies.py…
Netyyyy Apr 26, 2022
e6482cf
Run command python .\eng\versioning\update_versions.py --ut external_…
Netyyyy Apr 26, 2022
2f03398
Update changelog about compatible Spring Boot versions and Spring Clo…
Netyyyy Apr 26, 2022
be5ba4f
Update two spring-boot versions and two spring-cloud versions in/sdk/…
Netyyyy Apr 26, 2022
22a1ebe
delete unused version test
Netyyyy Apr 26, 2022
801474b
Revert "delete unused version test"
Netyyyy Apr 26, 2022
f9f32d6
remain json-smart 2.4.7
Netyyyy Apr 26, 2022
b9284a0
add revapi
Netyyyy Apr 27, 2022
2201b7e
add revapi
Netyyyy Apr 27, 2022
1d1d0a9
add revapi
Netyyyy Apr 27, 2022
0afd736
revert add revapi
Netyyyy Apr 27, 2022
17bbc5b
Merge branch 'azure/sdk-main' into myao/267
Netyyyy Apr 27, 2022
b8922cc
upgrade springcloud 2021.0.2
Netyyyy Apr 28, 2022
aa15091
remove spring-cloud-function-context
Netyyyy Apr 28, 2022
c3054a4
update ci
Netyyyy Apr 28, 2022
d920ca9
Merge branch 'azure/sdk-main' into myao/267
Netyyyy Apr 28, 2022
60249c1
remain json-smart;2.4.7
Netyyyy Apr 29, 2022
81db9ad
skip version check
Netyyyy Apr 29, 2022
0b068dd
Revert "skip version check"
Netyyyy Apr 29, 2022
e6a83b6
Merge branch 'main' into myao/267
Netyyyy May 5, 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
2 changes: 1 addition & 1 deletion common/perf-test-core/pom.xml
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.16]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
<include>io.projectreactor:reactor-core:[3.4.17]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
Expand Down
136 changes: 68 additions & 68 deletions eng/versioning/external_dependencies.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# To avoid dependency conflicts between SDK and Spring, when modifying or adding dependencies,
# make sure the version is same to sdk/spring/scripts/spring_boot_2.6.6_managed_external_dependencies.txt
# If your version is different from sdk/spring/scripts/spring_boot_2.6.6_managed_external_dependencies.txt,
# make sure the version is same to sdk/spring/scripts/spring_boot_2.6.7_managed_external_dependencies.txt
# If your version is different from sdk/spring/scripts/spring_boot_2.6.7_managed_external_dependencies.txt,
# please discuss with Spring Integration team members:
# @chenrujun (rujche), @saragluna (xiada), @yiliuTo (yiliu6), @backwind1233 (zhihaoguo).
# Thanks.
Expand Down Expand Up @@ -46,24 +46,24 @@ io.cloudevents:cloudevents-api;2.2.0
io.cloudevents:cloudevents-core;2.2.0
io.fabric8:kubernetes-client;5.10.2
io.github.bonigarcia:webdrivermanager;4.3.1
io.micrometer:micrometer-core;1.8.4
io.micrometer:micrometer-registry-azure-monitor;1.8.4
io.micrometer:micrometer-registry-graphite;1.8.4
io.netty:netty-buffer;4.1.75.Final
io.netty:netty-common;4.1.75.Final
io.netty:netty-codec-http;4.1.75.Final
io.netty:netty-codec-http2;4.1.75.Final
io.netty:netty-transport;4.1.75.Final
io.netty:netty-handler;4.1.75.Final
io.netty:netty-handler-proxy;4.1.75.Final
io.micrometer:micrometer-core;1.8.5
io.micrometer:micrometer-registry-azure-monitor;1.8.5
io.micrometer:micrometer-registry-graphite;1.8.5
io.netty:netty-buffer;4.1.76.Final
io.netty:netty-common;4.1.76.Final
io.netty:netty-codec-http;4.1.76.Final
io.netty:netty-codec-http2;4.1.76.Final
io.netty:netty-transport;4.1.76.Final
io.netty:netty-handler;4.1.76.Final
io.netty:netty-handler-proxy;4.1.76.Final
io.netty:netty-tcnative;2.0.51.Final
io.netty:netty-tcnative-boringssl-static;2.0.51.Final
io.netty:netty-transport-native-epoll;4.1.75.Final
io.netty:netty-transport-native-unix-common;4.1.75.Final
io.netty:netty-transport-native-kqueue;4.1.75.Final
io.projectreactor.netty:reactor-netty;1.0.17
io.projectreactor.netty:reactor-netty-http;1.0.17
io.projectreactor:reactor-core;3.4.16
io.netty:netty-transport-native-epoll;4.1.76.Final
io.netty:netty-transport-native-unix-common;4.1.76.Final
io.netty:netty-transport-native-kqueue;4.1.76.Final
io.projectreactor.netty:reactor-netty;1.0.18
io.projectreactor.netty:reactor-netty-http;1.0.18
io.projectreactor:reactor-core;3.4.17
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 Down Expand Up @@ -103,61 +103,61 @@ org.graalvm.buildtools:junit-platform-native;0.9.10
org.graalvm.buildtools:native-maven-plugin;0.9.10
org.graalvm.sdk:graal-sdk;22.0.0.2
org.graalvm.nativeimage:svm;22.0.0.2
org.messaginghub:pooled-jms;1.2.3
org.messaginghub:pooled-jms;1.2.4
org.powermock:powermock-api-mockito2;2.0.9
org.powermock:powermock-module-junit4;2.0.9
org.postgresql:postgresql;42.3.3
org.postgresql:postgresql;42.3.4
org.slf4j:slf4j-api;1.7.36
org.slf4j:slf4j-nop;1.7.36
org.slf4j:slf4j-simple;1.7.36

## Spring boot dependency versions
org.springframework.boot:spring-boot-dependencies;2.6.6
org.springframework.boot:spring-boot-actuator;2.6.6
org.springframework.boot:spring-boot-actuator-autoconfigure;2.6.6
org.springframework.boot:spring-boot-autoconfigure-processor;2.6.6
org.springframework.boot:spring-boot-autoconfigure;2.6.6
org.springframework.boot:spring-boot-configuration-metadata;2.6.6
org.springframework.boot:spring-boot-configuration-processor;2.6.6
org.springframework.boot:spring-boot-starter-actuator;2.6.6
org.springframework.boot:spring-boot-starter-aop;2.6.6
org.springframework.boot:spring-boot-starter-cache;2.6.6
org.springframework.boot:spring-boot-starter-data-redis;2.6.6
org.springframework.boot:spring-boot-starter-integration;2.6.6
org.springframework.boot:spring-boot-starter-logging;2.6.6
org.springframework.boot:spring-boot-starter-test;2.6.6
org.springframework.boot:spring-boot-starter-validation;2.6.6
org.springframework.boot:spring-boot-starter-web;2.6.6
org.springframework.boot:spring-boot-starter;2.6.6
org.springframework.boot:spring-boot-test;2.6.6
org.springframework.boot:spring-boot;2.6.6
org.springframework.data:spring-data-commons;2.6.3
org.springframework.data:spring-data-mongodb;3.3.3
org.springframework.data:spring-data-redis;2.6.3
org.springframework.boot:spring-boot-dependencies;2.6.7
org.springframework.boot:spring-boot-actuator;2.6.7
org.springframework.boot:spring-boot-actuator-autoconfigure;2.6.7
org.springframework.boot:spring-boot-autoconfigure-processor;2.6.7
org.springframework.boot:spring-boot-autoconfigure;2.6.7
org.springframework.boot:spring-boot-configuration-metadata;2.6.7
org.springframework.boot:spring-boot-configuration-processor;2.6.7
org.springframework.boot:spring-boot-starter-actuator;2.6.7
org.springframework.boot:spring-boot-starter-aop;2.6.7
org.springframework.boot:spring-boot-starter-cache;2.6.7
org.springframework.boot:spring-boot-starter-data-redis;2.6.7
org.springframework.boot:spring-boot-starter-integration;2.6.7
org.springframework.boot:spring-boot-starter-logging;2.6.7
org.springframework.boot:spring-boot-starter-test;2.6.7
org.springframework.boot:spring-boot-starter-validation;2.6.7
org.springframework.boot:spring-boot-starter-web;2.6.7
org.springframework.boot:spring-boot-starter;2.6.7
org.springframework.boot:spring-boot-test;2.6.7
org.springframework.boot:spring-boot;2.6.7
org.springframework.data:spring-data-commons;2.6.4
org.springframework.data:spring-data-mongodb;3.3.4
org.springframework.data:spring-data-redis;2.6.4
org.springframework.experimental:spring-aot;0.11.4
org.springframework.integration:spring-integration-core;5.5.10
org.springframework.kafka:spring-kafka;2.8.4
org.springframework.security:spring-security-config;5.6.2
org.springframework.security:spring-security-core;5.6.2
org.springframework.security:spring-security-oauth2-client;5.6.2
org.springframework.security:spring-security-oauth2-resource-server;5.6.2
org.springframework.security:spring-security-oauth2-core;5.6.2
org.springframework.security:spring-security-oauth2-jose;5.6.2
org.springframework.security:spring-security-web;5.6.2
org.springframework:spring-beans;5.3.18
org.springframework:spring-context-support;5.3.18
org.springframework:spring-context;5.3.18
org.springframework:spring-core;5.3.18
org.springframework:spring-expression;5.3.18
org.springframework:spring-jdbc;5.3.18
org.springframework:spring-jms;5.3.18
org.springframework:spring-messaging;5.3.18
org.springframework:spring-tx;5.3.18
org.springframework:spring-web;5.3.18
org.springframework:spring-webmvc;5.3.18
org.springframework:spring-test;5.3.18
org.springframework.retry:spring-retry;1.3.2
org.springframework.boot:spring-boot-starter-parent;2.6.6
org.springframework.integration:spring-integration-core;5.5.11
org.springframework.kafka:spring-kafka;2.8.5
org.springframework.security:spring-security-config;5.6.3
org.springframework.security:spring-security-core;5.6.3
org.springframework.security:spring-security-oauth2-client;5.6.3
org.springframework.security:spring-security-oauth2-resource-server;5.6.3
org.springframework.security:spring-security-oauth2-core;5.6.3
org.springframework.security:spring-security-oauth2-jose;5.6.3
org.springframework.security:spring-security-web;5.6.3
org.springframework:spring-beans;5.3.19
org.springframework:spring-context-support;5.3.19
org.springframework:spring-context;5.3.19
org.springframework:spring-core;5.3.19
org.springframework:spring-expression;5.3.19
org.springframework:spring-jdbc;5.3.19
org.springframework:spring-jms;5.3.19
org.springframework:spring-messaging;5.3.19
org.springframework:spring-tx;5.3.19
org.springframework:spring-web;5.3.19
org.springframework:spring-webmvc;5.3.19
org.springframework:spring-test;5.3.19
org.springframework.retry:spring-retry;1.3.3
org.springframework.boot:spring-boot-starter-parent;2.6.7

## Spring cloud dependency versions
org.springframework.cloud:spring-cloud-dependencies;2021.0.2
Expand Down Expand Up @@ -196,7 +196,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.16
io.projectreactor:reactor-test;3.4.17
junit:junit;4.13.2
commons-cli:commons-cli;1.3
org.apache.maven:maven-compat;3.6.2
Expand All @@ -207,8 +207,8 @@ org.assertj:assertj-core;3.21.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
org.eclipse.jetty:jetty-http;9.4.45.v20220203
org.eclipse.jetty:jetty-server;9.4.45.v20220203
org.eclipse.jetty:jetty-http;9.4.46.v20220331
org.eclipse.jetty:jetty-server;9.4.46.v20220331
org.eclipse.jgit:org.eclipse.jgit;4.5.7.201904151645-r
org.glassfish:javax.json;1.1.4
org.glassfish:jakarta.el;3.0.4
Expand Down
32 changes: 16 additions & 16 deletions sdk/aot/azure-aot-graalvm-support-netty/pom.xml
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.75.Final</version> <!-- {x-version-update;io.netty:netty-handler;external_dependency} -->
<version>4.1.76.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.75.Final</version> <!-- {x-version-update;io.netty:netty-handler-proxy;external_dependency} -->
<version>4.1.76.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.75.Final</version> <!-- {x-version-update;io.netty:netty-buffer;external_dependency} -->
<version>4.1.76.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.75.Final</version> <!-- {x-version-update;io.netty:netty-codec-http;external_dependency} -->
<version>4.1.76.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.75.Final</version> <!-- {x-version-update;io.netty:netty-codec-http2;external_dependency} -->
<version>4.1.76.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.75.Final</version> <!-- {x-version-update;io.netty:netty-transport-native-unix-common;external_dependency} -->
<version>4.1.76.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.75.Final</version> <!-- {x-version-update;io.netty:netty-transport-native-epoll;external_dependency} -->
<version>4.1.76.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.75.Final</version> <!-- {x-version-update;io.netty:netty-transport-native-kqueue;external_dependency} -->
<version>4.1.76.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.75.Final]</include> <!-- {x-include-update;io.netty:netty-buffer;external_dependency} -->
<include>io.netty:netty-codec-http:[4.1.75.Final]</include> <!-- {x-include-update;io.netty:netty-codec-http;external_dependency} -->
<include>io.netty:netty-codec-http2:[4.1.75.Final]</include> <!-- {x-include-update;io.netty:netty-codec-http2;external_dependency} -->
<include>io.netty:netty-handler:[4.1.75.Final]</include> <!-- {x-include-update;io.netty:netty-handler;external_dependency} -->
<include>io.netty:netty-handler-proxy:[4.1.75.Final]</include> <!-- {x-include-update;io.netty:netty-handler-proxy;external_dependency} -->
<include>io.netty:netty-transport-native-unix-common:[4.1.75.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-unix-common;external_dependency} -->
<include>io.netty:netty-transport-native-epoll:[4.1.75.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-epoll;external_dependency} -->
<include>io.netty:netty-transport-native-kqueue:[4.1.75.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-kqueue;external_dependency} -->
<include>io.netty:netty-buffer:[4.1.76.Final]</include> <!-- {x-include-update;io.netty:netty-buffer;external_dependency} -->
<include>io.netty:netty-codec-http:[4.1.76.Final]</include> <!-- {x-include-update;io.netty:netty-codec-http;external_dependency} -->
<include>io.netty:netty-codec-http2:[4.1.76.Final]</include> <!-- {x-include-update;io.netty:netty-codec-http2;external_dependency} -->
<include>io.netty:netty-handler:[4.1.76.Final]</include> <!-- {x-include-update;io.netty:netty-handler;external_dependency} -->
<include>io.netty:netty-handler-proxy:[4.1.76.Final]</include> <!-- {x-include-update;io.netty:netty-handler-proxy;external_dependency} -->
<include>io.netty:netty-transport-native-unix-common:[4.1.76.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-unix-common;external_dependency} -->
<include>io.netty:netty-transport-native-epoll:[4.1.76.Final]</include> <!-- {x-include-update;io.netty:netty-transport-native-epoll;external_dependency} -->
<include>io.netty:netty-transport-native-kqueue:[4.1.76.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
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.16</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
<version>3.4.17</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 @@ -31,12 +31,12 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>2.6.6</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-web;external_dependency} -->
<version>2.6.7</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.6</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-actuator;external_dependency} -->
<version>2.6.7</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.6</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-test;external_dependency} -->
<version>2.6.7</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.6]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-actuator;external_dependency} -->
<include>org.springframework.boot:spring-boot-starter-web:[2.6.6]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-web;external_dependency} -->
<include>org.springframework.boot:spring-boot-starter-actuator:[2.6.7]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-actuator;external_dependency} -->
<include>org.springframework.boot:spring-boot-starter-web:[2.6.7]</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