udpate version for appconfiguration april release (#28590)

Azure · Apr 29, 2022 · 2e9ee69 · 2e9ee69
1 parent 693b197
commit 2e9ee69
Show file tree

Hide file tree

Showing 13 changed files with 53 additions and 58 deletions.
diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt
@@ -153,11 +153,11 @@ com.microsoft.azure:spring-cloud-azure-appconfiguration-config;1.3.0;1.4.0-beta.
 com.microsoft.azure:spring-cloud-azure-feature-management-web;1.3.0;1.4.0-beta.1
 com.microsoft.azure:spring-cloud-azure-feature-management;1.3.0;1.4.0-beta.1
 com.microsoft.azure:spring-cloud-starter-azure-appconfiguration-config;1.3.0;1.4.0-beta.1
-com.azure.spring:azure-spring-cloud-appconfiguration-config-web;2.5.0;2.6.0-beta.1
-com.azure.spring:azure-spring-cloud-appconfiguration-config;2.5.0;2.6.0-beta.1
-com.azure.spring:azure-spring-cloud-feature-management-web;2.4.0;2.5.0-beta.1
-com.azure.spring:azure-spring-cloud-feature-management;2.4.0;2.5.0-beta.1
-com.azure.spring:azure-spring-cloud-starter-appconfiguration-config;2.5.0;2.6.0-beta.1
+com.azure.spring:azure-spring-cloud-appconfiguration-config-web;2.5.0;2.6.0
+com.azure.spring:azure-spring-cloud-appconfiguration-config;2.5.0;2.6.0
+com.azure.spring:azure-spring-cloud-feature-management-web;2.4.0;2.5.0
+com.azure.spring:azure-spring-cloud-feature-management;2.4.0;2.5.0
+com.azure.spring:azure-spring-cloud-starter-appconfiguration-config;2.5.0;2.6.0
 com.azure.spring:spring-cloud-azure-dependencies;4.0.0;4.1.0-beta.1
 com.azure.spring:spring-messaging-azure;4.0.0;4.1.0-beta.1
 com.azure.spring:spring-messaging-azure-eventhubs;4.0.0;4.1.0-beta.1

diff --git a/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/CHANGELOG.md b/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/CHANGELOG.md
@@ -1,14 +1,13 @@
 # Release History
 
-## 2.6.0-beta.1 (Unreleased)
+## 2.6.0 (2022-04-29)
+- This release is compatible with Spring Boot 2.5.0-2.5.13, 2.6.0-2.6.7. (Note: 2.5.x (x>13) and 2.6.y (y>7) should be supported, but they aren't tested with this release.)
+- This release is compatible with Spring Cloud 2020.0.3-2020.0.5, 2021.0.0-2021.0.2. (Note: 2020.0.x (x>5) and 2021.0.y (y>2) should be supported, but they aren't tested with this release.)
 
-### Features Added
-
-### Breaking Changes
-
-### Bugs Fixed
-
-### Other Changes
+### Dependency Upgrades
+- Regular updates for Azure SDK dependency versions.
+- Upgrade external dependencies' version according to [spring-boot-dependencies:2.6.6](https://repo1.maven.org/maven2/org/springframework/boot/spring-boot-dependencies/2.6.6/spring-boot-dependencies-2.6.6.pom) to address [CVE-2022-22965](https://github.com/advisories/GHSA-36p3-wjmg-h94x) [#28280](https://github.com/Azure/azure-sdk-for-java/pull/28280).
+- Upgrade external dependencies' version according to [spring-cloud-dependencies:2021.0.2](https://repo1.maven.org/maven2/org/springframework/cloud/spring-cloud-dependencies/2021.0.2/spring-cloud-dependencies-2021.0.2.pom) to address [CVE-2022-22963](https://github.com/advisories/GHSA-6v73-fgf6-w5j7) [#28179](https://github.com/Azure/azure-sdk-for-java/issues/28179).
 
 ## 2.5.0 (2022-03-28)
 This release is compatible with Spring Boot 2.5.0-2.5.11, 2.6.0-2.6.5.

diff --git a/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/pom.xml b/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/pom.xml
@@ -12,7 +12,7 @@
 
     <groupId>com.azure.spring</groupId>
     <artifactId>azure-spring-cloud-appconfiguration-config-web</artifactId>
-    <version>2.6.0-beta.1</version><!-- {x-version-update;com.azure.spring:azure-spring-cloud-appconfiguration-config-web;current} -->
+    <version>2.6.0</version><!-- {x-version-update;com.azure.spring:azure-spring-cloud-appconfiguration-config-web;current} -->
     <name>Azure Spring Cloud App Configuration Config Web</name>
     <description>Integration of Spring Cloud Config and Azure App Configuration Service</description>
 
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>com.azure.spring</groupId>
             <artifactId>azure-spring-cloud-appconfiguration-config</artifactId>
-            <version>2.6.0-beta.1</version><!-- {x-version-update;com.azure.spring:azure-spring-cloud-appconfiguration-config;current} -->
+            <version>2.6.0</version><!-- {x-version-update;com.azure.spring:azure-spring-cloud-appconfiguration-config;current} -->
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

diff --git a/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/CHANGELOG.md b/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/CHANGELOG.md
@@ -1,14 +1,13 @@
 # Release History
 
-## 2.6.0-beta.1 (Unreleased)
+## 2.6.0 (2022-04-29)
+- This release is compatible with Spring Boot 2.5.0-2.5.13, 2.6.0-2.6.7. (Note: 2.5.x (x>13) and 2.6.y (y>7) should be supported, but they aren't tested with this release.)
+- This release is compatible with Spring Cloud 2020.0.3-2020.0.5, 2021.0.0-2021.0.2. (Note: 2020.0.x (x>5) and 2021.0.y (y>2) should be supported, but they aren't tested with this release.)
 
-### Features Added
-
-### Breaking Changes
-
-### Bugs Fixed
-
-### Other Changes
+### Dependency Upgrades
+- Regular updates for Azure SDK dependency versions.
+- Upgrade external dependencies' version according to [spring-boot-dependencies:2.6.6](https://repo1.maven.org/maven2/org/springframework/boot/spring-boot-dependencies/2.6.6/spring-boot-dependencies-2.6.6.pom) to address [CVE-2022-22965](https://github.com/advisories/GHSA-36p3-wjmg-h94x) [#28280](https://github.com/Azure/azure-sdk-for-java/pull/28280).
+- Upgrade external dependencies' version according to [spring-cloud-dependencies:2021.0.2](https://repo1.maven.org/maven2/org/springframework/cloud/spring-cloud-dependencies/2021.0.2/spring-cloud-dependencies-2021.0.2.pom) to address [CVE-2022-22963](https://github.com/advisories/GHSA-6v73-fgf6-w5j7) [#28179](https://github.com/Azure/azure-sdk-for-java/issues/28179).
 
 ## 2.5.0 (2022-03-28)
 This release is compatible with Spring Boot 2.5.0-2.5.11, 2.6.0-2.6.5.

diff --git a/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/pom.xml b/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/pom.xml
@@ -12,7 +12,7 @@
 
     <groupId>com.azure.spring</groupId>
     <artifactId>azure-spring-cloud-appconfiguration-config</artifactId>
-    <version>2.6.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-appconfiguration-config;current} -->
+    <version>2.6.0</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-appconfiguration-config;current} -->
     <name>Azure Spring Cloud App Configuration Config</name>
     <description>Integration of Spring Cloud Config and Azure App Configuration Service</description>
 

diff --git a/sdk/appconfiguration/azure-spring-cloud-feature-management-web/CHANGELOG.md b/sdk/appconfiguration/azure-spring-cloud-feature-management-web/CHANGELOG.md
@@ -1,14 +1,13 @@
 # Release History
 
-## 2.5.0-beta.1 (Unreleased)
+## 2.5.0 (2022-04-29)
+- This release is compatible with Spring Boot 2.5.0-2.5.13, 2.6.0-2.6.7. (Note: 2.5.x (x>13) and 2.6.y (y>7) should be supported, but they aren't tested with this release.)
+- This release is compatible with Spring Cloud 2020.0.3-2020.0.5, 2021.0.0-2021.0.2. (Note: 2020.0.x (x>5) and 2021.0.y (y>2) should be supported, but they aren't tested with this release.)
 
-### Features Added
-
-### Breaking Changes
-
-### Bugs Fixed
-
-### Other Changes
+### Dependency Upgrades
+- Regular updates for Azure SDK dependency versions.
+- Upgrade external dependencies' version according to [spring-boot-dependencies:2.6.6](https://repo1.maven.org/maven2/org/springframework/boot/spring-boot-dependencies/2.6.6/spring-boot-dependencies-2.6.6.pom) to address [CVE-2022-22965](https://github.com/advisories/GHSA-36p3-wjmg-h94x) [#28280](https://github.com/Azure/azure-sdk-for-java/pull/28280).
+- Upgrade external dependencies' version according to [spring-cloud-dependencies:2021.0.2](https://repo1.maven.org/maven2/org/springframework/cloud/spring-cloud-dependencies/2021.0.2/spring-cloud-dependencies-2021.0.2.pom) to address [CVE-2022-22963](https://github.com/advisories/GHSA-6v73-fgf6-w5j7) [#28179](https://github.com/Azure/azure-sdk-for-java/issues/28179).
 
 ## 2.4.0 (2022-03-28)
 This release is compatible with Spring Boot 2.5.0-2.5.11, 2.6.0-2.6.5.

diff --git a/sdk/appconfiguration/azure-spring-cloud-feature-management-web/pom.xml b/sdk/appconfiguration/azure-spring-cloud-feature-management-web/pom.xml
@@ -11,7 +11,7 @@
 
   <groupId>com.azure.spring</groupId>
   <artifactId>azure-spring-cloud-feature-management-web</artifactId>
-  <version>2.5.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-feature-management-web;current} -->
+  <version>2.5.0</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-feature-management-web;current} -->
   <name>Azure Spring Cloud Feature Management Web</name>
   <description>Adds Feature Management into Spring Web</description>
 
@@ -45,7 +45,7 @@
     <dependency>
       <groupId>com.azure.spring</groupId>
       <artifactId>azure-spring-cloud-feature-management</artifactId>
-      <version>2.5.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-feature-management;current} -->
+      <version>2.5.0</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-feature-management;current} -->
     </dependency>
     <!-- Added this dependency to include necessary annotations used by reactor core.
     Without this dependency, javadoc throws a warning as it cannot find enum When.MAYBE
@@ -73,7 +73,7 @@
           <rules>
             <bannedDependencies>
               <includes>
-                <include>com.azure.spring:azure-spring-cloud-feature-management:[2.5.0-beta.1]</include> <!-- {x-include-update;com.azure.spring:azure-spring-cloud-feature-management;current} -->
+                <include>com.azure.spring:azure-spring-cloud-feature-management:[2.5.0]</include> <!-- {x-include-update;com.azure.spring:azure-spring-cloud-feature-management;current} -->
                 <include>javax.servlet:javax.servlet-api:[4.0.1]</include> <!-- {x-include-update;javax.servlet:javax.servlet-api;external_dependency} -->
                 <include>org.springframework:spring-web:[5.3.18]</include> <!-- {x-include-update;org.springframework:spring-web;external_dependency} -->
                 <include>org.springframework:spring-webmvc:[5.3.18]</include> <!-- {x-include-update;org.springframework:spring-webmvc;external_dependency} -->

diff --git a/sdk/appconfiguration/azure-spring-cloud-feature-management/CHANGELOG.md b/sdk/appconfiguration/azure-spring-cloud-feature-management/CHANGELOG.md
@@ -1,14 +1,13 @@
 # Release History
 
-## 2.5.0-beta.1 (Unreleased)
+## 2.5.0 (2022-04-29)
+- This release is compatible with Spring Boot 2.5.0-2.5.13, 2.6.0-2.6.7. (Note: 2.5.x (x>13) and 2.6.y (y>7) should be supported, but they aren't tested with this release.)
+- This release is compatible with Spring Cloud 2020.0.3-2020.0.5, 2021.0.0-2021.0.2. (Note: 2020.0.x (x>5) and 2021.0.y (y>2) should be supported, but they aren't tested with this release.)
 
-### Features Added
-
-### Breaking Changes
-
-### Bugs Fixed
-
-### Other Changes
+### Dependency Upgrades
+- Regular updates for Azure SDK dependency versions.
+- Upgrade external dependencies' version according to [spring-boot-dependencies:2.6.6](https://repo1.maven.org/maven2/org/springframework/boot/spring-boot-dependencies/2.6.6/spring-boot-dependencies-2.6.6.pom) to address [CVE-2022-22965](https://github.com/advisories/GHSA-36p3-wjmg-h94x) [#28280](https://github.com/Azure/azure-sdk-for-java/pull/28280).
+- Upgrade external dependencies' version according to [spring-cloud-dependencies:2021.0.2](https://repo1.maven.org/maven2/org/springframework/cloud/spring-cloud-dependencies/2021.0.2/spring-cloud-dependencies-2021.0.2.pom) to address [CVE-2022-22963](https://github.com/advisories/GHSA-6v73-fgf6-w5j7) [#28179](https://github.com/Azure/azure-sdk-for-java/issues/28179).
 
 ## 2.4.0 (2022-03-28)
 This release is compatible with Spring Boot 2.5.0-2.5.11, 2.6.0-2.6.5.

diff --git a/sdk/appconfiguration/azure-spring-cloud-feature-management/pom.xml b/sdk/appconfiguration/azure-spring-cloud-feature-management/pom.xml
@@ -11,7 +11,7 @@
 
   <groupId>com.azure.spring</groupId>
   <artifactId>azure-spring-cloud-feature-management</artifactId>
-  <version>2.5.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-feature-management;current} -->
+  <version>2.5.0</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-feature-management;current} -->
   <name>Azure Spring Cloud Feature Management</name>
   <description>Adds Feature Management into Spring</description>
 

diff --git a/...ppconfiguration/azure-spring-cloud-starter-appconfiguration-config/CHANGELOG.md b/...ppconfiguration/azure-spring-cloud-starter-appconfiguration-config/CHANGELOG.md
@@ -1,14 +1,13 @@
 # Release History
 
-## 2.6.0-beta.1 (Unreleased)
+## 2.6.0 (2022-04-29)
+- This release is compatible with Spring Boot 2.5.0-2.5.13, 2.6.0-2.6.7. (Note: 2.5.x (x>13) and 2.6.y (y>7) should be supported, but they aren't tested with this release.)
+- This release is compatible with Spring Cloud 2020.0.3-2020.0.5, 2021.0.0-2021.0.2. (Note: 2020.0.x (x>5) and 2021.0.y (y>2) should be supported, but they aren't tested with this release.)
 
-### Features Added
-
-### Breaking Changes
-
-### Bugs Fixed
-
-### Other Changes
+### Dependency Upgrades
+- Regular updates for Azure SDK dependency versions.
+- Upgrade external dependencies' version according to [spring-boot-dependencies:2.6.6](https://repo1.maven.org/maven2/org/springframework/boot/spring-boot-dependencies/2.6.6/spring-boot-dependencies-2.6.6.pom) to address [CVE-2022-22965](https://github.com/advisories/GHSA-36p3-wjmg-h94x) [#28280](https://github.com/Azure/azure-sdk-for-java/pull/28280).
+- Upgrade external dependencies' version according to [spring-cloud-dependencies:2021.0.2](https://repo1.maven.org/maven2/org/springframework/cloud/spring-cloud-dependencies/2021.0.2/spring-cloud-dependencies-2021.0.2.pom) to address [CVE-2022-22963](https://github.com/advisories/GHSA-6v73-fgf6-w5j7) [#28179](https://github.com/Azure/azure-sdk-for-java/issues/28179).
 
 ## 2.5.0 (2022-03-28)
 This release is compatible with Spring Boot 2.5.0-2.5.11, 2.6.0-2.6.5.

diff --git a/sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config/README.md b/sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config/README.md
@@ -21,7 +21,7 @@ There are two libraries that can be used azure-spring-cloud-appconfiguration-con
 <dependency>
     <groupId>com.azure.spring</groupId>
     <artifactId>azure-spring-cloud-appconfiguration-config</artifactId>
-    <version>2.4.0</version>
+    <version>2.6.0</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
@@ -33,7 +33,7 @@ or
 <dependency>
     <groupId>com.azure.spring</groupId>
     <artifactId>azure-spring-cloud-appconfiguration-config-web</artifactId>
-    <version>2.4.0</version>
+    <version>2.6.0</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})

diff --git a/sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config/pom.xml b/sdk/appconfiguration/azure-spring-cloud-starter-appconfiguration-config/pom.xml
@@ -11,19 +11,19 @@
 
   <groupId>com.azure.spring</groupId>
   <artifactId>azure-spring-cloud-starter-appconfiguration-config</artifactId>
-  <version>2.6.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-starter-appconfiguration-config;current} -->
+  <version>2.6.0</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-starter-appconfiguration-config;current} -->
   <name>Azure Spring Cloud Starter App Configuration Config</name>
 
   <dependencies>
     <dependency>
       <groupId>com.azure.spring</groupId>
       <artifactId>azure-spring-cloud-appconfiguration-config-web</artifactId>
-      <version>2.6.0-beta.1</version><!-- {x-version-update;com.azure.spring:azure-spring-cloud-appconfiguration-config-web;current} -->
+      <version>2.6.0</version><!-- {x-version-update;com.azure.spring:azure-spring-cloud-appconfiguration-config-web;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure.spring</groupId>
       <artifactId>azure-spring-cloud-feature-management-web</artifactId>
-      <version>2.5.0-beta.1</version><!-- {x-version-update;com.azure.spring:azure-spring-cloud-feature-management-web;current} -->
+      <version>2.5.0</version><!-- {x-version-update;com.azure.spring:azure-spring-cloud-feature-management-web;current} -->
     </dependency>
   </dependencies>
 </project>
diff --git a/sdk/appconfiguration/azure-spring-cloud-test-appconfiguration-config/pom.xml b/sdk/appconfiguration/azure-spring-cloud-test-appconfiguration-config/pom.xml
@@ -24,7 +24,7 @@
         <dependency>
             <groupId>com.azure.spring</groupId>
             <artifactId>azure-spring-cloud-starter-appconfiguration-config</artifactId>
-            <version>2.6.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-starter-appconfiguration-config;current} -->
+            <version>2.6.0</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-starter-appconfiguration-config;current} -->
         </dependency>
         <dependency>
             <groupId>com.microsoft.azure</groupId>