Skip to content

Commit 3be954d

Browse files
authored
Upgrade external dependencies' version to spring-cloud 2021.0.2 (Azure#28562)
* upgrade to 2021.0.2 * remain json-smart 2.4.7 * delete spring-cloud-function-core
1 parent 659796d commit 3be954d

File tree

14 files changed

+237
-251
lines changed

14 files changed

+237
-251
lines changed

eng/versioning/external_dependencies.txt

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ commons-codec:commons-codec;1.15
4444
commons-net:commons-net;3.6
4545
io.cloudevents:cloudevents-api;2.2.0
4646
io.cloudevents:cloudevents-core;2.2.0
47-
io.fabric8:kubernetes-client;5.9.0
47+
io.fabric8:kubernetes-client;5.10.2
4848
io.github.bonigarcia:webdrivermanager;4.3.1
4949
io.micrometer:micrometer-core;1.8.4
5050
io.micrometer:micrometer-registry-azure-monitor;1.8.4
@@ -160,16 +160,15 @@ org.springframework.retry:spring-retry;1.3.2
160160
org.springframework.boot:spring-boot-starter-parent;2.6.6
161161

162162
## Spring cloud dependency versions
163-
org.springframework.cloud:spring-cloud-dependencies;2021.0.1
164-
org.springframework.cloud:spring-cloud-starter-bootstrap;3.1.1
163+
org.springframework.cloud:spring-cloud-dependencies;2021.0.2
164+
org.springframework.cloud:spring-cloud-starter-bootstrap;3.1.2
165165
org.springframework.cloud:spring-cloud-bus;3.1.0
166-
org.springframework.cloud:spring-cloud-context;3.1.1
167-
org.springframework.cloud:spring-cloud-sleuth-api;3.1.1
168-
org.springframework.cloud:spring-cloud-starter-sleuth;3.1.1
169-
org.springframework.cloud:spring-cloud-starter-stream-kafka;3.2.2
170-
org.springframework.cloud:spring-cloud-stream-binder-test;3.2.2
171-
org.springframework.cloud:spring-cloud-stream;3.2.2
172-
org.springframework.cloud:spring-cloud-function-context;3.2.3
166+
org.springframework.cloud:spring-cloud-context;3.1.2
167+
org.springframework.cloud:spring-cloud-sleuth-api;3.1.2
168+
org.springframework.cloud:spring-cloud-starter-sleuth;3.1.2
169+
org.springframework.cloud:spring-cloud-starter-stream-kafka;3.2.3
170+
org.springframework.cloud:spring-cloud-stream-binder-test;3.2.3
171+
org.springframework.cloud:spring-cloud-stream;3.2.3
173172

174173
pl.pragmatists:JUnitParams;1.1.1
175174

sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@
4242
<dependency>
4343
<groupId>org.springframework.cloud</groupId>
4444
<artifactId>spring-cloud-starter-bootstrap</artifactId>
45-
<version>3.1.1</version> <!-- {x-version-update;org.springframework.cloud:spring-cloud-starter-bootstrap;external_dependency} -->
45+
<version>3.1.2</version> <!-- {x-version-update;org.springframework.cloud:spring-cloud-starter-bootstrap;external_dependency} -->
4646
</dependency>
4747
<dependency>
4848
<groupId>org.springframework.cloud</groupId>
4949
<artifactId>spring-cloud-context</artifactId>
50-
<version>3.1.1</version> <!-- {x-version-update;org.springframework.cloud:spring-cloud-context;external_dependency} -->
50+
<version>3.1.2</version> <!-- {x-version-update;org.springframework.cloud:spring-cloud-context;external_dependency} -->
5151
</dependency>
5252
<dependency>
5353
<groupId>com.fasterxml.jackson.core</groupId>
@@ -142,8 +142,8 @@
142142
<include>org.springframework.boot:spring-boot-autoconfigure:[2.6.6]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-autoconfigure;external_dependency} -->
143143
<include>org.springframework.boot:spring-boot-actuator-autoconfigure:[2.6.6]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-actuator-autoconfigure;external_dependency} -->
144144
<include>org.springframework.boot:spring-boot-configuration-processor:[2.6.6]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-configuration-processor;external_dependency} -->
145-
<include>org.springframework.cloud:spring-cloud-context:[3.1.1]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-context;external_dependency} -->
146-
<include>org.springframework.cloud:spring-cloud-starter-bootstrap:[3.1.1]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-starter-bootstrap;external_dependency} -->
145+
<include>org.springframework.cloud:spring-cloud-context:[3.1.2]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-context;external_dependency} -->
146+
<include>org.springframework.cloud:spring-cloud-starter-bootstrap:[3.1.2]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-starter-bootstrap;external_dependency} -->
147147
<include>org.springframework:spring-web:[5.3.18]</include> <!-- {x-include-update;org.springframework:spring-web;external_dependency} -->
148148
</includes>
149149
</bannedDependencies>

