Upgrade to IntelliJ 2025.3

Hanxiao Liu · Hanxiao Liu · commit f67cdb26b8f1 · 2025-10-30T17:17:40.000+08:00
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice/build.gradle.kts b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice/build.gradle.kts
@@ -21,3 +21,9 @@ dependencies {
         bundledPlugin("org.jetbrains.plugins.terminal")
     }
 }
+
+tasks {
+    instrumentCode {
+        instrumentationLogs = true
+    }
+}
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-cloud-shell/src/main/kotlin/com/microsoft/azure/toolkit/intellij/cloudshell/terminal/AzureCloudTerminalRunner.kt b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-cloud-shell/src/main/kotlin/com/microsoft/azure/toolkit/intellij/cloudshell/terminal/AzureCloudTerminalRunner.kt
@@ -9,7 +9,7 @@ package com.microsoft.azure.toolkit.intellij.cloudshell.terminal
 import com.intellij.openapi.diagnostic.logger
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.Disposer
-import com.intellij.platform.util.coroutines.namedChildScope
+import com.intellij.platform.util.coroutines.childScope
 import com.jediterm.terminal.TtyConnector
 import com.microsoft.azure.toolkit.intellij.cloudshell.CloudShellService
 import com.microsoft.azure.toolkit.intellij.cloudshell.controlchannel.CloudConsoleControlChannelClient
@@ -56,7 +56,7 @@ class AzureCloudTerminalRunner(
             cloudConsoleBaseUrl,
             project
         )
-        controlClient.connect(scope.namedChildScope("CloudConsoleControlChannelClient"))
+        controlClient.connect(scope.childScope("CloudConsoleControlChannelClient"))
 
         val connector = createConnector(process)
         Disposer.register(connector, controlClient)
