Merge branch 'endgame-june' into qianjin-endgame-june-fix

Author: shenqianjin

PluginsAndFeatures/AddLibrary/AzureLibraries/pom.xml

@@ -28,7 +28,7 @@
     <parent>
     <groupId>com.microsoft.azuretools</groupId>
     <artifactId>utils</artifactId>
-    <version>3.54.0-SNAPSHOT</version>
+    <version>3.54.0</version>
     </parent>
     <groupId>com.microsoft.azuretools</groupId>
     <artifactId>com.microsoft.azuretools.sdk.lib</artifactId>
@@ -38,7 +38,7 @@
     <organization><name>Microsoft Corp.</name></organization>
 
     <properties>
-        <azuretool.version>3.54.0-SNAPSHOT</azuretool.version>
+        <azuretool.version>3.54.0</azuretool.version>
         <azuretool.sdk.version>3.25.0.qualifier</azuretool.sdk.version>
     </properties>
     <dependencies>

PluginsAndFeatures/azure-toolkit-for-intellij/azure-sdk-reference-book/build.gradle

@@ -12,7 +12,7 @@ dependencies {
         exclude group: "com.fasterxml.jackson", module: "jackson-bom"
     }
     compile project(':azure-intellij-plugin-lib')
-    compile "com.microsoft.azure:azure-toolkit-common-lib:0.9.0-SNAPSHOT"
+    compile "com.microsoft.azure:azure-toolkit-common-lib:0.9.0"
 
-    aspect "com.microsoft.azure:azure-toolkit-common-lib:0.9.0-SNAPSHOT"
+    aspect "com.microsoft.azure:azure-toolkit-common-lib:0.9.0"
 }

PluginsAndFeatures/azure-toolkit-for-intellij/build.gradle

