Merge branch 'release'

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.50.0](#3500)
   - [3.49.0](#3490)
   - [3.48.0](#3480)
   - [3.47.0](#3470)
@@ -64,6 +65,14 @@ All notable changes to "Azure Toolkit for IntelliJ IDEA" will be documented in t
   - [3.0.7](#307)
   - [3.0.6](#306)
 
+## 3.50.0
+
+### Added
+- Development workflow for Azure Database for MySQL
+  - Connect Azure Database for MySQL Server to local project from Azure Explorer or application.properties file
+  - Automatically inject datasource connection properties into runtime environment for local run
+  - Publish Azure Web App with datasource connection properties in application settings
+
 ## 3.49.0
 
 ### Changed

PluginsAndFeatures/AddLibrary/AzureLibraries/pom.xml

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

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

@@ -89,6 +89,7 @@ repositories {
 configurations {
     compile.exclude module:'slf4j-api'
     compile.exclude module:'log4j'
+    compile.exclude module:'stax-api'
     cucumberRuntime {
         extendsFrom testRuntime
     }
@@ -104,18 +105,19 @@ 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.49.0"
-    compile 'com.microsoft.azuretools:azuretools-core:3.49.0', {
+    compile 'com.microsoft.azure:azure-toolkit-springcloud-lib:0.3.0', { force = true }
+    aspect "com.microsoft.azure:azure-toolkit-common-lib:0.3.0"
+    compile 'com.microsoft.azuretools:azuretools-core:3.50.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.49.0', {
+    compile 'com.microsoft.azuretools:azure-explorer-common:3.50.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.49.0', {
+    compile 'com.microsoft.azuretools:hdinsight-node-common:3.50.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"
@@ -138,6 +140,7 @@ dependencies {
 
     compile group: 'com.jcraft', name: 'jsch', version: '0.1.55'
     compile group: 'com.neovisionaries', name: 'nv-websocket-client', version: '2.9'
+    compile group: 'mysql', name: 'mysql-connector-java', version: '8.0.23'
 
     testCompile 'junit:junit:4.13'
     testCompile 'info.cukes:cucumber-junit:1.2.6'

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.49.0</version>
+  <version>3.50.0</version>
   <vendor email="[email protected]" url="http://www.microsoft.com">Microsoft</vendor>
 
   <description><![CDATA[
@@ -24,12 +24,16 @@
   <change-notes>
     <![CDATA[
     <html>
-    <h3>3.49.0</h3>
-    <h4>Changed</h4>
+    <h3>3.50.0</h3>
+    <h4>Added</h4>
     <ul>
-      <li>Collect performance metrics data via telemetry for future performance tuning.</li>
-      <li>Update the status text on progress indicator.</li>
-      <li>Update context menu icons in Azure Explorer.</li>
+      <li>Development workflow for Azure Database for MySQL
+        <ul>
+          <li>Connect Azure Database for MySQL Server to local project from Azure Explorer or application.properties file</li>
+          <li>Automatically inject datasource connection properties into runtime environment for local run</li>
+          <li>Publish Azure Web App with datasource connection properties in application settings</li>
+        </ul>
+      </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>
@@ -68,6 +72,8 @@
                          dynamic="true"/>
     <projectService serviceInterface="com.microsoft.intellij.AzureSettings"
                     serviceImplementation="com.microsoft.intellij.AzureSettings"/>
+    <projectService serviceImplementation="com.microsoft.intellij.AzureLinkStorage$Prj"/>
+    <applicationService serviceImplementation="com.microsoft.intellij.AzureMySQLStorage$App"/>
     <applicationService serviceInterface="com.microsoft.intellij.ApplicationSettings"
                         serviceImplementation="com.microsoft.intellij.ApplicationSettings"/>
     <fileEditorProvider implementation="com.microsoft.azure.hdinsight.jobs.framework.JobViewEditorProvider" />
@@ -82,7 +88,7 @@
     <fileEditorProvider implementation="com.microsoft.azure.toolkit.intellij.webapp.DeploymentSlotPropertyViewProvider"/>
     <fileEditorProvider implementation="com.microsoft.azure.toolkit.intellij.arm.DeploymentPropertyViewProvider"/>
     <fileEditorProvider implementation="com.microsoft.azure.toolkit.intellij.arm.ResourceTemplateViewProvider"/>
-    <fileEditorProvider implementation="com.microsoft.azure.toolkit.intellij.springcloud.SpringCloudAppPropertyViewProvider"/>
+    <fileEditorProvider implementation="com.microsoft.azure.toolkit.intellij.springcloud.properties.SpringCloudAppPropertiesEditorProvider"/>
     <fileEditorProvider implementation="com.microsoft.azure.toolkit.intellij.mysql.MySQLPropertyViewProvider"/>
     <toolWindow
             anchor="left"
@@ -114,7 +120,7 @@
     <configurationType implementation="com.microsoft.azure.hdinsight.spark.run.configuration.ArisSparkConfigurationType"/>
     <configurationType implementation="com.microsoft.azure.hdinsight.spark.run.configuration.ArcadiaSparkConfigurationType"/>
     <configurationType implementation="com.microsoft.azure.toolkit.intellij.function.runner.AzureFunctionSupportConfigurationType"/>
-    <configurationType implementation="com.microsoft.azure.toolkit.intellij.springcloud.runner.SpringCloudConfigurationType"/>
+    <configurationType implementation="com.microsoft.azure.toolkit.intellij.springcloud.deplolyment.SpringCloudDeploymentConfigurationType"/>
     <configurationType implementation="com.microsoft.azure.hdinsight.spark.run.configuration.SparkFailureTaskDebugConfigurationType"/>
     <actionPromoter implementation="com.microsoft.azure.hdinsight.spark.console.SparkExecuteInConsoleActionPromoter"/>
     <runConfigurationProducer implementation="com.microsoft.azure.hdinsight.spark.run.LivySparkRunConfigurationProducer"/>
@@ -125,7 +131,7 @@
     <programRunner implementation="com.microsoft.azure.toolkit.intellij.function.runner.localrun.FunctionLocalRunner"/>
     <runConfigurationProducer implementation="com.microsoft.azure.hdinsight.spark.run.ArcadiaSparkRunConfigurationProducer"/>
     <programRunner implementation="com.microsoft.azure.toolkit.intellij.webapp.runner.webappconfig.WebAppRunner"/>
-    <programRunner implementation="com.microsoft.azure.toolkit.intellij.springcloud.runner.deploy.SpringCloudDeploymentRunner"/>
+    <programRunner implementation="com.microsoft.azure.toolkit.intellij.springcloud.deplolyment.SpringCloudDeploymentRunner"/>
     <programRunner implementation="com.microsoft.azure.hdinsight.spark.run.SparkBatchJobRunner" />
     <programRunner implementation="com.microsoft.azure.hdinsight.spark.run.CosmosSparkBatchRunner" />
     <programRunner implementation="com.microsoft.azure.hdinsight.spark.run.SparkBatchJobDebuggerRunner" />
@@ -148,6 +154,11 @@
     <runConfigurationProducer implementation="com.microsoft.azure.toolkit.intellij.function.runner.FunctionRunConfigurationProducer"/>
     <runLineMarkerContributor language="JAVA" id="functionRunLineMarkerProvider"
                               implementationClass="com.microsoft.azure.toolkit.intellij.function.runner.FunctionRunLineMarkerProvider"/>
+
+    <stepsBeforeRunProvider implementation="com.microsoft.intellij.runner.LinkAzureServiceBeforeRunProvider" id="LinkAzureServiceBeforeRunProviderId"/>
+    <runConfigurationExtension implementation="com.microsoft.intellij.runner.LinkAzureServiceRunConfigurationExtension"/>
+    <completion.contributor language="Properties" implementationClass="com.microsoft.intellij.runner.SpringDatasourceCompletionContributor"/>
+    <codeInsight.lineMarkerProvider language="Properties" implementationClass="com.microsoft.intellij.runner.SpringDatasourceLineMarkerProvider"/>
   </extensions>
 
   <applicationListeners>
@@ -225,7 +236,7 @@
     </action>
     <!-- Functions End -->
 
-    <action id="Actions.DeploySpringCloud" class="com.microsoft.azure.toolkit.intellij.springcloud.action.DeploySpringCloudAction"
+    <action id="Actions.DeploySpringCloud" class="com.microsoft.azure.toolkit.intellij.springcloud.deplolyment.DeployAppAction"
             text="Deploy to Azure Spring Cloud" description="Deploy Spring Cloud app to Azure"
             icon="/icons/azure-springcloud-small.png">
     </action>
@@ -274,9 +285,9 @@
             text="SparkJobRun"/>
     <action id="SparkJobDebug" class="com.microsoft.azure.hdinsight.spark.run.action.SparkJobDebugAction"
             text="SparkJobDebug"/>
-    <action id="Actions.AddAzureDependencyAction" class="com.microsoft.azure.toolkit.intellij.springcloud.action.AddAzureDependencyAction" text="Add Azure Spring Cloud dependency" icon="/icons/azure-springcloud-app-dependency.png">
+    <action id="Actions.AddAzureDependencyAction" class="com.microsoft.azure.toolkit.intellij.springcloud.dependency.AddDependencyAction" text="Add Azure Spring Cloud dependency" icon="/icons/azure-springcloud-app-dependency.png">
     </action>
-    <action id="Actions.AddAzureDependencyContextAction" class="com.microsoft.azure.toolkit.intellij.springcloud.action.AddAzureDependencyContextAction" text="Add Azure Spring Cloud dependency" icon="/icons/azure-springcloud-app-dependency.png">
+    <action id="Actions.AddAzureDependencyContextAction" class="com.microsoft.azure.toolkit.intellij.springcloud.dependency.AddDependencyContextAction" text="Add Azure Spring Cloud dependency" icon="/icons/azure-springcloud-app-dependency.png">
       <add-to-group group-id="RunContextPopupGroup" anchor="last"/>
     </action>