Merge pull request #5748 from microsoft/endgame-august

merge release branch into master for august 2021

.travis.yml

@@ -22,6 +22,5 @@ branches:
   - develop.next
 install: skip
 script:
-- 'travis_wait 40 ./gradlew buildAll --quiet'
+- ' ./gradlew buildAll --quiet'
 dist: trusty
-

CHANGELOG.md

@@ -70,6 +70,19 @@ All notable changes to "Azure Toolkit for IntelliJ IDEA" will be documented in t
   - [3.0.7](#307)
   - [3.0.6](#306)
 
+## 3.56.0
+### Added
+- Support proxy with credential(username, password)
+- Add `Samples` link for SDK libs on Azure SDK reference book
+
+### Changed
+- Fix the high failure rate problem for SSH into Linux Webapp operation
+- List all local-installed function core tools for function core tools path setting
+- Synchronize status on storage account in different views
+- Synchronize status on Azure Database for MySQL in different views
+- Synchronize status on SQL Server in different views
+- Redesign the creation UI of storage account
+
 ## 3.55.1
 ### Added
 - Add support for IntelliJ 2021.2

PluginsAndFeatures/AddLibrary/AzureLibraries/pom.xml

@@ -28,7 +28,7 @@
     <parent>
     <groupId>com.microsoft.azuretools</groupId>
     <artifactId>utils</artifactId>
-    <version>3.55.0</version>
+    <version>3.56.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.55.0</azuretool.version>
+        <azuretool.version>3.56.0</azuretool.version>
         <azuretool.sdk.version>3.25.0.qualifier</azuretool.sdk.version>
     </properties>
     <dependencies>

PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.container/pom.xml

@@ -26,7 +26,7 @@
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-compress</artifactId>
-      <version>1.9</version>
+      <version>1.21</version>
     </dependency>
   </dependencies>
   <build>

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-base/README.md

@@ -0,0 +1,20 @@
+# How to include a plugin module
+
+### config modules to be built by gradle
+
+config the modules to be included by `IntellijPluginModules` in [gradle.properties](./gradle.properties), and separate the modules by comma:
+
+```properties
+IntellijPluginModules=azure-intellij-plugin-springcloud,azure-sdk-reference-book
+```
+
+### config plugin fragments to be imported by plugin
+
+config the modules to be included in [plugin.xml](./src/main/resources/META-INF/plugin.xml)
+
+```xml
+<xi:include href="/META-INF/azure-intellij-plugin-lib.xml" xpointer="xpointer(/idea-plugin/*)"/>
+<xi:include href="/META-INF/azure-sdk-reference-book.xml" xpointer="xpointer(/idea-plugin/*)"/>
+<xi:include href="/META-INF/azure-intellij-plugin-service-explorer.xml" xpointer="xpointer(/idea-plugin/*)"/>
+<xi:include href="/META-INF/azure-intellij-plugin-springcloud.xml" xpointer="xpointer(/idea-plugin/*)"/>
+```

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

@@ -0,0 +1,121 @@
+plugins {
+    id "org.jetbrains.intellij" version "0.7.2"
+    id "io.spring.dependency-management" version "1.0.11.RELEASE"
+    id "io.freefair.aspectj.post-compile-weaving" version "6.0.0-m2"
+}
+
+group 'com.microsoft.azure.toolkit'
+apply plugin: 'java'
+
+compileJava {
+    sourceCompatibility = javaVersion
+    targetCompatibility = javaVersion
+}
+
+tasks.withType(JavaCompile) { options.encoding = 'UTF-8' }
+
+intellij {
+    pluginName = 'azure-intellij-plugin-base'
+    version = intellij_version
+    plugins = ['java', 'maven', 'maven-model', 'gradle', dep_plugins]
+    downloadSources = Boolean.valueOf(sources)
+}
+
+repositories {
+    mavenLocal()
+    mavenCentral()
+}
+
+configurations {
+    compile.exclude module: 'slf4j-api'
+    compile.exclude module: 'log4j'
+    compile.exclude module: 'stax-api'
+}
+
+dependencies {
+    compile 'com.microsoft.azure:azure-toolkit-auth-lib:0.11.0'
+    compile 'com.microsoft.azure:azure-toolkit-ide-common-lib:0.11.0'
+    compile 'io.projectreactor:reactor-core:3.4.5'
+
+    compile project(':azure-intellij-plugin-lib')
+    compile project(':azure-intellij-plugin-service-explorer')
+
+    def modules = IntellijPluginModules.split(",")
+    modules.each { m ->
+        compile project(':' + m)
+    }
+
+    aspect 'com.microsoft.azure:azure-toolkit-common-lib:0.11.0', {
+        exclude group: "com.squareup.okhttp3", module: "okhttp"
+        exclude group: "com.squareup.okhttp3", module: "okhttp-urlconnection"
+        exclude group: "com.squareup.okhttp3", module: "logging-interceptor"
+    }
+}
+
+
+gradle.taskGraph.whenReady { graph ->
+    def hasRootRunTask = graph.hasTask(':runIde')
+
+    if (hasRootRunTask) {
+        graph.getAllTasks().each { task ->
+            // look for *:runIde
+            def subRunTask = (task.path =~ /:.+:runIde/)
+            if (subRunTask) {
+                println "TRACER skipping ${task.path} because ':runIde' was specified"
+                task.enabled = false
+            }
+        }
+    }
+}
+
+subprojects {
+    apply plugin: 'java'
+    apply plugin: 'io.freefair.aspectj.post-compile-weaving'
+
+    sourceCompatibility = javaVersion
+    targetCompatibility = javaVersion
+    tasks.withType(JavaCompile) { options.encoding = 'UTF-8' }
+    group = 'com.microsoft.azure.toolkit'
+
+    repositories {
+        mavenLocal()
+        mavenCentral()
+    }
+
+    apply plugin: 'org.jetbrains.intellij'
+    intellij {
+        version = intellij_version
+        updateSinceUntilBuild = false
+        downloadSources = Boolean.valueOf(sources)
+    }
+
+    dependencyManagement {
+        imports {
+            mavenBom 'com.microsoft.azure:azure-toolkit-libs:0.11.0'
+            mavenBom 'com.microsoft.azure:azure-toolkit-ide-libs:0.11.0'
+        }
+    }
+
+    dependencies {
+        compileOnly 'org.jetbrains:annotations:21.0.1'
+        // https://mvnrepository.com/artifact/org.projectlombok/lombok
+        compileOnly 'org.projectlombok:lombok:1.18.20'
+        annotationProcessor 'org.projectlombok:lombok:1.18.20'
+
+        compile 'com.microsoft.azure:azure-toolkit-common-lib:0.11.0', {
+            exclude group: "com.squareup.okhttp3", module: "okhttp"
+            exclude group: "com.squareup.okhttp3", module: "okhttp-urlconnection"
+            exclude group: "com.squareup.okhttp3", module: "logging-interceptor"
+        }
+
+        aspect 'com.microsoft.azure:azure-toolkit-common-lib:0.11.0', {
+            exclude group: "com.squareup.okhttp3", module: "okhttp"
+            exclude group: "com.squareup.okhttp3", module: "okhttp-urlconnection"
+            exclude group: "com.squareup.okhttp3", module: "logging-interceptor"
+        }
+    }
+}
+wrapper() {
+    gradleVersion = '6.5'
+    distributionUrl = "https://services.gradle.org/distributions/gradle-${gradleVersion}-all.zip"
+}

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-base/gradle.properties

@@ -0,0 +1,13 @@
+javaVersion=11
+org.gradle.jvmargs='-Duser.language=en'
+sources=true
+intellij_version=IC-2021.1
+dep_plugins=org.intellij.scala:2021.1.15
+applicationinsights.key=57cc111a-36a8-44b3-b044-25d293b8b77c
+updateVersionRange=true
+patchPluginXmlSinceBuild=211.6693.14
+IntellijPluginBase=..
+IntellijPluginModules=azure-intellij-plugin-springcloud
+org.gradle.configureondemand=true
+org.gradle.parallel=true
+org.gradle.daemon=true

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-base/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists