Merge branch 'endgame-202205' into endgame-202205.next

wangmingliang-ms · wangmingliang-ms · commit bc251128052d · 2022-06-01T15:54:34.000+08:00
diff --git a/PluginsAndFeatures/AddLibrary/AzureLibraries/pom.xml b/PluginsAndFeatures/AddLibrary/AzureLibraries/pom.xml
@@ -41,7 +41,7 @@
   <properties>
     <azuretool.version>3.65.0</azuretool.version>
     <azuretool.sdk.version>3.31.0.qualifier</azuretool.sdk.version>
-    <azure.toolkit-lib.version>0.21.0</azure.toolkit-lib.version>
+    <azure.toolkit-lib.version>0.21.1</azure.toolkit-lib.version>
   </properties>
   <dependencyManagement>
     <dependencies>
diff --git a/PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.appservice/META-INF/MANIFEST.MF b/PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.appservice/META-INF/MANIFEST.MF
@@ -54,4 +54,4 @@ Export-Package: com.microsoft.azuretools.appservice,
  com.microsoft.azuretools.appservice.handlers,
  com.microsoft.azuretools.appservice.ui
 Bundle-ClassPath: .,
- target/lib/azure-toolkit-ide-appservice-lib-0.21.0.jar
+ target/lib/azure-toolkit-ide-appservice-lib-0.21.1.jar
diff --git a/PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.appservice/pom.xml b/PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.appservice/pom.xml
@@ -13,7 +13,7 @@
     <dependency>
       <groupId>com.microsoft.azure</groupId>
       <artifactId>azure-toolkit-ide-appservice-lib</artifactId>
-      <version>0.21.0</version>
+      <version>0.21.1</version>
     </dependency>
   </dependencies>
   <repositories>
diff --git a/PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.springcloud/META-INF/MANIFEST.MF b/PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.springcloud/META-INF/MANIFEST.MF
@@ -23,7 +23,7 @@ Require-Bundle: org.eclipse.ui,
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .,
- target/lib/azure-toolkit-ide-springcloud-lib-0.21.0.jar
+ target/lib/azure-toolkit-ide-springcloud-lib-0.21.1.jar
 Import-Package: com.microsoft.azuretools.core.actions,
  org.eclipse.core.expressions,
  org.eclipse.jface.text.hyperlink,
diff --git a/PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.springcloud/pom.xml b/PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.springcloud/pom.xml
@@ -13,7 +13,7 @@
     <dependency>
       <groupId>com.microsoft.azure</groupId>
       <artifactId>azure-toolkit-ide-springcloud-lib</artifactId>
-      <version>0.21.0</version>
+      <version>0.21.1</version>
     </dependency>
   </dependencies>
   <build>
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-base/build.gradle b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-base/build.gradle
@@ -4,7 +4,7 @@ plugins {
     id "io.freefair.aspectj.post-compile-weaving" version "6.0.0-m2"
 }
 ext {
-    azureToolkitVersion = "0.21.0"
+    azureToolkitVersion = "0.21.1"
 }
 group 'com.microsoft.azure.toolkit'
 apply plugin: 'java'
