diff --git a/programming/build/ant/actions.py b/programming/build/ant/actions.py index daf8f3eafc..1c0d349684 100644 --- a/programming/build/ant/actions.py +++ b/programming/build/ant/actions.py @@ -8,7 +8,7 @@ from pisi.actionsapi import pisitools from pisi.actionsapi import shelltools from pisi.actionsapi import get -shelltools.export("JAVA_HOME","/usr/lib/jvm/java-7-openjdk") +shelltools.export("JAVA_HOME","/usr/lib/jvm/java-8-openjdk") WorkDir = "apache-ant-%s" % get.srcVERSION() anthome = "/usr/share/ant" @@ -22,10 +22,10 @@ def install(): pisitools.insinto("/etc/ant/", "%s/etc/*" % WorkDir) pisitools.remove("/etc/ant/ant-bootstrap.jar") pisitools.insinto("/usr/share/java/ant/", "%s/lib/*" % WorkDir) - pisitools.insinto("/usr/share/java/", "lib/optional/junit-4.12.jar", "junit.jar") + pisitools.insinto("/usr/share/java/", "lib/optional/junit-4.13.jar", "junit.jar") pisitools.insinto("/usr/share/java/", "lib/optional/hamcrest-core-1.3.jar", "hamcrest.jar") pisitools.insinto("/usr/share/ant/lib/", "%s/lib/*" % WorkDir) - pisitools.insinto("/usr/share/ant/bin/", "apache-ant-1.9.15/bin/*") + pisitools.insinto("/usr/share/ant/bin/", "apache-ant-1.10.9/bin/*") for binsym in ["ant", "antRun", "antRun.pl", "complete-ant-cmd.pl", "runant.pl", "runant.py"]: diff --git a/programming/build/ant/pspec.xml b/programming/build/ant/pspec.xml index 0345e5e7b1..2278b6c653 100644 --- a/programming/build/ant/pspec.xml +++ b/programming/build/ant/pspec.xml @@ -12,9 +12,9 @@ app:console Java-based build tool Apache Ant is a Java-based build tool. In theory, it is kind of like Make, but without Make's wrinkles. - http://archive.apache.org/dist/ant/source/apache-ant-1.9.15-src.tar.bz2 + http://archive.apache.org/dist/ant/source/apache-ant-1.10.9-src.tar.xz - jdk7-openjdk + jdk8-openjdk @@ -41,6 +41,13 @@ + + 2021-03-10 + 1.10.9 + Version bump. + İdris Kalp + idriskalp@gmail.com + 2020-06-04 1.9.15