You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by gi...@apache.org on 2018/11/11 20:50:45 UTC
ant git commit: Get the tests dependent on ANT_HOME running
Repository: ant
Updated Branches:
refs/heads/master 2165dd225 -> f871e80a6
Get the tests dependent on ANT_HOME running
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/f871e80a
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/f871e80a
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/f871e80a
Branch: refs/heads/master
Commit: f871e80a6a9f6165137d24b72e209a73283494e8
Parents: 2165dd2
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Sun Nov 11 21:50:29 2018 +0100
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Sun Nov 11 21:50:29 2018 +0100
----------------------------------------------------------------------
src/etc/poms/ant/pom.xml | 30 ++++++++++++++++++++----------
src/etc/poms/pom.xml | 5 +++++
2 files changed, 25 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/f871e80a/src/etc/poms/ant/pom.xml
----------------------------------------------------------------------
diff --git a/src/etc/poms/ant/pom.xml b/src/etc/poms/ant/pom.xml
index 71b0e73..e95255d 100644
--- a/src/etc/poms/ant/pom.xml
+++ b/src/etc/poms/ant/pom.xml
@@ -83,11 +83,6 @@
</filters>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration> </configuration>
- </plugin>
- <plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
@@ -107,6 +102,23 @@
</configuration>
</execution>
<execution>
+ <id>get-ant-distribution</id>
+ <phase>generate-test-resources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <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.zip"/>
+ <unzip src="${project.build.directory}/ant.zip" dest="${project.build.directory}/ant-home">
+ <cutdirsmapper dirs="1"/>
+ </unzip>
+ </tasks>
+ </configuration>
+ </execution>
+ <execution>
<id>create-antlib-test-jar</id>
<phase>process-test-classes</phase>
<goals>
@@ -207,7 +219,7 @@
<exclude>org/apache/tools/ant/taskdefs/optional/Pvcs*</exclude>
<!-- xalan: workaround for different resource encoding -->
<exclude>org/apache/tools/ant/taskdefs/optional/TraXLiaison*</exclude>
- <!-- ERROR: UnknownHostException: chemical -->
+ <!-- ERROR: UnknownHostException: chemical (XML parser-dependent) -->
<exclude>org/apache/tools/ant/taskdefs/optional/XmlValidateCatalog*</exclude>
<!-- image/imageio -->
<exclude>org/apache/tools/ant/taskdefs/optional/image/</exclude>
@@ -227,8 +239,6 @@
<exclude>org/apache/tools/ant/types/Assertions*</exclude>
<!-- bcel -->
<exclude>org/apache/tools/ant/types/optional/depend/ClassFileSet*</exclude>
- <!-- dependent on ANT_HOME containing full distribution with bin and lib -->
- <exclude>org/apache/tools/ant/types/selectors/ModifiedSelector*</exclude>
<!-- ERROR: defaults.properties are in both compile and test file tree -->
<exclude>org/apache/tools/ant/util/ClasspathUtils*</exclude>
<exclude>org/apache/tools/ant/util/LoaderUtils*</exclude>
@@ -239,7 +249,7 @@
<!-- dependent on IncludeTest.class: checks presence -->
<exclude>org/apache/tools/ant/AntClassLoaderDelegation*</exclude>
<!-- ERROR: More pseudo attributes are expected (encoding="UTF-8");
- failure mode is JRE-dependent (see to do for failures in IDE) -->
+ failure mode is XML parser-dependent (see to do for failures in IDE) -->
<exclude>org/apache/tools/ant/Include*</exclude>
<!-- dependent on JUnit 5 -->
<exclude>org/example/junitlauncher/</exclude>
@@ -270,7 +280,7 @@
<systemProperties>
<property>
<name>ant.home</name>
- <value>${env.ANT_HOME}</value>
+ <value>${project.build.directory}/ant-home</value>
</property>
<property>
<name>build.classes.value</name>
http://git-wip-us.apache.org/repos/asf/ant/blob/f871e80a/src/etc/poms/pom.xml
----------------------------------------------------------------------
diff --git a/src/etc/poms/pom.xml b/src/etc/poms/pom.xml
index 8347950..e8fa131 100644
--- a/src/etc/poms/pom.xml
+++ b/src/etc/poms/pom.xml
@@ -152,6 +152,11 @@
<artifactId>maven-surefire-report-plugin</artifactId>
<version>2.22.1</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.8</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>