Merge pull request #5063 from microsoft/develop.next

Flanker32 · web-flow · commit ab9b96325ecc · 2021-03-29T12:37:41.000+08:00
Merge develop.next -&gt; develop for EAP support
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/.idea/misc.xml b/PluginsAndFeatures/azure-toolkit-for-intellij/.idea/misc.xml
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/build.gradle b/PluginsAndFeatures/azure-toolkit-for-intellij/build.gradle
@@ -1,8 +1,9 @@
 plugins {
-    id "org.jetbrains.intellij" version "0.4.21"
-    id "org.jetbrains.kotlin.jvm" version "1.3.41"
+    id "org.jetbrains.intellij" version "0.5.0"
+    id "org.jetbrains.kotlin.jvm" version "1.3.72"
     id "de.undercouch.download" version "4.0.4"
     id "com.github.ben-manes.versions" version "0.28.0"
+    id 'org.openjfx.javafxplugin' version '0.0.9'
     id "io.freefair.aspectj.post-compile-weaving" version "5.3.0"
     id "com.github.spotbugs" version "4.6.0"
 }
@@ -43,6 +44,11 @@ compileTestKotlin {
     kotlinOptions.jvmTarget = javaVersion
 }
 
+javafx {
+    version = '11'
+    modules = [ 'javafx.controls', 'javafx.fxml', 'javafx.web',  'javafx.swing']
+}
+
 tasks.withType(JavaCompile) { options.encoding = 'UTF-8' }
 
 //apply plugin: 'checkstyle'