sdk/appconfiguration/spring-cloud-azure-appconfiguration-config/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@
3636
<dependency>
3737
<groupId>org.springframework.cloud</groupId>
3838
<artifactId>spring-cloud-context</artifactId>
39-
<version>3.1.1</version> <!-- {x-version-update;org.springframework.cloud:spring-cloud-context;external_dependency} -->
39+
<version>3.1.2</version> <!-- {x-version-update;org.springframework.cloud:spring-cloud-context;external_dependency} -->
4040
</dependency>
4141
<dependency>
4242
<groupId>org.springframework.cloud</groupId>
4343
<artifactId>spring-cloud-starter-bootstrap</artifactId>
44-
<version>3.1.1</version> <!-- {x-version-update;org.springframework.cloud:spring-cloud-starter-bootstrap;external_dependency} -->
44+
<version>3.1.2</version> <!-- {x-version-update;org.springframework.cloud:spring-cloud-starter-bootstrap;external_dependency} -->
4545
</dependency>
4646
<dependency>
4747
<groupId>com.fasterxml.jackson.core</groupId>
@@ -158,8 +158,8 @@
158158
<include>org.springframework.boot:spring-boot-autoconfigure:[2.6.6]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-autoconfigure;external_dependency} -->
159159
<include>org.springframework.boot:spring-boot-actuator-autoconfigure:[2.6.6]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-actuator-autoconfigure;external_dependency} -->
160160
<include>org.springframework.boot:spring-boot-configuration-processor:[2.6.6]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-configuration-processor;external_dependency} -->
161-
<include>org.springframework.cloud:spring-cloud-context:[3.1.1]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-context;external_dependency} -->
162-
<include>org.springframework.cloud:spring-cloud-starter-bootstrap:[3.1.1]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-starter-bootstrap;external_dependency} -->
161+
<include>org.springframework.cloud:spring-cloud-context:[3.1.2]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-context;external_dependency} -->
162+
<include>org.springframework.cloud:spring-cloud-starter-bootstrap:[3.1.2]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-starter-bootstrap;external_dependency} -->
163163
<include>org.springframework:spring-web:[5.3.18]</include> <!-- {x-include-update;org.springframework:spring-web;external_dependency} -->
164164
</includes>
165165
</bannedDependencies>

sdk/resourcemanager/azure-resourcemanager-samples/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
<dependency>
119119
<groupId>io.fabric8</groupId>
120120
<artifactId>kubernetes-client</artifactId>
121-
<version>5.9.0</version> <!-- {x-version-update;io.fabric8:kubernetes-client;external_dependency} -->
121+
<version>5.10.2</version> <!-- {x-version-update;io.fabric8:kubernetes-client;external_dependency} -->
122122
</dependency>
123123
<dependency>
124124
<groupId>com.microsoft.sqlserver</groupId>
@@ -198,7 +198,7 @@
198198
<bannedDependencies>
199199
<includes>
200200
<include>org.apache.httpcomponents:httpclient:[4.5.13]</include> <!-- {x-include-update;org.apache.httpcomponents:httpclient;external_dependency} -->
201-
<include>io.fabric8:kubernetes-client:[5.9.0]</include> <!-- {x-include-update;io.fabric8:kubernetes-client;external_dependency} -->
201+
<include>io.fabric8:kubernetes-client:[5.10.2]</include> <!-- {x-include-update;io.fabric8:kubernetes-client;external_dependency} -->
202202
<include>com.jcraft:jsch:[0.1.55]</include> <!-- {x-include-update;resourcemanager_com.jcraft:jsch;external_dependency} -->
203203
<include>org.slf4j:slf4j-simple:[1.7.36]</include> <!-- {x-include-update;org.slf4j:slf4j-simple;external_dependency} -->
204204
<include>com.google.guava:guava:[30.1.1-jre]</include> <!-- {x-include-update;com.google.guava:guava;external_dependency} -->

sdk/spring/scripts/get_spring_boot_managed_external_dependencies.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
from pom import Pom
2424

2525
SPRING_BOOT_VERSION = '2.6.6'
26-
SPRING_CLOUD_VERSION = '2021.0.1'
26+
SPRING_CLOUD_VERSION = '2021.0.2'
2727

2828
ROOT_POMS = [
2929
'org.springframework.boot:spring-boot-starter-parent;{}'.format(SPRING_BOOT_VERSION),

0 commit comments

Comments
 (0)