@@ -75,7 +75,7 @@ subprojects {
     apply plugin: 'io.freefair.aspectj.post-compile-weaving'
     apply plugin: 'io.spring.dependency-management'
     ext {
-        azureToolkitVersion = "0.21.0"
+        azureToolkitVersion = "0.21.1"
     }
 
     sourceCompatibility = javaVersion
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/build.gradle b/PluginsAndFeatures/azure-toolkit-for-intellij/build.gradle
@@ -8,7 +8,7 @@ plugins {
 }
 
 ext {
-    azureToolkitVersion = "0.21.0"
+    azureToolkitVersion = "0.21.1"
     azureToolkitUtilsVersion = "3.65.0"
 }
 
@@ -82,7 +82,7 @@ subprojects {
     apply plugin: 'io.freefair.aspectj.post-compile-weaving'
     apply plugin: 'io.spring.dependency-management'
     ext {
-        azureToolkitVersion = "0.21.0"
+        azureToolkitVersion = "0.21.1"
         azureToolkitUtilsVersion = "3.65.0"
     }
 
diff --git a/Utils/azure-toolkit-ide-libs/azure-toolkit-ide-applicationinsights-lib/pom.xml b/Utils/azure-toolkit-ide-libs/azure-toolkit-ide-applicationinsights-lib/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>azure-toolkit-ide-libs</artifactId>
         <groupId>com.microsoft.azure</groupId>
-        <version>0.21.0</version>
+        <version>0.21.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/Utils/azure-toolkit-ide-libs/azure-toolkit-ide-appservice-lib/pom.xml b/Utils/azure-toolkit-ide-libs/azure-toolkit-ide-appservice-lib/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>azure-toolkit-ide-libs</artifactId>
         <groupId>com.microsoft.azure</groupId>
-        <version>0.21.0</version>
+        <version>0.21.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/Utils/azure-toolkit-ide-libs/azure-toolkit-ide-arm-lib/pom.xml b/Utils/azure-toolkit-ide-libs/azure-toolkit-ide-arm-lib/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>azure-toolkit-ide-libs</artifactId>
         <groupId>com.microsoft.azure</groupId>
-        <version>0.21.0</version>
+        <version>0.21.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/Utils/azure-toolkit-ide-libs/azure-toolkit-ide-common-lib/pom.xml b/Utils/azure-toolkit-ide-libs/azure-toolkit-ide-common-lib/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>azure-toolkit-ide-libs</artifactId>
         <groupId>com.microsoft.azure</groupId>
-        <version>0.21.0</version>
+        <version>0.21.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/Utils/azure-toolkit-ide-libs/azure-toolkit-ide-containerregistry-lib/pom.xml b/Utils/azure-toolkit-ide-libs/azure-toolkit-ide-containerregistry-lib/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>azure-toolkit-ide-libs</artifactId>
         <groupId>com.microsoft.azure</groupId>
-        <version>0.21.0</version>
+        <version>0.21.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/Utils/azure-toolkit-ide-libs/azure-toolkit-ide-database-lib/pom.xml b/Utils/azure-toolkit-ide-libs/azure-toolkit-ide-database-lib/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>azure-toolkit-ide-libs</artifactId>
         <groupId>com.microsoft.azure</groupId>
-        <version>0.21.0</version>
+        <version>0.21.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/Utils/azure-toolkit-ide-libs/azure-toolkit-ide-redis-lib/pom.xml b/Utils/azure-toolkit-ide-libs/azure-toolkit-ide-redis-lib/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>azure-toolkit-ide-libs</artifactId>
         <groupId>com.microsoft.azure</groupId>
-        <version>0.21.0</version>
+        <version>0.21.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/Utils/azure-toolkit-ide-libs/azure-toolkit-ide-springcloud-lib/pom.xml b/Utils/azure-toolkit-ide-libs/azure-toolkit-ide-springcloud-lib/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>azure-toolkit-ide-libs</artifactId>
         <groupId>com.microsoft.azure</groupId>
-        <version>0.21.0</version>
+        <version>0.21.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/Utils/azure-toolkit-ide-libs/azure-toolkit-ide-storage-lib/pom.xml b/Utils/azure-toolkit-ide-libs/azure-toolkit-ide-storage-lib/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>azure-toolkit-ide-libs</artifactId>
         <groupId>com.microsoft.azure</groupId>
-        <version>0.21.0</version>
+        <version>0.21.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/Utils/azure-toolkit-ide-libs/azure-toolkit-ide-vm-lib/pom.xml b/Utils/azure-toolkit-ide-libs/azure-toolkit-ide-vm-lib/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>azure-toolkit-ide-libs</artifactId>
         <groupId>com.microsoft.azure</groupId>
-        <version>0.21.0</version>
+        <version>0.21.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/Utils/azure-toolkit-ide-libs/pom.xml b/Utils/azure-toolkit-ide-libs/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.microsoft.azure</groupId>
     <artifactId>azure-toolkit-ide-libs</artifactId>
-    <version>0.21.0</version>
+    <version>0.21.1</version>
     <packaging>pom</packaging>
     <name>Libs for Azure Toolkit for IDEs</name>
     <description>Wrapped libs of Microsoft Azure Toolkits for IDEs</description>
@@ -50,7 +50,7 @@
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
-        <azure.toolkit-lib.version>0.21.0</azure.toolkit-lib.version>
+        <azure.toolkit-lib.version>0.21.1</azure.toolkit-lib.version>
     </properties>
     <dependencyManagement>
         <dependencies>
diff --git a/Utils/azuretools-core/pom.xml b/Utils/azuretools-core/pom.xml
@@ -35,7 +35,7 @@
     <properties>
         <artifact.name>${project.artifactId}-${project.version}.jar</artifact.name>
         <checkstyle.skip>true</checkstyle.skip>
-        <azure-toolkit-ide-common-lib.version>0.21.0</azure-toolkit-ide-common-lib.version>
+        <azure-toolkit-ide-common-lib.version>0.21.1</azure-toolkit-ide-common-lib.version>
     </properties>
     <profiles>
         <profile>
diff --git a/Utils/pom.xml b/Utils/pom.xml
@@ -37,8 +37,8 @@
         <kotlin.jvmTargetVersion>1.8</kotlin.jvmTargetVersion>
         <findsecbugs.version>1.11.0</findsecbugs.version>
         <rx.version>1.3.8</rx.version>
-        <azure.toolkit-lib.version>0.21.0</azure.toolkit-lib.version>
-        <azure.toolkit-ide-lib.version>0.21.0</azure.toolkit-ide-lib.version>
+        <azure.toolkit-lib.version>0.21.1</azure.toolkit-lib.version>
+        <azure.toolkit-ide-lib.version>0.21.1</azure.toolkit-ide-lib.version>
         <powermock.version>2.0.9</powermock.version>
         <jetty.version>9.4.41.v20210516</jetty.version>
     </properties>

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ plugins {`
`4`	`4`	`id "io.freefair.aspectj.post-compile-weaving" version "6.0.0-m2"`
`5`	`5`	`}`
`6`	`6`	`ext {`
`7`		`- azureToolkitVersion = "0.21.0"`
	`7`	`+ azureToolkitVersion = "0.21.1"`
`8`	`8`	`}`
`9`	`9`	`group 'com.microsoft.azure.toolkit'`
`10`	`10`	`apply plugin: 'java'`
`@@ -75,7 +75,7 @@ subprojects {`
`75`	`75`	`apply plugin: 'io.freefair.aspectj.post-compile-weaving'`
`76`	`76`	`apply plugin: 'io.spring.dependency-management'`
`77`	`77`	`ext {`
`78`		`- azureToolkitVersion = "0.21.0"`
	`78`	`+ azureToolkitVersion = "0.21.1"`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`sourceCompatibility = javaVersion`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ plugins {`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`ext {`
`11`		`- azureToolkitVersion = "0.21.0"`
	`11`	`+ azureToolkitVersion = "0.21.1"`
`12`	`12`	`azureToolkitUtilsVersion = "3.65.0"`
`13`	`13`	`}`
`14`	`14`
`@@ -82,7 +82,7 @@ subprojects {`
`82`	`82`	`apply plugin: 'io.freefair.aspectj.post-compile-weaving'`
`83`	`83`	`apply plugin: 'io.spring.dependency-management'`
`84`	`84`	`ext {`
`85`		`- azureToolkitVersion = "0.21.0"`
	`85`	`+ azureToolkitVersion = "0.21.1"`
`86`	`86`	`azureToolkitUtilsVersion = "3.65.0"`
`87`	`87`	`}`
`88`	`88`