@@ -57,8 +63,8 @@ intellij {
     pluginName = 'azure-toolkit-for-intellij'
     version = intellij_version
     updateSinceUntilBuild = Boolean.valueOf(updateVersionRange)
-    plugins = ['java', 'maven', 'gradle', dep_plugins, "properties", 'markdown', 'terminal']
-	downloadSources = Boolean.valueOf(true)
+    plugins = ['java', 'maven', 'maven-model', 'gradle', dep_plugins, "properties", 'markdown', 'terminal']
+	downloadSources = Boolean.valueOf(sources)
 }
 
 sourceSets {
@@ -136,6 +142,8 @@ dependencies {
     compile group: 'jaxen', name: 'jaxen', version: '1.2.0'
     compile group: 'commons-beanutils', name: 'commons-beanutils', version: '1.9.4'
 
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72")
+
     // https://mvnrepository.com/artifact/org.projectlombok/lombok
     compileOnly 'org.projectlombok:lombok:1.18.8'
     annotationProcessor 'org.projectlombok:lombok:1.18.8'
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/gradle.properties b/PluginsAndFeatures/azure-toolkit-for-intellij/gradle.properties
@@ -1,8 +1,8 @@
-javaVersion=1.8
+javaVersion=11
 org.gradle.jvmargs='-Duser.language=en'
 sources=false
-intellij_version=IC-2020.2
-dep_plugins=org.intellij.scala:2020.2.14
+intellij_version=IC-LATEST-EAP-SNAPSHOT
+dep_plugins=org.intellij.scala:2020.3.8
 applicationinsights.key=57cc111a-36a8-44b3-b044-25d293b8b77c
 updateVersionRange=true
-patchPluginXmlSinceBuild=202.6397.94
+patchPluginXmlSinceBuild=203.5419.21
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/console/SparkExecuteInConsoleActionPromoter.kt b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/console/SparkExecuteInConsoleActionPromoter.kt
@@ -30,7 +30,7 @@ import com.microsoft.azure.hdinsight.common.logger.ILogger
 class SparkExecuteInConsoleActionPromoter : ActionPromoter, ILogger {
     private fun shouldPromote(anAction: AnAction): Boolean = anAction is SparkConsoleExecuteAction
 
-    override fun promote(actions: MutableList<AnAction>, context: DataContext?): MutableList<AnAction> =
+    override fun promote(actions: MutableList<AnAction>, context: DataContext): MutableList<AnAction> =
             actions.firstOrNull { shouldPromote(it) }
                     ?.let { mutableListOf(it) }
                     ?: mutableListOf()
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/console/SparkScalaLivyConsole.kt b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/console/SparkScalaLivyConsole.kt
@@ -33,7 +33,7 @@ class SparkScalaLivyConsole(module: Module) : ScalaLanguageConsole(module), Spar
         super.textSent(codes)
     }
 
-    override fun attachToProcess(processHandler: ProcessHandler?) {
+    override fun attachToProcess(processHandler: ProcessHandler) {
         super.attachToProcess(processHandler)
 
         // Remove self from ScalaConsoleInfo
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/run/SparkBatchLocalRunState.kt b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/run/SparkBatchLocalRunState.kt
@@ -22,6 +22,7 @@
 
 package com.microsoft.azure.hdinsight.spark.run
 
+import com.intellij.core.JavaPsiBundle
 import com.intellij.execution.DefaultExecutionResult
 import com.intellij.execution.ExecutionException
 import com.intellij.execution.ExecutionResult
@@ -32,7 +33,6 @@ import com.intellij.execution.process.KillableColoredProcessHandler
 import com.intellij.execution.process.ProcessAdapter
 import com.intellij.execution.process.ProcessEvent
 import com.intellij.execution.runners.ProgramRunner
-import com.intellij.execution.ui.ConfigurationModuleSelector.NO_MODULE_TEXT
 import com.intellij.execution.util.JavaParametersUtil
 import com.intellij.openapi.module.ModuleManager
 import com.intellij.openapi.project.Project
@@ -126,7 +126,8 @@ open class SparkBatchLocalRunState(val myProject: Project,
 
         if (hasJmockit) {
             params.vmParametersList.addAll(
-                    getCommandLineVmParameters(executor, params, mainModule?.name ?: NO_MODULE_TEXT))
+                    getCommandLineVmParameters(executor, params,
+                            mainModule?.name ?: JavaPsiBundle.message("list.item.no.module")))
         }
 
         if (hasClassPath) {
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/run/SparkFailureTaskRunProfileState.kt b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/run/SparkFailureTaskRunProfileState.kt
@@ -26,14 +26,15 @@ import com.intellij.execution.DefaultExecutionResult
 import com.intellij.execution.ExecutionException
 import com.intellij.execution.ExecutionResult
 import com.intellij.execution.Executor
+import com.intellij.execution.ShortenCommandLine.MANIFEST
 import com.intellij.execution.configurations.GeneralCommandLine
 import com.intellij.execution.configurations.JavaParameters
 import com.intellij.execution.process.KillableColoredProcessHandler
 import com.intellij.execution.process.ProcessAdapter
 import com.intellij.execution.process.ProcessEvent
 import com.intellij.execution.runners.ProgramRunner
 import com.intellij.execution.util.JavaParametersUtil
-import com.intellij.util.PathUtil
+import com.intellij.openapi.util.io.FileUtil
 import com.microsoft.azure.hdinsight.spark.common.SparkFailureTaskDebugConfigurableModel
 import com.microsoft.azure.hdinsight.spark.ui.SparkJobLogConsoleView
 import com.microsoft.azuretools.telemetrywrapper.ErrorType
@@ -118,18 +119,18 @@ open class SparkFailureTaskRunProfileState(val name: String,
 
         JavaParametersUtil.configureConfiguration(params, settingsConfigModel)
 
+        // Put failure context runtime at beginning, after JDK6, the classpath support <dir>/*
+        params.classPath.addAllFiles(File(FileUtil.toCanonicalPath(settingsConfigModel.workingDirectory), "runtime").listFiles())
+
         // The dependent spark-tools.jar is already in the Maven project lib/ directory
         JavaParametersUtil.configureProject(project, params, JavaParameters.JDK_AND_CLASSES_AND_TESTS, null)
 
         // Additional VM parameters
         additionalVmParameters.forEach { params.vmParametersList.add(it) }
 
-        // Put failure context runtime at beginning, after JDK6, the classpath support <dir>/*
-        params.classPath.addFirst("${PathUtil.getCanonicalPath(settingsConfigModel.workingDirectory)}/runtime/*")
-
         // Prepare log4j.properties file
         settingsConfigModel.log4jProperties?.also { log4jProp ->
-            val log4jPropertiesFile = File("${PathUtil.getCanonicalPath(settingsConfigModel.workingDirectory)}/conf/log4j.properties")
+            val log4jPropertiesFile = File("${FileUtil.toCanonicalPath(settingsConfigModel.workingDirectory)}/conf/log4j.properties")
                     .apply {
                         parentFile.mkdir()
                         writeText(log4jProp)
@@ -140,6 +141,7 @@ open class SparkFailureTaskRunProfileState(val name: String,
 
         // Helper Main class
         params.mainClass = settingsConfigModel.runClass
+        params.setShortenCommandLine(MANIFEST, null)
 
         return params.toCommandLine()
     }
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/intellij/feedback/MSErrorReportHandler.kt b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/intellij/feedback/MSErrorReportHandler.kt
@@ -39,7 +39,7 @@ class MSErrorReportHandler : ErrorReportSubmitter() {
     override fun submit(events: Array<out IdeaLoggingEvent>,
                         additionalInfo: String?,
                         parentComponent: Component,
-                        callback: Consumer<SubmittedReportInfo>): Boolean {
+                        callback: Consumer<in SubmittedReportInfo>): Boolean {
         val event = events[0]
 
         val githubIssue = GithubIssue(
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/intellij/util/MethodUtils.java b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/intellij/util/MethodUtils.java
@@ -5,12 +5,15 @@
 
 package com.microsoft.intellij.util;
 
-import com.intellij.openapi.module.*;
+import com.intellij.openapi.module.Module;
+import com.intellij.openapi.module.ModuleManager;
+import com.intellij.openapi.module.ModuleTypeId;
 import com.intellij.openapi.project.Project;
 import com.microsoft.intellij.AzurePlugin;
 import com.microsoft.intellij.ui.libraries.AILibraryHandler;
 
 import java.io.File;
+
 import static com.microsoft.intellij.ui.messages.AzureBundle.message;
 
 public class MethodUtils {
@@ -25,7 +28,8 @@ public static String getModuleNameAsPerKey(Project project, String keyToRemove)
         try {
             Module[] modules = ModuleManager.getInstance(project).getModules();
             for (Module module : modules) {
-                if (module!= null && module.isLoaded() && ModuleTypeId.JAVA_MODULE.equals(module.getOptionValue(Module.ELEMENT_TYPE))) {
+                if (module != null && module.isLoaded()
+                        && ModuleTypeId.JAVA_MODULE.equals(module.getOptionValue(Module.ELEMENT_TYPE))) {
                     String aiXMLPath = String.format("%s%s%s", PluginUtil.getModulePath(module), File.separator, message("aiXMLPath"));
                     String webXMLPath = String.format("%s%s%s", PluginUtil.getModulePath(module), File.separator, message("xmlPath"));
                     AILibraryHandler handler = new AILibraryHandler();
@@ -42,7 +46,7 @@ public static String getModuleNameAsPerKey(Project project, String keyToRemove)
                     }
                 }
             }
-        } catch(Exception ex) {
+        } catch (Exception ex) {
             AzurePlugin.log(ex.getMessage(), ex);
         }
         return name;
diff --git a/Utils/azure-explorer-common/pom.xml b/Utils/azure-explorer-common/pom.xml
@@ -40,10 +40,9 @@
         </testResources>
         <plugins>
             <plugin>
-                <!-- https://mvnrepository.com/artifact/org.codehaus.mojo/aspectj-maven-plugin -->
-                <groupId>org.codehaus.mojo</groupId>
+                <groupId>com.nickwongdev</groupId>
                 <artifactId>aspectj-maven-plugin</artifactId>
-                <version>1.11</version>
+                <version>1.12.6</version>
                 <configuration>
                     <showWeaveInfo>false</showWeaveInfo>
                     <source>1.8</source>
@@ -203,16 +202,19 @@
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-core</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-module-junit4</artifactId>
-            <version>1.7.0RC4</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-api-mockito2</artifactId>
-            <version>1.7.0RC4</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/Utils/azuretools-core/pom.xml b/Utils/azuretools-core/pom.xml
@@ -59,10 +59,9 @@
         <testSourceDirectory>test</testSourceDirectory>
         <plugins>
             <plugin>
-                <!-- https://mvnrepository.com/artifact/org.codehaus.mojo/aspectj-maven-plugin -->
-                <groupId>org.codehaus.mojo</groupId>
+                <groupId>com.nickwongdev</groupId>
                 <artifactId>aspectj-maven-plugin</artifactId>
-                <version>1.11</version>
+                <version>1.12.6</version>
                 <configuration>
                     <showWeaveInfo>false</showWeaveInfo>
                     <source>1.8</source>
@@ -296,13 +295,20 @@
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-core</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-module-junit4</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-api-mockito2</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
diff --git a/Utils/hdinsight-node-common/pom.xml b/Utils/hdinsight-node-common/pom.xml
@@ -12,7 +12,7 @@
         <artifact.name>${project.artifactId}-${project.version}.jar</artifact.name>
         <hdinsight.htmlcopy.enabled>false</hdinsight.htmlcopy.enabled>
         <project.build.encoding>UTF-8</project.build.encoding>
-        <scala.version>2.11.11</scala.version>
+        <scala.version>2.11.12</scala.version>
         <spark.version>2.1.0</spark.version>
         <checkstyle.skip>true</checkstyle.skip>
     </properties>
@@ -83,21 +83,6 @@
         </testResources>
         <defaultGoal>install</defaultGoal>
         <plugins>
-            <plugin>
-                <groupId>net.alchim31.maven</groupId>
-                <artifactId>scala-maven-plugin</artifactId>
-                <version>3.3.1</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>testCompile</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <scalaVersion>${scala.version}</scalaVersion>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.jetbrains.kotlin</groupId>
                 <artifactId>kotlin-maven-plugin</artifactId>
@@ -122,6 +107,26 @@
                     <jvmTarget>${kotlin.jvmTargetVersion}</jvmTarget>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>net.alchim31.maven</groupId>
+                <artifactId>scala-maven-plugin</artifactId>
+                <version>4.4.0</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>testCompile</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <scalaVersion>${scala.version}</scalaVersion>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.openjfx</groupId>
+                <artifactId>javafx-maven-plugin</artifactId>
+                <version>0.0.5</version>
+            </plugin>
             <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
                 <version>3.0.2</version>
@@ -171,11 +176,41 @@
     </build>
 
     <dependencies>
+        <dependency>
+            <groupId>org.openjfx</groupId>
+            <artifactId>javafx-base</artifactId>
+            <version>11.0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.openjfx</groupId>
+            <artifactId>javafx-graphics</artifactId>
+            <version>11.0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.openjfx</groupId>
+            <artifactId>javafx-controls</artifactId>
+            <version>11.0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.openjfx</groupId>
+            <artifactId>javafx-swing</artifactId>
+            <version>11.0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.openjfx</groupId>
+            <artifactId>javafx-web</artifactId>
+            <version>11.0.2</version>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-common</artifactId>
             <scope>provided</scope>
             <exclusions>
+                <exclusion>
+                    <groupId>jdk.tools</groupId>
+                    <artifactId>jdk.tools</artifactId>
+                </exclusion>
                 <exclusion>
                     <groupId>javax.servlet</groupId>
                     <artifactId>servlet-api</artifactId>
diff --git a/Utils/pom.xml b/Utils/pom.xml
diff --git a/Utils/spark-localrun-mock/pom.xml b/Utils/spark-localrun-mock/pom.xml
diff --git a/build.gradle b/build.gradle
diff --git a/gradle.properties b/gradle.properties

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ class SparkScalaLivyConsole(module: Module) : ScalaLanguageConsole(module), Spar`
`33`	`33`	`super.textSent(codes)`
`34`	`34`	`}`
`35`	`35`
`36`		`- override fun attachToProcess(processHandler: ProcessHandler?) {`
	`36`	`+ override fun attachToProcess(processHandler: ProcessHandler) {`
`37`	`37`	`super.attachToProcess(processHandler)`
`38`	`38`
`39`	`39`	`// Remove self from ScalaConsoleInfo`