From ece664d49b63bb199325540bdca37bbdaf5c3b91 Mon Sep 17 00:00:00 2001
From: eyedeekay <hankhill19580@gmail.com>
Date: Tue, 24 Feb 2026 12:52:28 -0500
Subject: [PATCH 1/2] Change Maven Central packaging to use ZIP format instead
 of JAR and clean up old bundles

---
 build.xml | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/build.xml b/build.xml
index ca7f6553c..c0e649c77 100644
--- a/build.xml
+++ b/build.xml
@@ -1258,6 +1258,12 @@
         <delete file="javadoc.zip" />
         <delete file="i2p.fba" />
         <delete file="${sloccount.report.file}" />
+        <delete file="mavencentral-i2p.zip" />
+        <delete file="mavencentral-router.zip" />
+        <delete file="mavencentral-mstreaming.zip" />
+        <delete file="mavencentral-streaming.zip" />
+        <delete file="mavencentral-servlet-i2p.zip" />
+        <!-- clean up old .jar bundles too -->
         <delete file="mavencentral-i2p.jar" />
         <delete file="mavencentral-router.jar" />
         <delete file="mavencentral-mstreaming.jar" />
@@ -2684,33 +2690,33 @@
         <gpgsignasc file="pkg-mavencentral/servlet-i2p-${release.number}.pom" />
         <gpgsignasc file="pkg-mavencentral/servlet-i2p-${release.number}-javadoc.jar" />
         <gpgsignasc file="pkg-mavencentral/servlet-i2p-${release.number}-sources.jar" />
-        <!-- Bundle -->
-        <jar destfile="mavencentral-i2p.jar">
+        <!-- Bundle - use zip not jar, to avoid META-INF which causes Sonatype validation errors -->
+        <zip destfile="mavencentral-i2p.zip">
             <fileset dir="./pkg-mavencentral">
                 <include name="i2p-*" />
             </fileset>
-        </jar>
-        <jar destfile="mavencentral-router.jar">
+        </zip>
+        <zip destfile="mavencentral-router.zip">
             <fileset dir="./pkg-mavencentral">
                 <include name="router-*" />
             </fileset>
-        </jar>
-        <jar destfile="mavencentral-mstreaming.jar">
+        </zip>
+        <zip destfile="mavencentral-mstreaming.zip">
             <fileset dir="./pkg-mavencentral">
                 <include name="mstreaming-*" />
             </fileset>
-        </jar>
-        <jar destfile="mavencentral-streaming.jar">
+        </zip>
+        <zip destfile="mavencentral-streaming.zip">
             <fileset dir="./pkg-mavencentral">
                 <include name="streaming-*" />
             </fileset>
-        </jar>
-        <jar destfile="mavencentral-servlet-i2p.jar">
+        </zip>
+        <zip destfile="mavencentral-servlet-i2p.zip">
             <fileset dir="./pkg-mavencentral">
                 <include name="servlet-i2p-*" />
             </fileset>
-        </jar>
-        <echo message="Now upload mavencentral-*.jar to Maven Central." />
+        </zip>
+        <echo message="Now upload mavencentral-*.zip to Maven Central." />
     </target>
 
     <target name="mavenLocal.deps" depends="buildRouter, buildStreaming">

From a85c6a60052c55b3bf47419055a9f2b74d4d07c5 Mon Sep 17 00:00:00 2001
From: eyedeekay <hankhill19580@gmail.com>
Date: Tue, 24 Feb 2026 13:11:40 -0500
Subject: [PATCH 2/2] Add checksum generation for Sonatype and switch to ZIP
 packaging format for Maven Central

---
 build.xml | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/build.xml b/build.xml
index c0e649c77..5ea2b75fd 100644
--- a/build.xml
+++ b/build.xml
@@ -2661,6 +2661,13 @@
         <artifact:writepom pomRefId="mstreamingpom" file="pkg-mavencentral/mstreaming-${release.number}.pom" />
         <artifact:writepom pomRefId="streamingpom" file="pkg-mavencentral/streaming-${release.number}.pom" />
         <artifact:writepom pomRefId="servletpom" file="pkg-mavencentral/servlet-i2p-${release.number}.pom" />
+        <!-- Checksums - Sonatype requires md5 and sha1 for every artifact -->
+        <checksum algorithm="MD5" fileext=".md5">
+            <fileset dir="pkg-mavencentral" excludes="*.md5 *.sha1 *.asc" />
+        </checksum>
+        <checksum algorithm="SHA-1" fileext=".sha1">
+            <fileset dir="pkg-mavencentral" excludes="*.md5 *.sha1 *.asc" />
+        </checksum>
         <!-- Signatures -->
         <echo message="Sign the files:" />
         <input message="Enter GPG key ID (e.g. 0x12345678) for signing:" addproperty="release.gpg.keyid" />
@@ -2690,31 +2697,33 @@
         <gpgsignasc file="pkg-mavencentral/servlet-i2p-${release.number}.pom" />
         <gpgsignasc file="pkg-mavencentral/servlet-i2p-${release.number}-javadoc.jar" />
         <gpgsignasc file="pkg-mavencentral/servlet-i2p-${release.number}-sources.jar" />
-        <!-- Bundle - use zip not jar, to avoid META-INF which causes Sonatype validation errors -->
+        <!-- Bundle - use zip not jar, to avoid META-INF which causes Sonatype validation errors.
+             Files must be placed in Maven repository directory layout (groupId/artifactId/version/)
+             for the Sonatype Central Portal to accept them. -->
         <zip destfile="mavencentral-i2p.zip">
-            <fileset dir="./pkg-mavencentral">
+            <zipfileset dir="./pkg-mavencentral" prefix="net/i2p/i2p/${release.number}">
                 <include name="i2p-*" />
-            </fileset>
+            </zipfileset>
         </zip>
         <zip destfile="mavencentral-router.zip">
-            <fileset dir="./pkg-mavencentral">
+            <zipfileset dir="./pkg-mavencentral" prefix="net/i2p/router/${release.number}">
                 <include name="router-*" />
-            </fileset>
+            </zipfileset>
         </zip>
         <zip destfile="mavencentral-mstreaming.zip">
-            <fileset dir="./pkg-mavencentral">
+            <zipfileset dir="./pkg-mavencentral" prefix="net/i2p/client/mstreaming/${release.number}">
                 <include name="mstreaming-*" />
-            </fileset>
+            </zipfileset>
         </zip>
         <zip destfile="mavencentral-streaming.zip">
-            <fileset dir="./pkg-mavencentral">
+            <zipfileset dir="./pkg-mavencentral" prefix="net/i2p/client/streaming/${release.number}">
                 <include name="streaming-*" />
-            </fileset>
+            </zipfileset>
         </zip>
         <zip destfile="mavencentral-servlet-i2p.zip">
-            <fileset dir="./pkg-mavencentral">
+            <zipfileset dir="./pkg-mavencentral" prefix="net/i2p/servlet-i2p/${release.number}">
                 <include name="servlet-i2p-*" />
-            </fileset>
+            </zipfileset>
         </zip>
         <echo message="Now upload mavencentral-*.zip to Maven Central." />
     </target>