Skip to content

Commit 972aaa8

Browse files
authored
Upgrade to spring-cloud-dependencies:2021.0.0 (Azure#26124)
1 parent ee35a38 commit 972aaa8

File tree

54 files changed

+490
-350
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+490
-350
lines changed

eng/versioning/external_dependencies.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ commons-codec:commons-codec;1.15
4343
commons-net:commons-net;3.6
4444
io.cloudevents:cloudevents-api;2.2.0
4545
io.cloudevents:cloudevents-core;2.2.0
46-
io.fabric8:kubernetes-client;4.13.3
46+
io.fabric8:kubernetes-client;5.9.0
4747
io.github.bonigarcia:webdrivermanager;4.3.1
4848
io.micrometer:micrometer-core;1.8.0
4949
io.micrometer:micrometer-registry-azure-monitor;1.8.0
@@ -152,13 +152,13 @@ org.springframework:spring-webflux;5.3.13
152152
org.springframework.boot:spring-boot-starter-parent;2.6.1
153153

154154
## Spring cloud dependency versions
155-
org.springframework.cloud:spring-cloud-dependencies;2020.0.4
156-
org.springframework.cloud:spring-cloud-starter-bootstrap;3.0.4
157-
org.springframework.cloud:spring-cloud-bus;3.0.3
158-
org.springframework.cloud:spring-cloud-context;3.0.4
159-
org.springframework.cloud:spring-cloud-starter-stream-kafka;3.1.4
160-
org.springframework.cloud:spring-cloud-stream-binder-test;3.1.4
161-
org.springframework.cloud:spring-cloud-stream;3.1.4
155+
org.springframework.cloud:spring-cloud-dependencies;2021.0.0
156+
org.springframework.cloud:spring-cloud-starter-bootstrap;3.1.0
157+
org.springframework.cloud:spring-cloud-bus;3.1.0
158+
org.springframework.cloud:spring-cloud-context;3.1.0
159+
org.springframework.cloud:spring-cloud-starter-stream-kafka;3.2.1
160+
org.springframework.cloud:spring-cloud-stream-binder-test;3.2.1
161+
org.springframework.cloud:spring-cloud-stream;3.2.1
162162

163163
pl.pragmatists:JUnitParams;1.1.1
164164

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<dependency>
4343
<groupId>org.springframework.cloud</groupId>
4444
<artifactId>spring-cloud-bus</artifactId>
45-
<version>3.0.3</version> <!-- {x-version-update;org.springframework.cloud:spring-cloud-bus;external_dependency} -->
45+
<version>3.1.0</version> <!-- {x-version-update;org.springframework.cloud:spring-cloud-bus;external_dependency} -->
4646
<optional>true</optional>
4747
</dependency>
4848
<dependency>
@@ -101,7 +101,7 @@
101101
<includes>
102102
<include>org.springframework.boot:spring-boot-starter-actuator:[2.6.1]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-actuator;external_dependency} -->
103103
<include>org.springframework.boot:spring-boot-starter-web:[2.6.1]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-web;external_dependency} -->
104-
<include>org.springframework.cloud:spring-cloud-bus:[3.0.3]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-bus;external_dependency} -->
104+
<include>org.springframework.cloud:spring-cloud-bus:[3.1.0]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-bus;external_dependency} -->
105105
</includes>
106106
</bannedDependencies>
107107
</rules>

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.0.4</version> <!-- {x-version-update;org.springframework.cloud:spring-cloud-starter-bootstrap;external_dependency} -->
45+
<version>3.1.0</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.0.4</version> <!-- {x-version-update;org.springframework.cloud:spring-cloud-context;external_dependency} -->
50+
<version>3.1.0</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.1]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-autoconfigure;external_dependency} -->
143143
<include>org.springframework.boot:spring-boot-actuator-autoconfigure:[2.6.1]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-actuator-autoconfigure;external_dependency} -->
144144
<include>org.springframework.boot:spring-boot-configuration-processor:[2.6.1]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-configuration-processor;external_dependency} -->
145-
<include>org.springframework.cloud:spring-cloud-context:[3.0.4]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-context;external_dependency} -->
146-
<include>org.springframework.cloud:spring-cloud-starter-bootstrap:[3.0.4]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-starter-bootstrap;external_dependency} -->
145+
<include>org.springframework.cloud:spring-cloud-context:[3.1.0]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-context;external_dependency} -->
146+
<include>org.springframework.cloud:spring-cloud-starter-bootstrap:[3.1.0]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-starter-bootstrap;external_dependency} -->
147147
<include>org.springframework:spring-web:[5.3.13]</include> <!-- {x-include-update;org.springframework:spring-web;external_dependency} -->
148148
</includes>
149149
</bannedDependencies>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<dependency>
3838
<groupId>org.springframework.cloud</groupId>
3939
<artifactId>spring-cloud-bus</artifactId>
40-
<version>3.0.3</version> <!-- {x-version-update;org.springframework.cloud:spring-cloud-bus;external_dependency} -->
40+
<version>3.1.0</version> <!-- {x-version-update;org.springframework.cloud:spring-cloud-bus;external_dependency} -->
4141
<optional>true</optional>
4242
<scope>compile</scope>
4343
</dependency>
@@ -86,7 +86,7 @@
8686
<include>org.springframework.boot:spring-boot-starter-actuator:[2.6.1]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-actuator;external_dependency} -->
8787
<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} -->
8888
<include>org.springframework.boot:spring-boot-starter-web:[2.6.1]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-web;external_dependency} -->
89-
<include>org.springframework.cloud:spring-cloud-bus:[3.0.3]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-bus;external_dependency} -->
89+
<include>org.springframework.cloud:spring-cloud-bus:[3.1.0]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-bus;external_dependency} -->
9090
</includes>
9191
</bannedDependencies>
9292
</rules>

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.0.4</version> <!-- {x-version-update;org.springframework.cloud:spring-cloud-context;external_dependency} -->
39+
<version>3.1.0</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.0.4</version> <!-- {x-version-update;org.springframework.cloud:spring-cloud-starter-bootstrap;external_dependency} -->
44+
<version>3.1.0</version> <!-- {x-version-update;org.springframework.cloud:spring-cloud-starter-bootstrap;external_dependency} -->
4545
</dependency>
4646
<dependency>
4747
<groupId>com.fasterxml.jackson.core</groupId>
@@ -170,8 +170,8 @@
170170
<include>org.springframework.boot:spring-boot-autoconfigure:[2.6.1]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-autoconfigure;external_dependency} -->
171171
<include>org.springframework.boot:spring-boot-actuator-autoconfigure:[2.6.1]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-actuator-autoconfigure;external_dependency} -->
172172
<include>org.springframework.boot:spring-boot-configuration-processor:[2.6.1]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-configuration-processor;external_dependency} -->
173-
<include>org.springframework.cloud:spring-cloud-context:[3.0.4]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-context;external_dependency} -->
174-
<include>org.springframework.cloud:spring-cloud-starter-bootstrap:[3.0.4]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-starter-bootstrap;external_dependency} -->
173+
<include>org.springframework.cloud:spring-cloud-context:[3.1.0]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-context;external_dependency} -->
174+
<include>org.springframework.cloud:spring-cloud-starter-bootstrap:[3.1.0]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-starter-bootstrap;external_dependency} -->
175175
<include>org.springframework:spring-web:[5.3.13]</include> <!-- {x-include-update;org.springframework:spring-web;external_dependency} -->
176176
</includes>
177177
</bannedDependencies>

