diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice-java/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/appservice/AppServiceInfoBasicPanel.form b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice-java/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/appservice/AppServiceInfoBasicPanel.form index a0b98ee74c2..958336737b0 100644 --- a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice-java/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/appservice/AppServiceInfoBasicPanel.form +++ b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice-java/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/appservice/AppServiceInfoBasicPanel.form @@ -3,7 +3,7 @@ - + @@ -43,10 +43,11 @@ - + + diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice-java/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/appservice/AppServiceInfoBasicPanel.java b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice-java/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/appservice/AppServiceInfoBasicPanel.java index 0eb3318a794..8f6a876ebe3 100644 --- a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice-java/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/appservice/AppServiceInfoBasicPanel.java +++ b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice-java/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/appservice/AppServiceInfoBasicPanel.java @@ -135,6 +135,7 @@ public RuntimeComboBox getSelectorRuntime() { private void createUIComponents() { // TODO: place custom component creation code here this.selectorApplication = new AzureArtifactComboBox(project, true); + this.selectorRuntime = new RuntimeComboBox(); } public void setDeploymentVisible(boolean visible) { 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 index 651a0c7b441..f15865b9924 100644 --- 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 + } +} \ No newline at end of file diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/appservice/serviceplan/ServicePlanCreationDialog.form b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/appservice/serviceplan/ServicePlanCreationDialog.form index 3a772c8ab76..1e7c6b7a310 100644 --- a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/appservice/serviceplan/ServicePlanCreationDialog.form +++ b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/appservice/serviceplan/ServicePlanCreationDialog.form @@ -27,7 +27,7 @@ - + @@ -35,10 +35,11 @@ - + + diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/appservice/serviceplan/ServicePlanCreationDialog.java b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/appservice/serviceplan/ServicePlanCreationDialog.java index 97a8dd0e955..d75b3b73d7e 100644 --- a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/appservice/serviceplan/ServicePlanCreationDialog.java +++ b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/appservice/serviceplan/ServicePlanCreationDialog.java @@ -104,4 +104,9 @@ public List> getInputs() { return Collections.singletonList(this.textName); } + private void createUIComponents() { + // TODO: place custom component creation code here + this.textName = new AzureTextInput(); + this.comboBoxPricingTier = new PricingTierComboBox(); + } } 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 index c64919d3290..9234e4820c9 100644 --- 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 index 4019ae664bb..a0f9b36c393 100644 --- 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 index caeba7b18f2..98f30de8426 100644 --- 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") + } } \ No newline at end of file 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 index 7360e3414d9..edd3bcda579 100644 --- 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 index 6b044cfaf6d..4686d18afaa 100644 --- 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.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 index 358d35295d0..2f557f079a4 100644 --- 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) { - - } } \ No newline at end of file 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 index fd4354002c6..8229d1b47d3 100644 --- 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/azure-intellij-plugin-lib/src/main/java/com/microsoft/azure/toolkit/intellij/common/component/resourcegroup/ResourceGroupCreationDialog.form b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/src/main/java/com/microsoft/azure/toolkit/intellij/common/component/resourcegroup/ResourceGroupCreationDialog.form index 0ce735be729..2ad8da67365 100644 --- a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/src/main/java/com/microsoft/azure/toolkit/intellij/common/component/resourcegroup/ResourceGroupCreationDialog.form +++ b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/src/main/java/com/microsoft/azure/toolkit/intellij/common/component/resourcegroup/ResourceGroupCreationDialog.form @@ -19,7 +19,7 @@ - + diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/src/main/java/com/microsoft/azure/toolkit/intellij/common/component/resourcegroup/ResourceGroupCreationDialog.java b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/src/main/java/com/microsoft/azure/toolkit/intellij/common/component/resourcegroup/ResourceGroupCreationDialog.java index 02ae158c5a1..5bb9d6b4d64 100644 --- a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/src/main/java/com/microsoft/azure/toolkit/intellij/common/component/resourcegroup/ResourceGroupCreationDialog.java +++ b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/src/main/java/com/microsoft/azure/toolkit/intellij/common/component/resourcegroup/ResourceGroupCreationDialog.java @@ -69,4 +69,9 @@ public void setValue(final ResourceGroupDraft data) { public List> getInputs() { return Collections.singletonList(this.textName); } + + private void createUIComponents() { + // TODO: place custom component creation code here + this.textName = new ResourceGroupNameTextField(); + } } diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/build.gradle.kts b/PluginsAndFeatures/azure-toolkit-for-intellij/build.gradle.kts index 64d13fd4d11..696be472581 100644 --- 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 { enabled = false } } compileTestKotlin { - kotlinOptions.jvmTarget = "17" configure { 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 index 82a2e43df31..9e1159748ce 100644 --- 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 index a411c10e5a8..fa3446576dd 100644 --- 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 index a4413138c96..002b867c48b 100644 --- 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 index 610e2938205..04212e12058 100644 --- 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 @@ ${project.artifactId}-${project.version}.jar true UTF-8 - 2.12.10 + 2.12.18 3.4.0 true @@ -108,7 +108,7 @@ net.alchim31.maven scala-maven-plugin - 4.8.0 + 4.8.1 @@ -147,7 +147,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.5.1 + 3.13.0 diff --git a/Utils/azure-toolkit-ide-hdinsight-libs/pom.xml b/Utils/azure-toolkit-ide-hdinsight-libs/pom.xml index c09b1327fda..31696fe9002 100644 --- a/Utils/azure-toolkit-ide-hdinsight-libs/pom.xml +++ b/Utils/azure-toolkit-ide-hdinsight-libs/pom.xml @@ -24,6 +24,7 @@ 6.4.0 3.4.0 1.1.10.4 + 1.18.36 azuretools-core @@ -59,6 +60,11 @@ pom import + + org.projectlombok + lombok + ${lombok.version} + com.microsoft.hdinsight hdinsight-node-common 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 index 0d70d77ba6c..f1262d60e65 100644 --- 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 @@ ${project.artifactId}-${project.version}.jar false UTF-8 - 2.12.10 + 2.12.18 3.4.0 true diff --git a/Utils/azure-toolkit-ide-libs/pom.xml b/Utils/azure-toolkit-ide-libs/pom.xml index 6be3b1fb091..d1566380d9e 100644 --- a/Utils/azure-toolkit-ide-libs/pom.xml +++ b/Utils/azure-toolkit-ide-libs/pom.xml @@ -57,6 +57,7 @@ 17 17 + 1.18.36 0.52.2 @@ -75,6 +76,11 @@ pom import + + org.projectlombok + lombok + ${lombok.version} + com.microsoft.azure azure-toolkit-ide-common-lib