dandri/i2p.i2p
1
0
Fork 0
mirror of https://github.com/i2p/i2p.i2p.git synced 2026-03-29 07:39:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'i2p-2.11.0-maven-fix'. This resolves build issues related to producing Java 17 packages suitable for MavenCentral distribution.

Browse Source
This commit is contained in:
eyedeekay
2026-03-26 14:11:58 -04:00
parent 10da8f733e a85c6a6005
commit b91f765c3c
1 changed files with 37 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
build.xml
View File

@@ -1267,6 +1267,12 @@
<delete file="javadoc.zip" /> <delete file="javadoc.zip" />
<delete file="i2p.fba" /> <delete file="i2p.fba" />
<delete file="${sloccount.report.file}" /> <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-i2p.jar" />
<delete file="mavencentral-router.jar" /> <delete file="mavencentral-router.jar" />
<delete file="mavencentral-mstreaming.jar" /> <delete file="mavencentral-mstreaming.jar" />
@@ -2700,6 +2706,13 @@
<artifact:writepom pomRefId="mstreamingpom" file="pkg-mavencentral/mstreaming-${release.number}.pom" /> <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="streamingpom" file="pkg-mavencentral/streaming-${release.number}.pom" />
<artifact:writepom pomRefId="servletpom" file="pkg-mavencentral/servlet-i2p-${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 --> <!-- Signatures -->
<echo message="Sign the files:" /> <echo message="Sign the files:" />
<input message="Enter GPG key ID (e.g. 0x12345678) for signing:" addproperty="release.gpg.keyid" /> <input message="Enter GPG key ID (e.g. 0x12345678) for signing:" addproperty="release.gpg.keyid" />
@@ -2729,33 +2742,35 @@
<gpgsignasc file="pkg-mavencentral/servlet-i2p-${release.number}.pom" /> <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}-javadoc.jar" />
<gpgsignasc file="pkg-mavencentral/servlet-i2p-${release.number}-sources.jar" /> <gpgsignasc file="pkg-mavencentral/servlet-i2p-${release.number}-sources.jar" />
<!-- Bundle --> <!-- Bundle - use zip not jar, to avoid META-INF which causes Sonatype validation errors.
<jar destfile="mavencentral-i2p.jar"> Files must be placed in Maven repository directory layout (groupId/artifactId/version/)
<fileset dir="./pkg-mavencentral"> for the Sonatype Central Portal to accept them. -->
<zip destfile="mavencentral-i2p.zip">
<zipfileset dir="./pkg-mavencentral" prefix="net/i2p/i2p/${release.number}">
<include name="i2p-*" /> <include name="i2p-*" />
</fileset> </zipfileset>
</jar> </zip>
<jar destfile="mavencentral-router.jar"> <zip destfile="mavencentral-router.zip">
<fileset dir="./pkg-mavencentral"> <zipfileset dir="./pkg-mavencentral" prefix="net/i2p/router/${release.number}">
<include name="router-*" /> <include name="router-*" />
</fileset> </zipfileset>
</jar> </zip>
<jar destfile="mavencentral-mstreaming.jar"> <zip destfile="mavencentral-mstreaming.zip">
<fileset dir="./pkg-mavencentral"> <zipfileset dir="./pkg-mavencentral" prefix="net/i2p/client/mstreaming/${release.number}">
<include name="mstreaming-*" /> <include name="mstreaming-*" />
</fileset> </zipfileset>
</jar> </zip>
<jar destfile="mavencentral-streaming.jar"> <zip destfile="mavencentral-streaming.zip">
<fileset dir="./pkg-mavencentral"> <zipfileset dir="./pkg-mavencentral" prefix="net/i2p/client/streaming/${release.number}">
<include name="streaming-*" /> <include name="streaming-*" />
</fileset> </zipfileset>
</jar> </zip>
<jar destfile="mavencentral-servlet-i2p.jar"> <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-*" /> <include name="servlet-i2p-*" />
</fileset> </zipfileset>
</jar> </zip>
<echo message="Now upload mavencentral-*.jar to Maven Central." /> <echo message="Now upload mavencentral-*.zip to Maven Central." />
</target> </target>
<target name="mavenLocal.deps" depends="buildRouter, buildStreaming"> <target name="mavenLocal.deps" depends="buildRouter, buildStreaming">