From dd191a0462d2f1511ebd58e21cfd13fd237248fe Mon Sep 17 00:00:00 2001
From: Lari Hotari <lhotari@apache.org>
Date: Fri, 16 Jan 2026 11:21:26 +0200
Subject: [PATCH 1/2] [fix][build] Fix IntelliJ build after Jetty 12 upgrade

---
 .../zookeeper-with-patched-admin/pom.xml      | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/jetty-upgrade/zookeeper-with-patched-admin/pom.xml b/jetty-upgrade/zookeeper-with-patched-admin/pom.xml
index bf309c74b5da3..69ac538b616b1 100644
--- a/jetty-upgrade/zookeeper-with-patched-admin/pom.xml
+++ b/jetty-upgrade/zookeeper-with-patched-admin/pom.xml
@@ -67,6 +67,28 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-shade-jar</id>
+            <phase>package</phase>
+            <goals>
+              <goal>attach-artifact</goal>
+            </goals>
+            <configuration>
+              <artifacts>
+                <artifact>
+                  <file>${project.build.directory}/${project.build.finalName}.jar</file>
+                  <type>jar</type>
+                  <classifier>shaded</classifier>
+                </artifact>
+              </artifacts>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
@@ -84,6 +106,10 @@
                 <includes>
                   <include>org.apache.zookeeper:zookeeper</include>
                 </includes>
+                <excludes>
+                  <!-- This is required for execute shade multiple times without clean -->
+                  <exclude>org.apache.pulsar:zookeeper-with-patched-admin</exclude>
+                </excludes>
               </artifactSet>
               <filters>
                 <filter>

From ee8cd6013cb57c768586eba5ae2f8528abf3f9a8 Mon Sep 17 00:00:00 2001
From: Lari Hotari <lhotari@apache.org>
Date: Fri, 16 Jan 2026 12:11:31 +0200
Subject: [PATCH 2/2] Revisit solution to fix build

---
 .../zookeeper-with-patched-admin/pom.xml      | 65 +++++++++++--------
 1 file changed, 39 insertions(+), 26 deletions(-)

diff --git a/jetty-upgrade/zookeeper-with-patched-admin/pom.xml b/jetty-upgrade/zookeeper-with-patched-admin/pom.xml
index 69ac538b616b1..6160be5398599 100644
--- a/jetty-upgrade/zookeeper-with-patched-admin/pom.xml
+++ b/jetty-upgrade/zookeeper-with-patched-admin/pom.xml
@@ -67,28 +67,6 @@
 
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-shade-jar</id>
-            <phase>package</phase>
-            <goals>
-              <goal>attach-artifact</goal>
-            </goals>
-            <configuration>
-              <artifacts>
-                <artifact>
-                  <file>${project.build.directory}/${project.build.finalName}.jar</file>
-                  <type>jar</type>
-                  <classifier>shaded</classifier>
-                </artifact>
-              </artifacts>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
@@ -106,10 +84,6 @@
                 <includes>
                   <include>org.apache.zookeeper:zookeeper</include>
                 </includes>
-                <excludes>
-                  <!-- This is required for execute shade multiple times without clean -->
-                  <exclude>org.apache.pulsar:zookeeper-with-patched-admin</exclude>
-                </excludes>
               </artifactSet>
               <filters>
                 <filter>
@@ -128,4 +102,43 @@
       </plugin>
     </plugins>
   </build>
+  <profiles>
+    <profile>
+      <!-- Profile that is activated when using IntelliJ IDEA -->
+      <id>intellij</id>
+      <activation>
+        <property>
+          <name>idea.maven.embedder.version</name>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <!-- Add shaded jar to artifacts for IntelliJ IDEA so that IntelliJ builds
+          and running tests work -->
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>build-helper-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>attach-shade-jar</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>attach-artifact</goal>
+                </goals>
+                <configuration>
+                  <artifacts>
+                    <artifact>
+                      <file>${project.build.directory}/${project.build.finalName}.jar</file>
+                      <type>jar</type>
+                      <classifier>shaded</classifier>
+                    </artifact>
+                  </artifacts>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 </project>
\ No newline at end of file