update to 6.51.0

3 files changed, 61 insertions, 49 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7e8f0013222c..13ac9bb505bf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,17 @@
 pkgbase = pmd
-	pkgdesc = An extensible cross-language static code analyzer.
-	pkgver = 6.40.0
+	pkgdesc = Extensible cross-language static code analyzer
+	pkgver = 6.51.0
 	pkgrel = 1
-	url = https://pmd.github.io/
+	url = https://github.com/pmd/pmd
 	arch = any
 	license = BSD
 	license = Apache
-	depends = java-environment
-	conflicts = pmd-bin
-	replaces = pmd-bin
-	source = https://github.com/pmd/pmd/releases/download/pmd_releases/6.40.0/pmd-bin-6.40.0.zip
+	makedepends = java-environment>=11
+	makedepends = maven
+	depends = java-runtime>=7
+	source = pmd-6.51.0.zip::https://github.com/pmd/pmd/releases/download/pmd_releases%2F6.51.0/pmd-src-6.51.0.zip
 	source = pmdapp
-	sha256sums = 31b2009e2b52a35a0e9c28c4ae25c6eea21611b960232c6a0240fecf77995955
-	sha256sums = b1a73343ba0435801ce18c7fc18e14b7fed6a9be7b0a5907b67730471c176fc8
+	sha256sums = 007990bec5ca9780dacc8adb30b58e8b8441de4f822b60c3533da1002cefab78
+	sha256sums = 047ea25735c7fabb75679889652d82e3a557c8df8d87380045c5cd3eb5f5b02e
 
 pkgname = pmd
diff --git a/PKGBUILD b/PKGBUILD
index 1e1f40c06e6c..a23763cae449 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,31 +1,39 @@
-# Maintainer: Simon Legner <Simon.Legner@gmail.com>
+# Maintainer: Luis Martinez <luis dot martinez at disroot dot org>
+# Contributor: Simon Legner <Simon.Legner@gmail.com>
 # Contributor: David Pugnasse <david.pugnasse@gmail.com>
+
 pkgname=pmd
-pkgver=6.40.0
+pkgver=6.51.0
 pkgrel=1
-pkgdesc="An extensible cross-language static code analyzer."
+pkgdesc="Extensible cross-language static code analyzer"
 arch=('any')
-url="https://pmd.github.io/"
+url="https://github.com/pmd/pmd"
 license=('BSD' 'Apache')
-depends=('java-environment')
-conflicts=("pmd-bin")
-replaces=("pmd-bin")
-source=("https://github.com/$pkgname/$pkgname/releases/download/${pkgname}_releases/$pkgver/$pkgname-bin-$pkgver.zip"
+depends=('java-runtime>=7')
+makedepends=('java-environment>=11' 'maven')
+source=("$pkgname-$pkgver.zip::$url/releases/download/pmd_releases%2F$pkgver/pmd-src-$pkgver.zip"
         pmdapp)
-sha256sums=('31b2009e2b52a35a0e9c28c4ae25c6eea21611b960232c6a0240fecf77995955'
-            'b1a73343ba0435801ce18c7fc18e14b7fed6a9be7b0a5907b67730471c176fc8')
-
-package() {
-    cd "$pkgname-bin-$pkgver"
+sha256sums=('007990bec5ca9780dacc8adb30b58e8b8441de4f822b60c3533da1002cefab78'
+            '047ea25735c7fabb75679889652d82e3a557c8df8d87380045c5cd3eb5f5b02e')
 
-    install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+prepare() {
+	cd "pmd-src-$pkgver"
+	JAVA_HOME=/usr/lib/jvm/default mvn dependency:go-offline
+}
 
-    for app in pmd-bgastviewer pmd-cpd pmd-cpdgui pmd-designer pmd-designerold pmd; do
-        install -Dm755 "../pmdapp" "$pkgdir/usr/bin/$app"
-    done
+build() {
+	cd "pmd-src-$pkgver"
+	JAVA_HOME=/usr/lib/jvm/default mvn install -Dmaven.test.skip=true
+	mkdir -p "$srcdir/build"
+	bsdtar -xf "pmd-dist/target/pmd-bin-$pkgver.zip" -C "$srcdir/build" --strip-components 1 "pmd-bin-$pkgver/lib"
+}
 
-    cd lib
-    for file in *.jar; do
-        install -Dm644 "$file" "$pkgdir/usr/share/java/$pkgname/$file"
-    done
+package() {
+	install -Dvm644 build/lib/*.jar -t "$pkgdir/usr/share/java/$pkgname/"
+	install -Dv pmdapp -t "$pkgdir/usr/bin/"
+	for i in pmd-bgastviewer pmd-cpd pmd-cpdgui pmd-designer pmd-designerold pmd; do
+		ln -sv /usr/bin/pmdapp "$pkgdir/usr/bin/$i"
+	done
+	cd "pmd-src-$pkgver"
+	install -Dvm644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/"
 }
diff --git a/pmdapp b/pmdapp
index 01d08578760a..5e097135b4a7 100644
--- a/pmdapp
+++ b/pmdapp
@@ -2,28 +2,32 @@
 
 app=$(basename $0)
 case "$app" in
-  'pmd')
-    readonly class='net.sourceforge.pmd.PMD'
-    ;;
-  'pmd-cpd')
-    readonly class='net.sourceforge.pmd.cpd.CPD'
-    ;;
-  'pmd-designer')
-    readonly class='net.sourceforge.pmd.util.fxdesigner.Designer'
-    ;;
-  'pmd-designerold')
-    readonly class='net.sourceforge.pmd.util.designer.Designer'
-    ;;
-  'pmd-bgastviewer')
-    readonly class='net.sourceforge.pmd.util.viewer.Viewer'
-    ;;
-  'pmd-cpdgui')
-    readonly class='net.sourceforge.pmd.cpd.GUI'
-    ;;
+	'pmd')
+		readonly class='net.sourceforge.pmd.PMD'
+		;;
+	'pmd-cpd')
+		readonly class='net.sourceforge.pmd.cpd.CPD'
+		;;
+	'pmd-designer')
+		readonly class='net.sourceforge.pmd.util.fxdesigner.Designer'
+		;;
+	'pmd-designerold')
+		readonly class='net.sourceforge.pmd.util.designer.Designer'
+		;;
+	'pmd-bgastviewer')
+		readonly class='net.sourceforge.pmd.util.viewer.Viewer'
+		;;
+	'pmd-cpdgui')
+		readonly class='net.sourceforge.pmd.cpd.GUI'
+		;;
+	*)
+		echo 'Do not call this script directly, thanks!'
+		exit 1
+		;;
 esac
 
 for file in /usr/share/java/pmd/*.jar; do
-  CP="$CP:$file"
+	CP="$CP:$file"
 done
 
 exec /usr/bin/java -cp "$CP" "$class" "$@"