Pull request #11 - Updated links and dependencies

4 files changed, 22 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3da0b4f675a4..fb4a28ad50f5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,14 @@
 pkgbase = reposilite
 	pkgdesc = Reposilite (formerly NanoMaven) - lightweight repository manager for Maven artifacts. It is a simple solution to replace managers like Nexus, Archiva or Artifactory.
 	pkgver = 3.4.0
-	pkgrel = 1
-	url = https://github.com/dzikoysk/reposilite
+	pkgrel = 2
+	url = https://reposilite.com
 	arch = any
 	license = Apache
-	makedepends = jdk11-openjdk
-	makedepends = nodejs
+	makedepends = java-environment=18
+	makedepends = nodejs-lts-hydrogen
 	makedepends = npm
-	depends = jre11-openjdk-headless
+	depends = java-runtime-headless>=18
 	backup = etc/reposilite/configuration.cdn
 	backup = etc/reposilite/default.env
 	source = reposilite-3.4.0.tar.gz::https://github.com/dzikoysk/reposilite/archive/3.4.0.tar.gz
@@ -21,7 +21,7 @@ pkgbase = reposilite
 	sha256sums = 1e543e7ef39d64ae683156aaa6aad8f164f30de999d15717416410e1750b9a8e
 	sha256sums = 92ccfeff429aa4757ef353677dd99ad7aebe7483d4824706a27250e81efd6323
 	sha256sums = 9587fa49dd66d5f31dee33aa1a9da269a34666b63f62e2550a66c3bc1d397aa7
-	sha256sums = 7affcf3ef54c9c05326281c3496a8744221be312675fd7d4ab17fd50eb320521
-	sha256sums = d06d5686dace4d74dd788ea9f755536678e614af481206969aa457ef79dec400
+	sha256sums = 7869b2925d6d2a897148b282af02992d7b4c5cfb6e7f01f0a277633689614c11
+	sha256sums = 2f7cd3fdada1ba51da3259a2ad7ef6bbdbb5fea5023c8fcc78d4d5c19ff569d3
 
 pkgname = reposilite
diff --git a/PKGBUILD b/PKGBUILD
index 71240d558fbb..afdeb8725514 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,14 +3,14 @@
 
 pkgname=reposilite
 pkgver=3.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Reposilite (formerly NanoMaven) - lightweight repository manager for Maven artifacts. It is a simple solution to replace managers like Nexus, Archiva or Artifactory."
 arch=(any)
-url="https://github.com/dzikoysk/$pkgname"
+url="https://reposilite.com"
 license=('Apache')
-depends=('jre11-openjdk-headless')
-makedepends=('jdk11-openjdk' 'nodejs' 'npm')
-source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz"
+depends=('java-runtime-headless>=18')
+makedepends=('java-environment=18' 'nodejs-lts-hydrogen' 'npm')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/dzikoysk/reposilite/archive/$pkgver.tar.gz"
         "$pkgname.service"
         "$pkgname.sysusers"
         "$pkgname.tmpfiles"
@@ -20,8 +20,8 @@ sha256sums=('bbaa0ff8ec32718433d9ff8906b1dc8bce3a814b8580569e7bcb64aa1fb72c43'
             '1e543e7ef39d64ae683156aaa6aad8f164f30de999d15717416410e1750b9a8e'
             '92ccfeff429aa4757ef353677dd99ad7aebe7483d4824706a27250e81efd6323'
             '9587fa49dd66d5f31dee33aa1a9da269a34666b63f62e2550a66c3bc1d397aa7'
-            '7affcf3ef54c9c05326281c3496a8744221be312675fd7d4ab17fd50eb320521'
-            'd06d5686dace4d74dd788ea9f755536678e614af481206969aa457ef79dec400')
+            '7869b2925d6d2a897148b282af02992d7b4c5cfb6e7f01f0a277633689614c11'
+            '2f7cd3fdada1ba51da3259a2ad7ef6bbdbb5fea5023c8fcc78d4d5c19ff569d3')
 backup=('etc/reposilite/configuration.cdn'
         'etc/reposilite/default.env')
 
@@ -29,7 +29,7 @@ build() {
   cd "$pkgname-$pkgver"
   sed -i -r -e "s/(\\s+)version\\s*=.*/\\1version = \"$pkgver\"/" build.gradle.kts
   chmod a+x gradlew
-  JAVA_HOME="/usr/lib/jvm/java-11-openjdk" ./gradlew :reposilite-backend:shadowJar --no-daemon --stacktrace
+  JAVA_HOME="/usr/lib/jvm/java-18-openjdk" ./gradlew :reposilite-backend:shadowJar --no-daemon --stacktrace
 }
 
 package() {
@@ -38,6 +38,6 @@ package() {
   install -Dm 644 $pkgname.tmpfiles "${pkgdir}/usr/lib/tmpfiles.d/$pkgname.conf"
   install -Dm 644 $pkgname-$pkgver/reposilite-backend/build/libs/$pkgname-$pkgver.jar "$pkgdir/usr/share/java/$pkgname/$pkgname.jar"
   install -Dm 644 $pkgname.env "${pkgdir}/etc/reposilite/default.env"
-  /usr/lib/jvm/java-11-openjdk/bin/java -jar "$pkgdir/usr/share/java/$pkgname/$pkgname.jar" -wd "${pkgdir}/etc/reposilite" -gc configuration.cdn
+  /usr/lib/jvm/java-18-openjdk/bin/java -jar "$pkgdir/usr/share/java/$pkgname/$pkgname.jar" -wd "${pkgdir}/etc/reposilite" -gc configuration.cdn
   install -Dm 755 $pkgname.wrapper "${pkgdir}/usr/bin/reposilite"
 }
diff --git a/reposilite.env b/reposilite.env
index 2fd1c5eb446c..0fd331395d04 100644
--- a/reposilite.env
+++ b/reposilite.env
@@ -7,6 +7,10 @@
 # Running user
 #REPOSILITE_USER=reposilite
 
+# Path to the java executable ; defaults to system-wide set with archlinux-java.
+# Other runtime environments from /usr/lib/jvm can be used (at least version 18.x)
+#JAVA=/usr/bin/java
+
 # Working directory where shared configuration and repositories are stored
 #REPOSILITE_WORKING_DIR=/var/lib/reposilite
 
diff --git a/reposilite.wrapper b/reposilite.wrapper
index 4418c50da887..7609e3f16210 100644
--- a/reposilite.wrapper
+++ b/reposilite.wrapper
@@ -10,7 +10,7 @@ _RUN_USER=${REPOSILITE_USER:-reposilite}
 _RUN_UID=`id -u $_RUN_USER`
 
 if [ "$EUID" -eq "$_RUN_UID" ] ; then
-   exec /usr/lib/jvm/java-11-openjdk/bin/java -Xmx${REPOSILITE_MEM:-64m} \
+   exec ${JAVA:-/usr/bin/java} -Xmx${REPOSILITE_MEM:-64m} \
      -jar /usr/share/java/reposilite/reposilite.jar \
      -wd ${REPOSILITE_WORKING_DIR:-/var/lib/reposilite} \
      -lc ${REPOSILITE_LOCAL_CONF:-/etc/reposilite/reposilite.cdn}
@@ -19,7 +19,7 @@ elif [ "$EUID" -ne 0 ]; then
   exit 1
 else
     exec runuser -u $_RUN_USER -- \
-       /usr/lib/jvm/java-11-openjdk/bin/java -Xmx${REPOSILITE_MEM:-64m} \
+       ${JAVA:-/usr/bin/java} -Xmx${REPOSILITE_MEM:-64m} \
          -jar /usr/share/java/reposilite/reposilite.jar \
          -wd ${REPOSILITE_WORKING_DIR:-/var/lib/reposilite} \
          -lc ${REPOSILITE_LOCAL_CONF:-/etc/reposilite/reposilite.cdn}