From 6acbd8274611025b7a51e1f59a175a6ce89a1861 Mon Sep 17 00:00:00 2001
From: Claire Villard <claire.villard@sonarsource.com>
Date: Tue, 20 Oct 2026 11:17:46 +0200
Subject: [PATCH 1/5] DO NOT MERGE test the ZIP packaging

---
 sonar-java-plugin/pom.xml | 52 ++++++++++++++++++++++++++-------------
 1 file changed, 35 insertions(+), 17 deletions(-)

diff --git a/sonar-java-plugin/pom.xml b/sonar-java-plugin/pom.xml
index 2c317ac6afb..5677973fb58 100644
--- a/sonar-java-plugin/pom.xml
+++ b/sonar-java-plugin/pom.xml
@@ -28,6 +28,11 @@
     <tag>${project.parent.scm.tag}</tag>
   </scm>
 
+  <properties>
+    <!-- FIXME use a released version -->
+    <version.sonar-packaging.plugin>2.1.0.3074</version.sonar-packaging.plugin>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -154,23 +159,6 @@
       </resource>
     </resources>
     <plugins>
-      <plugin>
-        <groupId>org.sonarsource.sonar-packaging-maven-plugin</groupId>
-        <artifactId>sonar-packaging-maven-plugin</artifactId>
-        <configuration>
-          <pluginName>Java Code Quality and Security</pluginName>
-          <skipDependenciesPackaging>true</skipDependenciesPackaging>
-          <pluginClass>org.sonar.plugins.java.JavaPlugin</pluginClass>
-          <requiredForLanguages>java,jsp,kotlin</requiredForLanguages>
-          <sonarLintSupported>true</sonarLintSupported>
-          <jreMinVersion>21</jreMinVersion>
-          <archive>
-            <manifestEntries>
-              <Implementation-Version>${project.version}</Implementation-Version>
-            </manifestEntries>
-          </archive>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
@@ -257,6 +245,36 @@
           </execution>
         </executions>
       </plugin>
+      <!--
+        Declared AFTER maven-shade-plugin above: both bind to the "package" phase, and execution order within a
+        phase follows declaration order in this pom.xml. The "zip" goal wraps whatever jar exists on disk at the
+        time it runs, so it must run after shading has rewritten that jar in place.
+      -->
+      <plugin>
+        <groupId>org.sonarsource.sonar-packaging-maven-plugin</groupId>
+        <artifactId>sonar-packaging-maven-plugin</artifactId>
+        <configuration>
+          <pluginName>Java Code Quality and Security</pluginName>
+          <skipDependenciesPackaging>true</skipDependenciesPackaging>
+          <pluginClass>org.sonar.plugins.java.JavaPlugin</pluginClass>
+          <requiredForLanguages>java,jsp,kotlin</requiredForLanguages>
+          <sonarLintSupported>true</sonarLintSupported>
+          <jreMinVersion>21</jreMinVersion>
+          <archive>
+            <manifestEntries>
+              <Implementation-Version>${project.version}</Implementation-Version>
+            </manifestEntries>
+          </archive>
+        </configuration>
+        <executions>
+          <execution>
+            <id>build-zip</id>
+            <goals>
+              <goal>zip</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
 
       <plugin>
         <groupId>de.thetaphi</groupId>

From f1efa9edd8379fe572c02e0ed9910e6be5e31353 Mon Sep 17 00:00:00 2001
From: Claire Villard <claire.villard@sonarsource.com>
Date: Wed, 21 Oct 2026 16:18:26 +0200
Subject: [PATCH 2/5] DO NOT MERGE Zip packaging - explicit sonar-plugin goal
 configuration

---
 sonar-java-plugin/pom.xml | 37 +++++++++++++++++++++++--------------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/sonar-java-plugin/pom.xml b/sonar-java-plugin/pom.xml
index 5677973fb58..a1b6f5f415d 100644
--- a/sonar-java-plugin/pom.xml
+++ b/sonar-java-plugin/pom.xml
@@ -30,7 +30,7 @@
 
   <properties>
     <!-- FIXME use a released version -->
-    <version.sonar-packaging.plugin>2.1.0.3074</version.sonar-packaging.plugin>
+    <version.sonar-packaging.plugin>2.1.0.3075</version.sonar-packaging.plugin>
   </properties>
 
   <dependencies>
@@ -159,6 +159,28 @@
       </resource>
     </resources>
     <plugins>
+      <plugin>
+        <groupId>org.sonarsource.sonar-packaging-maven-plugin</groupId>
+        <artifactId>sonar-packaging-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>default-sonar-plugin</id> <!-- The default goal from the lifecycle -->
+            <configuration>
+              <pluginName>Java Code Quality and Security</pluginName>
+              <skipDependenciesPackaging>true</skipDependenciesPackaging>
+              <pluginClass>org.sonar.plugins.java.JavaPlugin</pluginClass>
+              <requiredForLanguages>java,jsp,kotlin</requiredForLanguages>
+              <sonarLintSupported>true</sonarLintSupported>
+              <jreMinVersion>21</jreMinVersion>
+              <archive>
+                <manifestEntries>
+                  <Implementation-Version>${project.version}</Implementation-Version>
+                </manifestEntries>
+              </archive>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
@@ -253,19 +275,6 @@
       <plugin>
         <groupId>org.sonarsource.sonar-packaging-maven-plugin</groupId>
         <artifactId>sonar-packaging-maven-plugin</artifactId>
-        <configuration>
-          <pluginName>Java Code Quality and Security</pluginName>
-          <skipDependenciesPackaging>true</skipDependenciesPackaging>
-          <pluginClass>org.sonar.plugins.java.JavaPlugin</pluginClass>
-          <requiredForLanguages>java,jsp,kotlin</requiredForLanguages>
-          <sonarLintSupported>true</sonarLintSupported>
-          <jreMinVersion>21</jreMinVersion>
-          <archive>
-            <manifestEntries>
-              <Implementation-Version>${project.version}</Implementation-Version>
-            </manifestEntries>
-          </archive>
-        </configuration>
         <executions>
           <execution>
             <id>build-zip</id>

From b3e5d4216998a21a80dda8634bcacd276523caf5 Mon Sep 17 00:00:00 2001
From: Claire Villard <claire.villard@sonarsource.com>
Date: Thu, 22 Oct 2026 14:57:31 +0200
Subject: [PATCH 3/5] DO NOT MERGE Zip packaging - two-modules configuration

---
 pom.xml                                       |  4 ++
 sonar-java-plugin-zip/pom.xml                 | 26 +++++++++
 .../main/resources/static/documentation.md    |  0
 sonar-java-plugin/pom.xml                     | 53 +++++--------------
 4 files changed, 43 insertions(+), 40 deletions(-)
 create mode 100644 sonar-java-plugin-zip/pom.xml
 rename {sonar-java-plugin => sonar-java-plugin-zip}/src/main/resources/static/documentation.md (100%)

diff --git a/pom.xml b/pom.xml
index ffbfedf7760..dc01cd3607d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,6 +57,7 @@
     <module>check-list</module>
     <module>external-reports</module>
     <module>sonar-java-plugin</module>
+    <module>sonar-java-plugin-zip</module>
     <module>java-surefire</module>
     <module>java-jsp</module>
     <module>its</module>
@@ -82,6 +83,9 @@
   <properties>
     <license.title>SonarQube Java</license.title>
 
+    <!-- DO NOT MERGE: pins to the PR-built two-module ZIP packaging demo, not a released version. -->
+    <version.sonar-packaging.plugin>2.1.0.3078</version.sonar-packaging.plugin>
+
     <jdk.min.version>21</jdk.min.version>
 
     <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
diff --git a/sonar-java-plugin-zip/pom.xml b/sonar-java-plugin-zip/pom.xml
new file mode 100644
index 00000000000..b64503cd7c3
--- /dev/null
+++ b/sonar-java-plugin-zip/pom.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.sonarsource.java</groupId>
+    <artifactId>java</artifactId>
+    <version>8.45.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>sonar-java-plugin-zip</artifactId>
+  <packaging>sonar-plugin-zip</packaging>
+
+  <name>SonarQube Java :: Plugin :: Zip</name>
+  <description>Wraps the sonar-java-plugin JAR into a ZIP-packaged plugin artifact</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>sonar-java-plugin</artifactId>
+      <version>${project.version}</version>
+      <type>sonar-plugin</type>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/sonar-java-plugin/src/main/resources/static/documentation.md b/sonar-java-plugin-zip/src/main/resources/static/documentation.md
similarity index 100%
rename from sonar-java-plugin/src/main/resources/static/documentation.md
rename to sonar-java-plugin-zip/src/main/resources/static/documentation.md
diff --git a/sonar-java-plugin/pom.xml b/sonar-java-plugin/pom.xml
index a1b6f5f415d..2c317ac6afb 100644
--- a/sonar-java-plugin/pom.xml
+++ b/sonar-java-plugin/pom.xml
@@ -28,11 +28,6 @@
     <tag>${project.parent.scm.tag}</tag>
   </scm>
 
-  <properties>
-    <!-- FIXME use a released version -->
-    <version.sonar-packaging.plugin>2.1.0.3075</version.sonar-packaging.plugin>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -162,24 +157,19 @@
       <plugin>
         <groupId>org.sonarsource.sonar-packaging-maven-plugin</groupId>
         <artifactId>sonar-packaging-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>default-sonar-plugin</id> <!-- The default goal from the lifecycle -->
