From c41259b41823348d7b0b7ccf2ec9ee71f4ec95ab Mon Sep 17 00:00:00 2001
From: Miller Wang <wangmi@microsoft.com>
Date: Sun, 12 Jul 2026 11:50:51 +0800
Subject: [PATCH 1/2] Fix Utils compilation on JDK 25

Upgrade Lombok, configure it explicitly as an annotation processor, update the legacy HDInsight compiler plugin, and stop the release pipeline immediately when Maven fails.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .azure-pipelines/sign-for-stable-release.yml     |  2 ++
 .../azure-explorer-common/pom.xml                |  2 +-
 Utils/azure-toolkit-ide-hdinsight-libs/pom.xml   | 16 +++++++++++++++-
 Utils/azure-toolkit-ide-libs/pom.xml             | 16 +++++++++++++++-
 4 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/.azure-pipelines/sign-for-stable-release.yml b/.azure-pipelines/sign-for-stable-release.yml
index 7ea9e095ad7..3b377d60df3 100644
--- a/.azure-pipelines/sign-for-stable-release.yml
+++ b/.azure-pipelines/sign-for-stable-release.yml
@@ -131,7 +131,9 @@ extends:
                     mvn -v
                     # ./gradlew buildUtils || exit -1
                     mvn clean install -f ./Utils/pom.xml -T 1C "-Dcheckstyle.skip=true" "-Dmaven.test.skip=true" "-Dmaven.javadoc.skip=true"
+                    if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
                     mvn clean -f ./Utils/pom.xml
+                    if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
                     cd PluginsAndFeatures/azure-toolkit-for-intellij
                     ./gradlew clean buildPlugin -s "-Papplicationinsights.key=$(INTELLIJ_KEY)" "-PneedPatchVersion=false" "-Psources=false" "-Porg.gradle.configureondemand=false" "-Porg.gradle.daemon=false" "-Porg.gradle.unsafe.configuration-cache=false" "-Porg.gradle.caching=false"
                 env:
diff --git a/Utils/azure-toolkit-ide-hdinsight-libs/azure-explorer-common/pom.xml b/Utils/azure-toolkit-ide-hdinsight-libs/azure-explorer-common/pom.xml
index 2cb77906b66..e7989fa41f9 100644
--- a/Utils/azure-toolkit-ide-hdinsight-libs/azure-explorer-common/pom.xml
+++ b/Utils/azure-toolkit-ide-hdinsight-libs/azure-explorer-common/pom.xml
@@ -42,7 +42,7 @@
         <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.3</version>
+                <version>3.13.0</version>
                 <configuration>
                     <source>17</source>
                     <target>17</target>
diff --git a/Utils/azure-toolkit-ide-hdinsight-libs/pom.xml b/Utils/azure-toolkit-ide-hdinsight-libs/pom.xml
index f1b821e2f53..fed918899a2 100644
--- a/Utils/azure-toolkit-ide-hdinsight-libs/pom.xml
+++ b/Utils/azure-toolkit-ide-hdinsight-libs/pom.xml
@@ -24,7 +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>
+        <lombok.version>1.18.46</lombok.version>
         <dnsjava.version>3.6.0</dnsjava.version>
     </properties>
     <modules>
@@ -318,6 +318,20 @@
     </dependencyManagement>
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.13.0</version>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>${lombok.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
             <plugin>
                 <!-- https://mvnrepository.com/artifact/org.codehaus.mojo/aspectj-maven-plugin -->
                 <!-- http://www.quabr.com/62976155/aspectj-maven-plugin-1-11-missing-tools-jar-issue-with-jdk-11 -->
diff --git a/Utils/azure-toolkit-ide-libs/pom.xml b/Utils/azure-toolkit-ide-libs/pom.xml
index 76949ce97c2..3e0831ac5e1 100644
--- a/Utils/azure-toolkit-ide-libs/pom.xml
+++ b/Utils/azure-toolkit-ide-libs/pom.xml
@@ -57,7 +57,7 @@
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
-        <lombok.version>1.18.36</lombok.version>
+        <lombok.version>1.18.46</lombok.version>
         <azure.toolkit-lib.version>0.52.2</azure.toolkit-lib.version>
     </properties>
     <dependencies>
@@ -214,6 +214,20 @@
     </dependencyManagement>
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.13.0</version>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>${lombok.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
             <plugin>
                 <!-- https://mvnrepository.com/artifact/org.codehaus.mojo/aspectj-maven-plugin -->
                 <!-- http://www.quabr.com/62976155/aspectj-maven-plugin-1-11-missing-tools-jar-issue-with-jdk-11 -->

From 1677ab68fcaa279d456b4912eba983d65d13c79f Mon Sep 17 00:00:00 2001
From: Miller Wang <wangmi@microsoft.com>
Date: Sun, 12 Jul 2026 12:20:24 +0800
Subject: [PATCH 2/2] Avoid cleaning installed Utils artifacts

The extra Maven clean fails on read-only files in the generated winutils Git repository and is unnecessary after installing Utils into Maven Local.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .azure-pipelines/sign-for-stable-release.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.azure-pipelines/sign-for-stable-release.yml b/.azure-pipelines/sign-for-stable-release.yml
index 3b377d60df3..731daddd2f5 100644
--- a/.azure-pipelines/sign-for-stable-release.yml
+++ b/.azure-pipelines/sign-for-stable-release.yml
@@ -132,8 +132,6 @@ extends:
                     # ./gradlew buildUtils || exit -1
                     mvn clean install -f ./Utils/pom.xml -T 1C "-Dcheckstyle.skip=true" "-Dmaven.test.skip=true" "-Dmaven.javadoc.skip=true"
                     if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
-                    mvn clean -f ./Utils/pom.xml
-                    if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
                     cd PluginsAndFeatures/azure-toolkit-for-intellij
                     ./gradlew clean buildPlugin -s "-Papplicationinsights.key=$(INTELLIJ_KEY)" "-PneedPatchVersion=false" "-Psources=false" "-Porg.gradle.configureondemand=false" "-Porg.gradle.daemon=false" "-Porg.gradle.unsafe.configuration-cache=false" "-Porg.gradle.caching=false"
                 env: