Merge branch 'develop' into develop.next

Author: Flanker32

CHANGELOG.md

@@ -3,6 +3,7 @@
 All notable changes to "Azure Toolkit for IntelliJ IDEA" will be documented in this file.
 
 - [Change Log](#change-log)
+  - [3.48.0](#3480)
   - [3.47.0](#3470)
   - [3.46.0](#3460)
   - [3.45.1](#3451)
@@ -62,6 +63,14 @@ All notable changes to "Azure Toolkit for IntelliJ IDEA" will be documented in t
   - [3.0.7](#307)
   - [3.0.6](#306)
 
+## 3.48.0
+
+### Changed
+- Update icons in Azure toolkits
+- Update Tomcat base images
+- Using non-blocking UI to replace blocking progress indicator
+- Remove non-functional "cancel" buttons in foreground operations
+
 ## 3.47.0
 
 ### Added

PluginsAndFeatures/AddLibrary/AzureLibraries/pom.xml

@@ -28,7 +28,7 @@
     <parent>
     <groupId>com.microsoft.azuretools</groupId>
     <artifactId>utils</artifactId>
-    <version>3.48.0</version>
+    <version>3.49.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.48.0</azuretool.version>
+        <azuretool.version>3.49.0</azuretool.version>
         <azuretool.sdk.version>3.25.0.qualifier</azuretool.sdk.version>
     </properties>
     <dependencies>

PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.container/src/main/java/com/microsoft/azuretools/container/Constant.java

@@ -40,8 +40,9 @@ public class Constant {
     public static final String ERROR_CREATING_DOCKERFILE = "Error occurred in generating Dockerfile, "
             + "with exception:\n%s";
     public static final String ERROR_RUNNING_DOCKER = "Error occurred in Docker Run, with exception:\n%s";
-    public static final String DOCKERFILE_CONTENT_TOMCAT = "FROM tomcat:8.5-jre8\r\n"
-            + "RUN rm -fr /usr/local/tomcat/webapps/ROOT\r\n" + "COPY %s /usr/local/tomcat/webapps/ROOT.war\r\n";
+    public static final String DOCKERFILE_CONTENT_TOMCAT = "FROM mcr.microsoft.com/java/tomcat:8-zulu-alpine-tomcat-9" + System.lineSeparator()
+            + "RUN rm -fr /usr/local/tomcat/webapps/ROOT" + System.lineSeparator()
+            + "COPY %s /usr/local/tomcat/webapps/ROOT.war" + System.lineSeparator();
     public static final String DOCKERFILE_CONTENT_SPRING = "FROM azul/zulu-openjdk-alpine:8\r\n" + "VOLUME /tmp\r\n"
             + "EXPOSE 8080\r\n" + "COPY %s app.jar\r\n"
             + "ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom -jar /app.jar";

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

@@ -110,25 +110,25 @@ dependencies {
     compile 'net.minidev:json-smart:2.3'
     compile 'com.microsoft.azure:azure-client-runtime:1.7.5', { force = true }
     compile 'com.microsoft.azure:azure-client-authentication:1.7.5', { force = true }
-    aspect "com.microsoft.azuretools:azuretools-core:3.48.0"
-    compile 'com.microsoft.azuretools:azuretools-core:3.48.0', {
+    aspect "com.microsoft.azuretools:azuretools-core:3.49.0"
+    compile 'com.microsoft.azuretools:azuretools-core:3.49.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.48.0', {
+    compile 'com.microsoft.azuretools:azure-explorer-common:3.49.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.48.0', {
+    compile 'com.microsoft.azuretools:hdinsight-node-common:3.49.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 group: 'com.microsoft.azure', name: 'azure-auth-helper', version: '0.6.0'
     compile 'com.microsoft.azure:azure-tools-common:0.10.0'
-    compile group: 'com.microsoft.azure.appplatform.v2019_05_01_preview', name: 'azure-mgmt-appplatform', version: '1.0.0-beta-2'
+    compile group: 'com.microsoft.azure.appplatform.v2020_07_01', name: 'azure-mgmt-appplatform', version: '1.0.0-beta'
     compile group: 'org.dom4j', name: 'dom4j', version: '2.1.3', {
         exclude group: "javax.xml.stream", module: "stax-api"
         exclude group: "xpp3", module: "xpp3"
@@ -238,4 +238,4 @@ spotbugsMain {
     jvmArgs = [ '-Duser.language=en' ]
     includeFilter = file("$rootProject.projectDir/../../tools/spotbugs-security-include.xml")
     excludeFilter = file("$rootProject.projectDir/../../tools/spotbugs-security-exclude.xml")
-}
+}

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

@@ -1,7 +1,7 @@
 <idea-plugin url="https://github.com/Microsoft/azure-tools-for-java">
   <id>com.microsoft.tooling.msservices.intellij.azure</id>
   <name>Azure Toolkit for IntelliJ</name>
-  <version>3.47.0</version>
+  <version>3.48.0</version>
   <vendor email="[email protected]" url="http://www.microsoft.com">Microsoft</vendor>
 
   <description><![CDATA[
@@ -24,40 +24,13 @@
   <change-notes>
     <![CDATA[
     <html>
-    <h3>3.47.0</h3>
-    <h4>Added</h4>
-    <ul>
-        <li>Add Azure MySQL support in Azure Toolkits
-            <ul>
-                <li>Manage Azure Database for MySQL instance (create/start/stop/restart/configure/show properties)</li>
-                <li>Configure Azure Database for MySQL to allow access it from azure services and local PC</li>
-                <li>Show sample of JDBC connection strings on Azure Database for MySQL</li>
-                <li>Open and connect to Azure Database for MySQL server by Intellij database tools</li>
-            </ul>
-        </li>
-        <li>Add Stacktrace filter in Spark console</li>
-        <li>Enable speed search in subscription table</li>
-        <li>Enable speed search in Azure explorer tree</li>
-    </ul>
+    <h3>3.48.0</h3>
     <h4>Changed</h4>
     <ul>
-        <li>Upgrade Azure Blob batch SDK to 12.7.0</li>
-        <li>Enhance App Service file explorer in Azure explorer</li>
-    </ul>
-    <h4>Fixed</h4>
-    <ul>
-        <li><a href="https://github.com/microsoft/azure-tools-for-java/issues/4801">#4801</a> Spark tools library serializer
-            potential issues</li>
-        <li><a href="https://github.com/microsoft/azure-tools-for-java/issues/4808">#4808</a> Fixes unable to attach
-            function host while running functions</li>
-        <li><a href="https://github.com/microsoft/azure-tools-for-java/issues/4814">#4814</a> Spark livy console staring
-            being blocked by artifacts uploading failure</li>
-        <li><a href="https://github.com/microsoft/azure-tools-for-java/issues/4823">#4823</a> Compiling warnings of
-            ConfigurationFactory.getId being deprecated</li>
-        <li><a href="https://github.com/microsoft/azure-tools-for-java/issues/4827">#4827</a> Fix HDInsight cluster can't
-            link non-cluster-default Azure Blob storage account issue</li>
-        <li><a href="https://github.com/microsoft/azure-tools-for-java/issues/4829">#4829</a> UI hang issue with changing
-            Spark Synapse run configuration ADLS Gen2 storage key settings</li>
+        <li>Update icons in Azure toolkits</li>
+        <li>Update Tomcat base images</li>
+        <li>Using non-blocking UI to replace blocking progress indicator</li>
+        <li>Remove non-functional "cancel" buttons in foreground operations</li>
     </ul>
     <p>You may get the full change log <a
             href="https://github.com/Microsoft/azure-tools-for-java/blob/develop/CHANGELOG.md">here</a></p>
@@ -88,7 +61,7 @@
           factoryClass="com.microsoft.intellij.activitylog.ActivityLogToolWindowFactory"
           id="Azure Activity Log"
           canCloseContents="true"
-          icon="/icons/RoleFolder.gif"/>
+          icon="/icons/Common/AzureActivityLog.svg"/>
     <projectConfigurable groupId="root"
                          id="com.microsoft.intellij.AzureConfigurable"
                          provider="com.microsoft.intellij.AzureConfigurableProvider"
@@ -116,7 +89,7 @@
             factoryClass="com.microsoft.intellij.components.ServerExplorerToolWindowFactory"
             id="Azure Explorer"
             canCloseContents="false"
-            icon="/icons/AzureExplorer_16.png"/>
+            icon="/icons/Common/Azure.svg"/>
 
     <toolWindow
             anchor="bottom"
@@ -307,7 +280,7 @@
       <add-to-group group-id="RunContextPopupGroup" anchor="last"/>
     </action>
 
-    <group id="AzurePopupGroup" text="Azure" description="Azure" icon="/icons/azure.png" popup="true" class="com.microsoft.intellij.actions.AzurePopupGroup">
+    <group id="AzurePopupGroup" text="Azure" description="Azure" icon="/icons/Common/Azure.svg" popup="true" class="com.microsoft.intellij.actions.AzurePopupGroup">
       <reference ref="Actions.RunFunction"/>
       <reference ref="Actions.DeployFunction"/>
       <separator/>

PluginsAndFeatures/azure-toolkit-for-intellij/resources/com/microsoft/intellij/ui/messages/messages.properties

@@ -1411,6 +1411,8 @@ function.hint.setFunctionVersion=Functions extension version isn't configured, s
 function.hint.azureWebJobsStorage=The Azure Functions runtime uses this storage account connection string for all functions except for HTTP triggered functions.
 function.hint.functionsWorkerRuntime=The language worker runtime to load in the function app.
 function.create.task.title=Creating New Function App...
+function.create.success.title=Create function app
+function.create.success.message=Function app[%s] is successfully created.
 function.create.hint.creating=Creating function app %s ...
 function.create.hint.created=Function app %s created.
 function.create.hint.startCreateFunction=The specified function app does not exist. Creating a new function app...
@@ -1488,11 +1490,15 @@ function.cli.error.notFound=Azure Functions Core Tools not found. Please go to h
 function.binding.error.parseFailed=Cannot parse annotation information, expect type: %s, actual type: %s
 function.binding.storage.found=StorageAccount annotation found.
 function.binding.storage.notFound=No StorageAccount annotation found.
-webapp.create.task.title=Creating New Web App...
-webapp.create.error.title=Error occurred on creating Web App: 
+webapp.create.title=Create web app
+webapp.create.success.title=Create web app
+webapp.create.success.message=Successfully created web app[{0}].
+webapp.create.error.title=Failed to create web app: 
 webapp.create.error.createFailed=Create WebApp Failed
 webapp.deploy.noDeploymentSlot=No available deployment slot, click to create a new one
-webapp.deploy.task.title=Deploying Artifact to Web App...
+webapp.deploy.title=Deploy artifact to web app
+webapp.deploy.success.title=Deploy artifact to web app
+webapp.deploy.success.message=Successfully deployed artifact to web app[{0}]
 webapp.deploy.configuration.title=Deploy to Azure
 webapp.deploy.hint.deploymentSlot=Deployment slots are live apps with their own hostnames. App content and configurations elements can be swapped between two\
 deployment slots, including the production slot.