-            <configuration>
-              <pluginName>Java Code Quality and Security</pluginName>
-              <skipDependenciesPackaging>true</skipDependenciesPackaging>
-              <pluginClass>org.sonar.plugins.java.JavaPlugin</pluginClass>
-              <requiredForLanguages>java,jsp,kotlin</requiredForLanguages>
-              <sonarLintSupported>true</sonarLintSupported>
-              <jreMinVersion>21</jreMinVersion>
-              <archive>
-                <manifestEntries>
-                  <Implementation-Version>${project.version}</Implementation-Version>
-                </manifestEntries>
-              </archive>
-            </configuration>
-          </execution>
-        </executions>
+        <configuration>
+          <pluginName>Java Code Quality and Security</pluginName>
+          <skipDependenciesPackaging>true</skipDependenciesPackaging>
+          <pluginClass>org.sonar.plugins.java.JavaPlugin</pluginClass>
+          <requiredForLanguages>java,jsp,kotlin</requiredForLanguages>
+          <sonarLintSupported>true</sonarLintSupported>
+          <jreMinVersion>21</jreMinVersion>
+          <archive>
+            <manifestEntries>
+              <Implementation-Version>${project.version}</Implementation-Version>
+            </manifestEntries>
+          </archive>
+        </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -267,23 +257,6 @@
           </execution>
         </executions>
       </plugin>
-      <!--
-        Declared AFTER maven-shade-plugin above: both bind to the "package" phase, and execution order within a
-        phase follows declaration order in this pom.xml. The "zip" goal wraps whatever jar exists on disk at the
-        time it runs, so it must run after shading has rewritten that jar in place.
-      -->
-      <plugin>
-        <groupId>org.sonarsource.sonar-packaging-maven-plugin</groupId>
-        <artifactId>sonar-packaging-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>build-zip</id>
-            <goals>
-              <goal>zip</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
 
       <plugin>
         <groupId>de.thetaphi</groupId>

From 93601daf68852f8b2fae09ad6a3e1ae2c23c09dc Mon Sep 17 00:00:00 2001
From: Claire Villard <claire.villard@sonarsource.com>
Date: Thu, 22 Oct 2026 20:46:25 +0200
Subject: [PATCH 4/5] DO NOT MERGE Bump to sonar-packaging-maven-plugin
 2.1.0.3083, drop static/ nesting

2.1.0.3083 is the first released build of the PACKMP-65 two-module ZIP
packaging after resourcesDirectory was changed to read from this module's
processed Maven resources output (target/classes) instead of raw
src/main/resources/static. Verified the ZIP still contains the
byte-identical shaded sonar-java-plugin JAR and documentation.md, with no
duplication warning.

Since resourcesDirectory now preserves whatever layout populates
target/classes, documentation.md no longer needs a "static" subfolder to
be recognized - move it to sonar-java-plugin-zip/src/main/resources/
directly so it lands at resources/documentation.md in the ZIP instead of
resources/static/documentation.md.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
---
 pom.xml                                                         | 2 +-
 .../src/main/resources/{static => }/documentation.md            | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename sonar-java-plugin-zip/src/main/resources/{static => }/documentation.md (100%)

diff --git a/pom.xml b/pom.xml
index dc01cd3607d..cf57b26a5f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,7 +84,7 @@
     <license.title>SonarQube Java</license.title>
 
     <!-- DO NOT MERGE: pins to the PR-built two-module ZIP packaging demo, not a released version. -->
-    <version.sonar-packaging.plugin>2.1.0.3078</version.sonar-packaging.plugin>
+    <version.sonar-packaging.plugin>2.1.0.3083</version.sonar-packaging.plugin>
 
     <jdk.min.version>21</jdk.min.version>
 
diff --git a/sonar-java-plugin-zip/src/main/resources/static/documentation.md b/sonar-java-plugin-zip/src/main/resources/documentation.md
similarity index 100%
rename from sonar-java-plugin-zip/src/main/resources/static/documentation.md
rename to sonar-java-plugin-zip/src/main/resources/documentation.md

From 3a3f839a97f6d95b3b6c05822081ed131c145601 Mon Sep 17 00:00:00 2001
From: Claire Villard <claire.villard@sonarsource.com>
Date: Thu, 22 Oct 2026 20:58:26 +0200
Subject: [PATCH 5/5] DO NOT MERGE Fix stale parent version in
 sonar-java-plugin-zip after master's 8.46.0 bump

master's "Prepare next development iteration 8.46.0" commit bumped every existing
module's parent version, but sonar-java-plugin-zip didn't exist there yet so it was
left pointing at the old 8.45.0-SNAPSHOT, breaking parent POM resolution on the PR
merge ref.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
---
 sonar-java-plugin-zip/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sonar-java-plugin-zip/pom.xml b/sonar-java-plugin-zip/pom.xml
index b64503cd7c3..1a760af6615 100644
--- a/sonar-java-plugin-zip/pom.xml
+++ b/sonar-java-plugin-zip/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.sonarsource.java</groupId>
     <artifactId>java</artifactId>
-    <version>8.45.0-SNAPSHOT</version>
+    <version>8.46.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>sonar-java-plugin-zip</artifactId>