@@ -70,7 +70,7 @@ class AzureCloudTerminalRunner(
     private fun createConnector(process: CloudTerminalProcess) = AzureCloudProcessTtyConnector(
         process,
         project,
-        scope.namedChildScope("AzureCloudProcessTtyConnector"),
+        scope.childScope("AzureCloudProcessTtyConnector"),
         uploadFileToTerminalUrl,
         previewPortBaseUrl,
         resizeTerminalUrl
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-cosmos/build.gradle.kts b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-cosmos/build.gradle.kts
@@ -19,7 +19,7 @@ dependencies {
     implementation("com.microsoft.azure:azure-toolkit-identity-lib")
 
     intellijPlatform {
-        intellijIdeaUltimate(properties("platformVersion").get())
+        // intellijIdeaUltimate(properties("platformVersion").get())
         // Plugin Dependencies. Uses `platformBundledPlugins` property from the gradle.properties file for bundled IntelliJ Platform plugins.
         bundledPlugin("com.intellij.java")
         bundledPlugin("com.intellij.database")
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-guidance/build.gradle.kts b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-guidance/build.gradle.kts
@@ -5,4 +5,7 @@ dependencies {
     // runtimeOnly project(path: ":azure-intellij-resource-connector-lib", configuration: "instrumentedJar")
     implementation("com.microsoft.azure:azure-toolkit-ide-common-lib")
     implementation("org.yaml:snakeyaml:2.2")
+    implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.15.2") {
+        exclude(group = "com.fasterxml.jackson", module = "jackson-bom")
+    }
 }
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-hdinsight-lib/build.gradle.kts b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-hdinsight-lib/build.gradle.kts
@@ -9,7 +9,7 @@ dependencies {
     implementation("com.microsoft.hdinsight:azure-toolkit-ide-hdinsight-spark-lib")
 
     intellijPlatform {
-        intellijIdeaUltimate(properties("platformVersion").get())
+        // intellijIdeaUltimate(properties("platformVersion").get())
         // Plugin Dependencies. Uses `platformBundledPlugins` property from the gradle.properties file for bundled IntelliJ Platform plugins.
         bundledPlugin("com.intellij.java")
         plugin("org.intellij.scala:2024.2.5")
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-hdinsight-lib/src/main/kotlin/com/microsoft/azure/hdinsight/spark/console/SparkLivySessionProcess.kt b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-hdinsight-lib/src/main/kotlin/com/microsoft/azure/hdinsight/spark/console/SparkLivySessionProcess.kt
@@ -63,10 +63,6 @@ class SparkLivySessionProcess(
         return 0
     }
 
-    override fun setWindowSize(columns: Int, rows: Int) {
-
-    }
-
     override fun getInputStream(): InputStream = stdOutStream
 
     fun start(): Observable<Session> = session.deploy()
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-hdinsight-lib/src/main/kotlin/com/microsoft/azure/hdinsight/spark/run/SparkBatchJobProcessAdapter.kt b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-hdinsight-lib/src/main/kotlin/com/microsoft/azure/hdinsight/spark/run/SparkBatchJobProcessAdapter.kt
@@ -64,8 +64,4 @@ class SparkBatchJobProcessAdapter(val sparkJobProcess: SparkBatchJobRemoteProces
     override fun killProcessTree(): Boolean {
         return sparkJobProcess.killProcessTree()
     }
-
-    override fun setWindowSize(columns: Int, rows: Int) {
-
-    }
 }
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/build.gradle.kts b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/build.gradle.kts
@@ -20,8 +20,12 @@ dependencies {
         exclude(group="pull-parser", module="pull-parser")
         exclude(group="net.java.dev.msv", module="xsdlib")
     }
+    implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.15.2") {
+        exclude(group = "com.fasterxml.jackson", module = "jackson-bom")
+    }
     intellijPlatform {
         // Plugin Dependencies. Uses `platformBundledPlugins` property from the gradle.properties file for bundled IntelliJ Platform plugins.
         bundledPlugin("org.jetbrains.plugins.terminal")
     }
 }
+
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/build.gradle.kts b/PluginsAndFeatures/azure-toolkit-for-intellij/build.gradle.kts
@@ -33,12 +33,12 @@ allprojects {
 
     java {
         toolchain {
-            languageVersion = JavaLanguageVersion.of(17)
+            languageVersion = JavaLanguageVersion.of(21)
         }
     }
 
     kotlin {
-        jvmToolchain(17)
+        jvmToolchain(21)
     }
 
     repositories {
@@ -55,26 +55,21 @@ allprojects {
 
     intellijPlatform {
         buildSearchableOptions = false
-        instrumentCode = true
+        // instrumentCode = true
     }
 
     dependencies {
         intellijPlatform {
-            intellijIdeaUltimate(properties("platformVersion").get())
-            // run from a local idea installation
-            // local(File("C:\\Program Files\\JetBrains\\IntelliJ IDEA 242.16677.21"));
-            instrumentationTools()
-            // https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-jetbrains-runtime.html#declared-explicitly
-            // jetbrainsRuntime()
+            intellijIdeaUltimate(properties("platformVersion").get(), useInstaller = false)
         }
 
         implementation(platform("com.microsoft.azure:azure-toolkit-libs:0.52.2"))
         implementation(platform("com.microsoft.azure:azure-toolkit-ide-libs:0.52.2"))
         implementation(platform("com.microsoft.hdinsight:azure-toolkit-ide-hdinsight-libs:0.1.1"))
 
-        compileOnly("org.projectlombok:lombok:1.18.24")
+        compileOnly("org.projectlombok:lombok:1.18.32")
         compileOnly("org.jetbrains:annotations:24.0.0")
-        annotationProcessor("org.projectlombok:lombok:1.18.24")
+        annotationProcessor("org.projectlombok:lombok:1.18.32")
         implementation("com.microsoft.azure:azure-toolkit-common-lib:0.52.2")
         aspect("com.microsoft.azure:azure-toolkit-common-lib:0.52.2")
     }
@@ -91,21 +86,25 @@ allprojects {
         implementation { exclude(module = "xsdlib") }
     }
 
+    tasks.configureEach {
+        if (name == "instrumentCode") {
+            enabled = file("src/main/java").exists()
+        }
+    }
 
     tasks {
+
         compileJava {
-            sourceCompatibility = "17"
-            targetCompatibility = "17"
+            sourceCompatibility = "21"
+            targetCompatibility = "21"
         }
 
         compileKotlin {
-            kotlinOptions.jvmTarget = "17"
             configure<AjcAction> {
                 enabled = false
             }
         }
         compileTestKotlin {
-            kotlinOptions.jvmTarget = "17"
             configure<AjcAction> {
                 enabled = false
             }
@@ -134,7 +133,6 @@ allprojects {
 intellijPlatform {
     projectName = "azure-toolkit-for-intellij"
     buildSearchableOptions = false
-    instrumentCode = true
 
     pluginConfiguration {
         id = properties("pluginId").get()
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/gradle.properties b/PluginsAndFeatures/azure-toolkit-for-intellij/gradle.properties
@@ -1,16 +1,16 @@
 pluginVersion=3.96.2
-intellijDisplayVersion=2025.2
-intellij_version=252-EAP-SNAPSHOT
-platformVersion=252.23309.22
+intellijDisplayVersion=2025.3
+intellij_version=253-EAP-SNAPSHOT
+platformVersion=253-EAP-SNAPSHOT
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
-pluginSinceBuild=252
-pluginUntilBuild=252.*
+pluginSinceBuild=253
+pluginUntilBuild=253.*
 # Example: platformPlugins = com.jetbrains.php:203.4449.22, org.intellij.scala:2023.3.27@EAP
-platformPlugins=org.intellij.scala:2025.2.9
+platformPlugins=org.intellij.scala:2025.3.12
 # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
 platformType=IU
 needPatchVersion=true
-javaVersion=17
+javaVersion=21
 applicationinsights.key=57cc111a-36a8-44b3-b044-25d293b8b77c
 # IntelliJ Platform Artifacts Repositories -> https://plugins.jetbrains.com/docs/intellij/intellij-artifacts.html
 pluginGroup=com.microsoft.azuretools
@@ -22,7 +22,7 @@ platformDownloadSources=true
 # Opt-out flag for bundling Kotlin standard library -> https://jb.gg/intellij-platform-kotlin-stdlib
 kotlin.stdlib.default.dependency=false
 # Gradle Releases -> https://github.com/gradle/gradle/releases
-gradleVersion=8.8
+gradleVersion=8.14.1
 # Enable Gradle Configuration Cache -> https://docs.gradle.org/current/userguide/configuration_cache.html
 org.gradle.configuration-cache=true
 org.gradle.configuration-cache.problems=warn
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/gradle/libs.versions.toml b/PluginsAndFeatures/azure-toolkit-for-intellij/gradle/libs.versions.toml
@@ -2,15 +2,16 @@
 # libraries
 
 # plugins
-kotlin = "2.1.0"
-changelog = "2.2.0"
-intellijPlatform = "2.3.0"
+kotlin = "2.2.20"
+changelog = "2.4.0"
+#intellijPlatform = "2.10.1"
+intellijPlatform = "2.10.1"
 detekt = "1.23.6"
 ktlint = "12.1.1"
 #gradleIntelliJPlugin = "1.17.3"
 #qodana = "2024.1.5"
 aspectj = "8.6"
-springDependencyManagement = "1.0.11.RELEASE"
+springDependencyManagement = "1.1.6"
 serialization = "1.9.24"
 
 [plugins]
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/gradle/wrapper/gradle-wrapper.properties b/PluginsAndFeatures/azure-toolkit-for-intellij/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/Utils/azure-toolkit-ide-hdinsight-libs/hdinsight-node-common/pom.xml b/Utils/azure-toolkit-ide-hdinsight-libs/hdinsight-node-common/pom.xml
@@ -10,7 +10,7 @@
         <artifact.name>${project.artifactId}-${project.version}.jar</artifact.name>
         <hdinsight.htmlcopy.enabled>true</hdinsight.htmlcopy.enabled>
         <project.build.encoding>UTF-8</project.build.encoding>
-        <scala.version>2.12.10</scala.version>
+        <scala.version>2.12.18</scala.version>
         <spark.version>3.4.0</spark.version>
         <checkstyle.skip>true</checkstyle.skip>
     </properties>
@@ -108,7 +108,7 @@
             <plugin>
                 <groupId>net.alchim31.maven</groupId>
                 <artifactId>scala-maven-plugin</artifactId>
-                <version>4.8.0</version>
+                <version>4.8.1</version>
                 <executions>
                     <execution>
                         <goals>
@@ -147,7 +147,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.5.1</version>
+                <version>3.13.0</version>
                 <executions>
                     <!-- Replacing default-testCompile as it is treated specially by maven -->
                     <execution>
diff --git a/Utils/azure-toolkit-ide-hdinsight-libs/pom.xml b/Utils/azure-toolkit-ide-hdinsight-libs/pom.xml
@@ -24,6 +24,7 @@
         <woodstox.version>6.4.0</woodstox.version>
         <hadoop.version>3.4.0</hadoop.version>
         <snappyjava.version>1.1.10.4</snappyjava.version>
+        <lombok.version>1.18.36</lombok.version>
     </properties>
     <modules>
         <module>azuretools-core</module>
@@ -59,6 +60,11 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>org.projectlombok</groupId>
+                <artifactId>lombok</artifactId>
+                <version>${lombok.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.microsoft.hdinsight</groupId>
                 <artifactId>hdinsight-node-common</artifactId>
diff --git a/Utils/azure-toolkit-ide-hdinsight-libs/spark-localrun-mock/pom.xml b/Utils/azure-toolkit-ide-hdinsight-libs/spark-localrun-mock/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.12.10</scala.version>
+        <scala.version>2.12.18</scala.version>
         <spark.version>3.4.0</spark.version>
         <checkstyle.skip>true</checkstyle.skip>
     </properties>
diff --git a/Utils/azure-toolkit-ide-libs/pom.xml b/Utils/azure-toolkit-ide-libs/pom.xml
@@ -57,6 +57,7 @@
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
+        <lombok.version>1.18.36</lombok.version>
         <azure.toolkit-lib.version>0.52.2</azure.toolkit-lib.version>
     </properties>
     <dependencies>
@@ -75,6 +76,11 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>org.projectlombok</groupId>
+                <artifactId>lombok</artifactId>
+                <version>${lombok.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.microsoft.azure</groupId>
                 <artifactId>azure-toolkit-ide-common-lib</artifactId>

Original file line number	Diff line number	Diff line change
`@@ -21,3 +21,9 @@ dependencies {`
`21`	`21`	`bundledPlugin("org.jetbrains.plugins.terminal")`
`22`	`22`	`}`
`23`	`23`	`}`
	`24`	`+`
	`25`	`+tasks {`
	`26`	`+ instrumentCode {`
	`27`	`+ instrumentationLogs = true`
	`28`	`+ }`
	`29`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -5,4 +5,7 @@ dependencies {`
`5`	`5`	`// runtimeOnly project(path: ":azure-intellij-resource-connector-lib", configuration: "instrumentedJar")`
`6`	`6`	`implementation("com.microsoft.azure:azure-toolkit-ide-common-lib")`
`7`	`7`	`implementation("org.yaml:snakeyaml:2.2")`
	`8`	`+ implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.15.2") {`
	`9`	`+ exclude(group = "com.fasterxml.jackson", module = "jackson-bom")`
	`10`	`+ }`
`8`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,10 +63,6 @@ class SparkLivySessionProcess(`
`63`	`63`	`return 0`
`64`	`64`	`}`
`65`	`65`
`66`		`- override fun setWindowSize(columns: Int, rows: Int) {`
`67`		`-`
`68`		`- }`
`69`		`-`
`70`	`66`	`override fun getInputStream(): InputStream = stdOutStream`
`71`	`67`
`72`	`68`	`fun start(): Observable<Session> = session.deploy()`
Original file line number	Diff line number	Diff line change
`@@ -64,8 +64,4 @@ class SparkBatchJobProcessAdapter(val sparkJobProcess: SparkBatchJobRemoteProces`
`64`	`64`	`override fun killProcessTree(): Boolean {`
`65`	`65`	`return sparkJobProcess.killProcessTree()`
`66`	`66`	`}`
`67`		`-`
`68`		`- override fun setWindowSize(columns: Int, rows: Int) {`
`69`		`-`
`70`		`- }`
`71`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,12 @@ dependencies {`
`20`	`20`	`exclude(group="pull-parser", module="pull-parser")`
`21`	`21`	`exclude(group="net.java.dev.msv", module="xsdlib")`
`22`	`22`	`}`
	`23`	`+ implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.15.2") {`
	`24`	`+ exclude(group = "com.fasterxml.jackson", module = "jackson-bom")`
	`25`	`+ }`
`23`	`26`	`intellijPlatform {`
`24`	`27`	// Plugin Dependencies. Uses `platformBundledPlugins` property from the gradle.properties file for bundled IntelliJ Platform plugins.
`25`	`28`	`bundledPlugin("org.jetbrains.plugins.terminal")`
`26`	`29`	`}`
`27`	`30`	`}`
	`31`	`+`