sdk/automanage/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<plugin>
2424
<groupId>org.jacoco</groupId>
2525
<artifactId>jacoco-maven-plugin</artifactId>
26-
<version>0.8.5</version> <!-- {x-version-update;org.jacoco:jacoco-maven-plugin;external_dependency} -->
26+
<version>0.8.7</version> <!-- {x-version-update;org.jacoco:jacoco-maven-plugin;external_dependency} -->
2727
<executions>
2828
<execution>
2929
<id>report-aggregate</id>

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>4.13.3</version> <!-- {x-version-update;io.fabric8:kubernetes-client;external_dependency} -->
121+
<version>5.9.0</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:[4.13.3]</include> <!-- {x-include-update;io.fabric8:kubernetes-client;external_dependency} -->
201+
<include>io.fabric8:kubernetes-client:[5.9.0]</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.32]</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/azure-identity-spring/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Release History
22

33
## 1.12.0-beta.1 (Unreleased)
4+
This release is compatible with Spring Boot 2.5.5-2.5.8, 2.6.0-2.6.1.
45

56
### Features Added
67

@@ -10,6 +11,9 @@
1011

1112
### Other Changes
1213

14+
### Dependency Upgrades
15+
- Upgrade to [spring-boot-dependencies:2.6.1](https://repo1.maven.org/maven2/org/springframework/boot/spring-boot-dependencies/2.6.1/spring-boot-dependencies-2.6.1.pom).
16+
1317
## 1.11.0 (2021-11-24)
1418

1519
This release is compatible with Spring Boot 2.5.0 - 2.5.4.

sdk/spring/azure-spring-boot-starter-active-directory-b2c/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Release History
22

33
## 3.12.0-beta.1 (Unreleased)
4+
This release is compatible with Spring Boot 2.5.5-2.5.8, 2.6.0-2.6.1.
45

56
### Features Added
67

@@ -10,6 +11,9 @@
1011

1112
### Other Changes
1213

14+
### Dependency Upgrades
15+
- Upgrade to [spring-boot-dependencies:2.6.1](https://repo1.maven.org/maven2/org/springframework/boot/spring-boot-dependencies/2.6.1/spring-boot-dependencies-2.6.1.pom).
16+
1317
## 3.11.0 (2021-11-24)
1418

1519
This release is compatible with Spring Boot 2.5.0 - 2.5.4.

sdk/spring/azure-spring-boot-starter-active-directory/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Release History
22

33
## 3.12.0-beta.1 (Unreleased)
4+
This release is compatible with Spring Boot 2.5.5-2.5.8, 2.6.0-2.6.1.
45

56
### Features Added
67

@@ -10,6 +11,9 @@
1011

1112
### Other Changes
1213

14+
### Dependency Upgrades
15+
- Upgrade to [spring-boot-dependencies:2.6.1](https://repo1.maven.org/maven2/org/springframework/boot/spring-boot-dependencies/2.6.1/spring-boot-dependencies-2.6.1.pom).
16+
1317
## 3.11.0 (2021-11-24)
1418

1519
This release is compatible with Spring Boot 2.5.0 - 2.5.4.

0 commit comments

Comments
 (0)