summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorVladimir Tsanev2018-09-12 22:36:44 +0300
committerVladimir Tsanev2018-09-12 22:36:44 +0300
commit6bcd1562b46b8a70c9b47f1b19fe7145ab2b048e (patch)
treef2e5d0f58018f4f7bd3c4aa33bbbb76c15ef877d
parentcd6e4ce8df476ce2ce5ef9f82a9b2da68cdc3dbf (diff)
downloadaur-6bcd1562b46b8a70c9b47f1b19fe7145ab2b048e.tar.gz
ant 1.10 requires java 8
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD10
2 files changed, 8 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e6078c857f3..8a60bce39b5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,12 @@
pkgbase = jtharness
pkgdesc = general purpose, fully-featured, flexible, and configurable test harness very well suited for most types of unit testing
pkgver = 6.0_b03
- pkgrel = 1
+ pkgrel = 2
url = https://wiki.openjdk.java.net/display/CodeTools/JT+Harness
arch = any
license = GPL2
- makedepends = apache-ant
- makedepends = java-environment-openjdk=7
+ makedepends = ant
+ makedepends = java-environment-openjdk=8
makedepends = junit
makedepends = java-asm
depends = java-runtime>=7
diff --git a/PKGBUILD b/PKGBUILD
index 0dc499e7d8d..3b427a414af 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,16 +1,17 @@
# Maintainer: Vladimir Tsanev <tsachev@gmail.com>
+
pkgname=jtharness
_version=6.0
_build=b03
pkgver=${_version}_${_build}
-pkgrel=1
+pkgrel=2
pkgdesc="general purpose, fully-featured, flexible, and configurable test harness very well suited for most types of unit testing"
arch=('any')
url="https://wiki.openjdk.java.net/display/CodeTools/JT+Harness"
license=('GPL2')
groups=()
depends=('java-runtime>=7')
-makedepends=('apache-ant' 'java-environment-openjdk=7' 'junit' 'java-asm')
+makedepends=('ant' 'java-environment-openjdk=8' 'junit' 'java-asm')
optdepends=('junit')
checkdepends=()
provides=()
@@ -32,13 +33,13 @@ build() {
ln -sf /usr/share/java/junit.jar build/junit-4.10.jar
ln -sf /usr/share/java/asm/asm.jar build/asm6.jar
ln -sf /usr/share/java/asm/asm-commons.jar build/asm-commons6.jar
- JAVA_HOME=/usr/lib/jvm/java-7-openjdk ant -f build/build.xml
+ JAVA_HOME=/usr/lib/jvm/java-8-openjdk ant -f build/build.xml
}
check() {
cd ${srcdir}/${_jtdir}
# test does not compile
-# JAVA_HOME=/usr/lib/jvm/java-7-openjdk ant -f build/build.xml test
+# JAVA_HOME=/usr/lib/jvm/java-8-openjdk ant -f build/build.xml test
}
package() {
@@ -50,4 +51,3 @@ package() {
ln -sf /usr/share/java/${pkgname} $pkgdir/usr/share/${pkgname}/lib
}
-# vim:set ts=2 sw=2 et: