testing/java-jtharness: Upgrade to 6.0_p10

2 files changed, 16 insertions, 45 deletions

diff --git a/testing/java-jtharness/APKBUILD b/testing/java-jtharness/APKBUILD
index 605fe07c14..43eb108c76 100644
--- a/testing/java-jtharness/APKBUILD
+++ b/testing/java-jtharness/APKBUILD
@@ -1,24 +1,23 @@
 # Contributor: Simon Frankenberger <simon-alpine@fraho.eu>
 # Maintainer: Simon Frankenberger <simon-alpine@fraho.eu>
 pkgname=java-jtharness
-pkgver=5.0
+pkgver=6.0_p10
+_pkgver=${pkgver/_p/-b}
 pkgrel=0
 pkgdesc="The JT harness is a general purpose, fully-featured, flexible, and configurable test harness"
-url="http://hg.openjdk.java.net/code-tools/jtharness"
+url="https://hg.openjdk.java.net/code-tools/jtharness"
 arch="noarch"
 license="GPL-2.0"
 makedepends="openjdk8"
 options="!check" # this package has no tests
 subpackages="$pkgname-doc:_doc $pkgname-examples:_examples"
-source="jtharness-$pkgver.tar.bz2::http://hg.openjdk.java.net/code-tools/jtharness/archive/jt$pkgver.tar.bz2
-http://ftp-stud.hs-esslingen.de/pub/Mirrors//ftp.apache.org/dist/ant/binaries/apache-ant-1.9.13-bin.zip
-http://central.maven.org/maven2/asm/asm-all/3.1/asm-all-3.1.jar
-http://central.maven.org/maven2/junit/junit/4.4/junit-4.4.jar
-http://central.maven.org/maven2/javax/servlet/javax.servlet-api/3.0.1/javax.servlet-api-3.0.1.jar
-
-source-target.patch
+source="jtharness-$_pkgver.tar.bz2::https://hg.openjdk.java.net/code-tools/jtharness/archive/jt$_pkgver.tar.bz2
+https://archive.apache.org/dist/ant/binaries/apache-ant-1.9.13-bin.tar.bz2
+https://repo1.maven.org/maven2/asm/asm-all/3.1/asm-all-3.1.jar
+https://repo1.maven.org/maven2/junit/junit/4.4/junit-4.4.jar
+https://repo1.maven.org/maven2/javax/servlet/javax.servlet-api/3.0.1/javax.servlet-api-3.0.1.jar
 "
-builddir="$srcdir/jtharness-jt$pkgver"
+builddir="$srcdir/jtharness-jt$_pkgver"
 
 _ant_home="$srcdir"/apache-ant-1.9.13/
 _servletjar="$srcdir"/javax.servlet-api-3.0.1.jar
@@ -40,14 +39,14 @@ prepare() {
 
 build() {
 	cd "$builddir/build"
-	$_ant_home/bin/ant
+	JAVA_HOME=/usr/lib/jvm/default-jvm $_ant_home/bin/ant
 }
 
 package() {
 	_destdir="$pkgdir/usr/share/java/jtharness"
 	mkdir -p "$_destdir"
 	cp -r \
-		$builddir/target/binaries/legal \
+		$builddir/legal \
 		$builddir/target/binaries/lib \
 		"$_destdir"
 }
@@ -55,21 +54,19 @@ package() {
 _examples() {
 	_destdir="$subpkgdir/usr/share/java/jtharness"
 	mkdir -p "$_destdir"
-	cp -r $builddir/target/binaries/examples "$_destdir"
+	cp -r $builddir/examples "$_destdir"
 }
 
 _doc() {
 	_destdir="$subpkgdir/usr/share/java/jtharness"
 	mkdir -p "$_destdir"
 	cp -r \
-		$builddir/target/binaries/doc \
-		$builddir/target/binaries/ReleaseNotes-jtharness.html \
+		$builddir/doc \
 		"$_destdir"
 }
 
-sha512sums="f4cbf815e90c5fadd7af8f68fd0cc9ee9ebf67fefd7cb8c0dff845b1954d0126dc55a593c3d6e3b46c7865dac3f4821e97f1bed542c374b2ee54347e00063acf  jtharness-5.0.tar.bz2
-873062cf789e1572ec4ef3cdbb15c0d3a57e5a0794068591565367d4cec15b9f9a24f59734a85170d61b23eb9288d6bafd35a9ae2b015b09c7a175e344cb4e1c  apache-ant-1.9.13-bin.zip
+sha512sums="f910c608dbc7f89066f47b355c18f561cfef429298e2e740fe678cb741ca847de97a821f542d38c96c34ba9bcd30661d852a773b29b75dcdcc91e2e8f9082fe8  jtharness-6.0-b10.tar.bz2
+e9b602aacbac7bf721a830f56ea06cde60a7a674a6d67f05ce82848ac01b2ee84f7003190286fea1030abb523398fa1a280d265377f41f57e7cf7e6d1fe37465  apache-ant-1.9.13-bin.tar.bz2
 00990aa9d39fe874f6799dc8d9d1b208b61e6358a949df86014edeacbea63dcdc4ac7870948a54270e1db4b8ec134313b200fe7cdede7aa6746c812c36f0ac13  asm-all-3.1.jar
 4ae9fb09ebd9800ba1c9f0bfc43f07f7bc499e41894dea74b50f01fd69690b5d4e8f7949e2afce10fa0da719e8a2df223430e3aef7e2529662c7b70a12c80ab9  junit-4.4.jar
-1e087f1e4632048f1c6ea12e3820a30c7a6e66b13277ec8e784d8c5aba99335cd90cdb08e23756e815324cc9c8dc22d0937c7ccf4b89ee00222cd5e4a1d2a0de  javax.servlet-api-3.0.1.jar
-ea27ff0a469df11179b3f2d6b0a78f94cc76959d42cde22a7043ffb557f93a3b8f905b50df41f40c7b82b5c77348875d32a93bd268e758d9ef0496b904ca9ec3  source-target.patch"
+1e087f1e4632048f1c6ea12e3820a30c7a6e66b13277ec8e784d8c5aba99335cd90cdb08e23756e815324cc9c8dc22d0937c7ccf4b89ee00222cd5e4a1d2a0de  javax.servlet-api-3.0.1.jar"
diff --git a/testing/java-jtharness/source-target.patch b/testing/java-jtharness/source-target.patch
deleted file mode 100644
index 351408b7c7..0000000000
--- a/testing/java-jtharness/source-target.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/build/build.xml
-+++ b/build/build.xml
-@@ -290,6 +290,7 @@
-         <delete dir="${build.classes}" quiet="true"/>
-         <mkdir dir="${build.classes}"/>
-         <javac encoding="iso-8859-1" debug="true" target="1.7"
-+               source="1.7"
-                srcdir="${src.dir}"
-                sourcepath=""
-                destdir="${build.classes}"
-@@ -307,6 +308,7 @@
-     <target name="compile.test.copyright.classes">
-         <mkdir dir="${build.classes}"/>
-         <javac encoding="iso-8859-1" debug="true" target="1.7"
-+               source="1.7"
-                srcdir="${test.dir}"
-                destdir="${build.classes}"
-                classpath="${jdk14.classpath}">
-@@ -320,6 +322,7 @@
- 
-         <mkdir dir="${build.junit.classes}"/>
-         <javac encoding="iso-8859-1" debug="true" target="1.7"
-+               source="1.7"
-                srcdir="${src.dir}"
-                destdir="${build.junit.classes}"
-                classpath="${jdk14.classpath}:${build.classes}:${bytecodelib}:${junitlib}">