This is an automated email from the ASF dual-hosted git repository. bodewig pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/ant.git
commit ef14a91901a45b385a3ce8a1505a0695617107ba Author: Stefan Bodewig <[email protected]> AuthorDate: Sat Mar 30 14:35:41 2019 +0100 exclude tests from Maven that require a specific Ant file structure --- src/etc/poms/ant/pom.xml | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/src/etc/poms/ant/pom.xml b/src/etc/poms/ant/pom.xml index 6a52c7e..282980f 100644 --- a/src/etc/poms/ant/pom.xml +++ b/src/etc/poms/ant/pom.xml @@ -105,23 +105,6 @@ </configuration> </execution> <execution> - <id>get-ant-distribution</id> - <phase>generate-test-resources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <target> - <get src="http://apache.mirrors.spacedump.net//ant/binaries/apache-ant-1.10.5-bin.zip"; - dest="${project.build.directory}/ant.zip"/> - <delete dir="${project.build.directory}/ant-home"/> - <unzip src="${project.build.directory}/ant.zip" dest="${project.build.directory}/ant-home"> - <cutdirsmapper dirs="1"/> - </unzip> - </target> - </configuration> - </execution> - <execution> <id>create-antlib-test-jar</id> <phase>process-test-classes</phase> <goals> @@ -260,6 +243,10 @@ <exclude>org/apache/tools/ant/Include*</exclude> <!-- dependent on JUnit 5 --> <exclude>org/example/junitlauncher/</exclude> + <!-- requires structure of a binary distribution of Ant in ANT_HOME --> + <exclude>org/apache/tools/ant/types/CommandlineJavaTest*</exclude> + <exclude>org/apache/tools/ant/types/selectors/ModifiedSelectorTest*</exclude> + <exclude>org/apache/tools/ant/taskdefs/AvailableTest*</exclude> </testExcludes> </configuration> </plugin> @@ -287,7 +274,7 @@ <systemProperties> <property> <name>ant.home</name> - <value>${project.build.directory}/ant-home</value> + <value>${env.ANT_HOME}</value> </property> <property> <name>build.classes.value</name>