@@ -98,7 +98,7 @@ subprojects {
         compileOnly 'org.projectlombok:lombok:1.18.20'
         annotationProcessor 'org.projectlombok:lombok:1.18.20'
 
-        compile 'com.microsoft.azure:azure-toolkit-common-lib:0.9.0-SNAPSHOT', {
+        compile 'com.microsoft.azure:azure-toolkit-common-lib:0.9.0', {
             exclude group: "com.squareup.okhttp3", module: "okhttp"
             exclude group: "com.squareup.okhttp3", module: "okhttp-urlconnection"
             exclude group: "com.squareup.okhttp3", module: "logging-interceptor"
@@ -143,7 +143,7 @@ apply plugin: 'java'
 
 dependencyManagement {
     imports {
-        mavenBom 'com.microsoft.azure:azure-toolkit-libs:0.9.0-SNAPSHOT'
+        mavenBom 'com.microsoft.azure:azure-toolkit-libs:0.9.0'
     }
 }
 
@@ -169,17 +169,17 @@ dependencies {
         exclude group: "com.squareup.okhttp3", module: "logging-interceptor"
     }
 
-    compile 'com.microsoft.azuretools:azuretools-core:3.54.0-SNAPSHOT', {
+    compile 'com.microsoft.azuretools:azuretools-core:3.54.0', {
         exclude group: "com.microsoft.azure", module: "azure-client-authentication"
         exclude group: "com.microsoft.azure", module: "azure-client-runtime"
         exclude group: "javax.xml.bind", module: "jaxb-api"
     }
-    compile 'com.microsoft.azuretools:azure-explorer-common:3.54.0-SNAPSHOT', {
+    compile 'com.microsoft.azuretools:azure-explorer-common:3.54.0', {
         exclude group: "com.microsoft.azure", module: "azure-client-authentication"
         exclude group: "com.microsoft.azure", module: "azure-client-runtime"
         exclude group: "javax.xml.bind", module: "jaxb-api"
     }
-    compile 'com.microsoft.azuretools:hdinsight-node-common:3.54.0-SNAPSHOT', {
+    compile 'com.microsoft.azuretools:hdinsight-node-common:3.54.0', {
         exclude group: "com.microsoft.azure", module: "azure-client-authentication"
         exclude group: "com.microsoft.azure", module: "azure-client-runtime"
         exclude group: "javax.xml.bind", module: "jaxb-api"

PluginsAndFeatures/azure-toolkit-for-intellij/resources/META-INF/plugin.xml

@@ -2,7 +2,7 @@
              xmlns:xi="http://www.w3.org/2001/XInclude">
   <id>com.microsoft.tooling.msservices.intellij.azure</id>
   <name>Azure Toolkit for IntelliJ</name>
-  <version>3.54.0-SNAPSHOT</version>
+  <version>3.54.0</version>
   <vendor email="[email protected]" url="http://www.microsoft.com">Microsoft</vendor>
 
   <description><![CDATA[

Utils/azure-explorer-common/pom.xml

@@ -5,7 +5,7 @@
         <relativePath>../pom.xml</relativePath>
         <groupId>com.microsoft.azuretools</groupId>
         <artifactId>utils</artifactId>
-        <version>3.54.0-SNAPSHOT</version>
+        <version>3.54.0</version>
     </parent>
     <artifactId>azure-explorer-common</artifactId>
     <properties>

Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/mysql/MySQLModule.java

@@ -50,7 +50,9 @@ public void renderChildren(List<MySqlServer> servers) {
 
     @Override
     protected void refreshItems() {
-        this.renderChildren(Azure.az(AzureMySql.class).list());
+        final List<MySqlServer> server = Azure.az(AzureMySql.class).list();
+        this.removeAllChildNodes();
+        this.renderChildren(server);
     }
 
     @Override

Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/mysql/MySQLNode.java

@@ -48,7 +48,7 @@ public MySQLNode(AzureRefreshableNode parent, @Nonnull MySqlServer server) {
         this.server = server;
         this.serverState = server.entity().getState();
         loadActions();
-        AzureEventBus.after("mysql|server.restart", this::onMySqlServerStatusChanged);
+        AzureEventBus.after("mysql|server.start", this::onMySqlServerStatusChanged);
         AzureEventBus.after("mysql|server.stop", this::onMySqlServerStatusChanged);
         AzureEventBus.after("mysql|server.restart", this::onMySqlServerStatusChanged);
         AzureEventBus.before("mysql|server.start", this::onMySqlServerStatusChanging);

Utils/azuretools-core/pom.xml

@@ -29,7 +29,7 @@
         <relativePath>../pom.xml</relativePath>
         <groupId>com.microsoft.azuretools</groupId>
         <artifactId>utils</artifactId>
-        <version>3.54.0-SNAPSHOT</version>
+        <version>3.54.0</version>
     </parent>
     <artifactId>azuretools-core</artifactId>
     <properties>

Utils/hdinsight-node-common/pom.xml

@@ -4,7 +4,7 @@
         <relativePath>../pom.xml</relativePath>
         <groupId>com.microsoft.azuretools</groupId>
         <artifactId>utils</artifactId>
-        <version>3.54.0-SNAPSHOT</version>
+        <version>3.54.0</version>
     </parent>
     <groupId>com.microsoft.azuretools</groupId>
     <artifactId>hdinsight-node-common</artifactId>

Utils/pom.xml

@@ -27,11 +27,11 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.microsoft.azuretools</groupId>
     <artifactId>utils</artifactId>
-    <version>3.54.0-SNAPSHOT</version>
+    <version>3.54.0</version>
     <packaging>pom</packaging>
     <name>${project.artifactId}-${project.version}</name>
     <properties>
-        <azuretool.version>3.54.0-SNAPSHOT</azuretool.version>
+        <azuretool.version>3.54.0</azuretool.version>
         <kotlin.version>1.3.72</kotlin.version>
         <kotlin.jvmTargetVersion>1.8</kotlin.jvmTargetVersion>
         <findsecbugs.version>1.11.0</findsecbugs.version>
@@ -48,7 +48,7 @@
         <powermock.version>1.7.0RC4</powermock.version>
         <rx.version>1.3.8</rx.version>
 
-        <azure.toolkit-lib.version>0.9.0-SNAPSHOT</azure.toolkit-lib.version>
+        <azure.toolkit-lib.version>0.9.0</azure.toolkit-lib.version>
         <powermock.version>2.0.9</powermock.version>
     </properties>
     <modules>