(Attempt to fix Travis problem with JUnit)
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/b9978edd Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/b9978edd Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/b9978edd Branch: refs/heads/2.3 Commit: b9978edde7822046f81c0976a10028940d9bd990 Parents: 7d01bed Author: ddekany <ddek...@apache.org> Authored: Sat Aug 5 12:22:49 2017 +0200 Committer: ddekany <ddek...@apache.org> Committed: Sat Aug 5 12:22:49 2017 +0200 ---------------------------------------------------------------------- .travis.yml | 3 +-- build.xml | 11 ++++++++++- 2 files changed, 11 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/b9978edd/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index c68923b..c0493be 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,5 @@ -dist: trusty language: java -install: ant download-ivy +install: ant download-ivy download-junit script: ant ci jdk: - oraclejdk8 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/b9978edd/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 32e4168..1e7e340 100644 --- a/build.xml +++ b/build.xml @@ -135,12 +135,21 @@ <property name="ivy.home" value="${user.home}/.ant" /> <property name="ivy.jar.dir" value="${ivy.home}/lib" /> <property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar" /> - <target name="download-ivy"> <mkdir dir="${ivy.jar.dir}"/> <get src="https://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar" dest="${ivy.jar.file}" usetimestamp="true"/> </target> + + <property name="ant-junit.install.version" value="1.10.1" /> + <property name="ant-junit.home" value="${user.home}/.ant" /> + <property name="ant-junit.jar.dir" value="${ant-junit.home}/lib" /> + <property name="ant-junit.jar.file" value="${ant-junit.jar.dir}/ant-junit.jar" /> + <target name="download-ant-junit"> + <mkdir dir="${ant-junit.jar.dir}"/> + <get src="https://repo1.maven.org/maven2/org/apache/ant/ant-junit/${ant-junit.install.version}/ant-junit-${ant-junit.install.version}.jar" + dest="${ant-junit.jar.file}" usetimestamp="true"/> + </target> <!-- ================================================================= --> <!-- Compilation -->