From 6c9cb62f5fab4cf2dd1a5327184d388cc52f1362 Mon Sep 17 00:00:00 2001 From: nyyu Date: Mon, 30 Sep 2024 08:35:11 +0200 Subject: [PATCH] feat(nexus): java 23 support --- nexus-oss/.SRCINFO | 7 ++++--- nexus-oss/PKGBUILD | 20 +++++++++++++------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/nexus-oss/.SRCINFO b/nexus-oss/.SRCINFO index da8bd53..d308574 100644 --- a/nexus-oss/.SRCINFO +++ b/nexus-oss/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = nexus-oss pkgdesc = Nexus 3 Repository OSS pkgver = 3.72.0.04 - pkgrel = 1 + pkgrel = 2 url = http://nexus.sonatype.org arch = any license = custom:nexus-oss @@ -9,6 +9,7 @@ pkgbase = nexus-oss depends = java-runtime>=17 provides = nexus3 replaces = nexus3 + noextract = org.apache.aries.spifly.dynamic.framework.extension-1.3.7.jar backup = var/lib/nexus-oss/etc/nexus.properties backup = usr/lib/nexus-oss/bin/nexus.vmoptions source = https://download.sonatype.com/nexus/3/nexus-3.72.0-04-unix.tar.gz @@ -19,7 +20,7 @@ pkgbase = nexus-oss source = nexus-oss.tmpfiles source = nexus-oss.vmoptions source = pref_jre.cfg - source = DefaultProductLicenseManager.class + source = https://nexus.nyyu.dev/repository/files/jar/org.apache.aries.spifly.dynamic.framework.extension-1.3.7.jar sha256sums = 45148c0645ab0611f6881b782b83e9dab0dbfb1b848e9b95ebaeb274c708a1c0 sha256sums = 3f34cf42929303219398c1e9f4e690579dcf0a7e176cf031e0f5173203eb802d sha256sums = dcdef5614db12f38b3da0b9de1b52fb7fa402af6621a825981c6168a34a6ad9b @@ -28,6 +29,6 @@ pkgbase = nexus-oss sha256sums = 939994095f0c5de005a1e36a295bea791a70dadfa32af23b400cbd87be57af9c sha256sums = 176c02ba4299ad818eed75cdaeb42a2d9ffa7332fc74ff30b7c37965e7095df4 sha256sums = 08a372b6601a4a3bce832f5d73f9d35e5b700984b9947b34bb679c39902e8804 - sha256sums = 4b5d4b116102cdc8b54e5921b1970195789a51750344aee4f070077d96cabd7d + sha256sums = 1215f14761c65121f5c7360c68c4ed12ffd6b710e88e51a104c29df09924dea0 pkgname = nexus-oss diff --git a/nexus-oss/PKGBUILD b/nexus-oss/PKGBUILD index 5c43944..e88d59a 100644 --- a/nexus-oss/PKGBUILD +++ b/nexus-oss/PKGBUILD @@ -3,7 +3,7 @@ _patch=04 pkgname=nexus-oss pkgver=${_version}.${_patch} -pkgrel=1 +pkgrel=2 pkgdesc='Nexus 3 Repository OSS' arch=('any') url='http://nexus.sonatype.org' @@ -23,8 +23,9 @@ source=("https://download.sonatype.com/nexus/3/nexus-$_version-$_patch-unix.tar. "$pkgname.tmpfiles" "$pkgname.vmoptions" "pref_jre.cfg" - "DefaultProductLicenseManager.class" + "https://nexus.nyyu.dev/repository/files/jar/org.apache.aries.spifly.dynamic.framework.extension-1.3.7.jar" ) +noextract=('org.apache.aries.spifly.dynamic.framework.extension-1.3.7.jar') sha256sums=('45148c0645ab0611f6881b782b83e9dab0dbfb1b848e9b95ebaeb274c708a1c0' '3f34cf42929303219398c1e9f4e690579dcf0a7e176cf031e0f5173203eb802d' 'dcdef5614db12f38b3da0b9de1b52fb7fa402af6621a825981c6168a34a6ad9b' @@ -33,9 +34,16 @@ sha256sums=('45148c0645ab0611f6881b782b83e9dab0dbfb1b848e9b95ebaeb274c708a1c0' '939994095f0c5de005a1e36a295bea791a70dadfa32af23b400cbd87be57af9c' '176c02ba4299ad818eed75cdaeb42a2d9ffa7332fc74ff30b7c37965e7095df4' '08a372b6601a4a3bce832f5d73f9d35e5b700984b9947b34bb679c39902e8804' - '4b5d4b116102cdc8b54e5921b1970195789a51750344aee4f070077d96cabd7d') + '1215f14761c65121f5c7360c68c4ed12ffd6b710e88e51a104c29df09924dea0') prepare() { + sed -i '/eecap-18/i eecap-23 = osgi.ee; osgi.ee="OSGi/Minimum"; version:List="1.0,1.1,1.2", \\\ + osgi.ee; osgi.ee="JavaSE"; version:List="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0,20.0,21.0,22.0,23.0", \\\ + osgi.ee; osgi.ee="JRE"; version:List="1.0,1.1", \\\ + osgi.ee; osgi.ee="JavaSE/compact1"; version:List="1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0,20.0,21.0,22.0,23.0", \\\ + osgi.ee; osgi.ee="JavaSE/compact2"; version:List="1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0,20.0,21.0,22.0,23.0", \\\ + osgi.ee; osgi.ee="JavaSE/compact3"; version:List="1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0,20.0,21.0,22.0,23.0"' $srcdir/nexus-$_version-$_patch/etc/karaf/config.properties + sed -i '/eecap-18/i eecap-22 = osgi.ee; osgi.ee="OSGi/Minimum"; version:List="1.0,1.1,1.2", \\\ osgi.ee; osgi.ee="JavaSE"; version:List="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0,20.0,21.0,22.0", \\\ osgi.ee; osgi.ee="JRE"; version:List="1.0,1.1", \\\ @@ -50,11 +58,9 @@ prepare() { osgi.ee; osgi.ee="JavaSE/compact2"; version:List="1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0,20.0,21.0", \\\ osgi.ee; osgi.ee="JavaSE/compact3"; version:List="1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0,20.0,21.0"' $srcdir/nexus-$_version-$_patch/etc/karaf/config.properties - sed -i '/jre-19 = ${jre-18}/a jre-20 = ${jre-19}\njre-21 = ${jre-20}\njre-22 = ${jre-21}' $srcdir/nexus-$_version-$_patch/etc/karaf/jre.properties + sed -i '/jre-19 = ${jre-18}/a jre-20 = ${jre-19}\njre-21 = ${jre-20}\njre-22 = ${jre-21}\njre-23 = ${jre-22}' $srcdir/nexus-$_version-$_patch/etc/karaf/jre.properties - folder=org/sonatype/licensing/product/internal - mkdir -p $folder && cp DefaultProductLicenseManager.class $folder - zip -ur $srcdir/nexus-$_version-$_patch/system/com/sonatype/licensing/license-bundle/1.6.0/license-bundle-1.6.0.jar $folder/DefaultProductLicenseManager.class + cp -f $srcdir/org.apache.aries.spifly.dynamic.framework.extension-1.3.7.jar $srcdir/nexus-$_version-$_patch/system/org/apache/aries/spifly/org.apache.aries.spifly.dynamic.framework.extension/1.3.7/ } package() {