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/10/23 20:11:30 UTC
ant git commit: Try to run more tests with Surefire;
document snags, fix packaging
Repository: ant
Updated Branches:
refs/heads/master 679a94224 -> d3f7c0e63
Try to run more tests with Surefire; document snags, fix packaging
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/d3f7c0e6
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/d3f7c0e6
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/d3f7c0e6
Branch: refs/heads/master
Commit: d3f7c0e63c5c5348b663a2fc4b5c9cca7f23079b
Parents: 679a942
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Tue Oct 23 22:09:57 2018 +0200
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Tue Oct 23 22:11:17 2018 +0200
----------------------------------------------------------------------
src/etc/poms/ant-apache-bsf/pom.xml | 3 ---
src/etc/poms/ant-commons-net/pom.xml | 1 +
src/etc/poms/ant-jdepend/pom.xml | 5 +++--
src/etc/poms/ant-launcher/pom.xml | 10 +++++++---
4 files changed, 11 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/d3f7c0e6/src/etc/poms/ant-apache-bsf/pom.xml
----------------------------------------------------------------------
diff --git a/src/etc/poms/ant-apache-bsf/pom.xml b/src/etc/poms/ant-apache-bsf/pom.xml
index 48dded9..f0968c0 100644
--- a/src/etc/poms/ant-apache-bsf/pom.xml
+++ b/src/etc/poms/ant-apache-bsf/pom.xml
@@ -56,9 +56,6 @@
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<includes>
- <include>org/apache/tools/ant/taskdefs/optional/Script*</include>
- <include>org/apache/tools/ant/taskdefs/optional/script/**</include>
- <include>org/apache/tools/ant/types/optional/*Script*</include>
<include>org/apache/tools/ant/util/Script*</include>
<include>org/apache/tools/ant/util/optional/Script*</include>
</includes>
http://git-wip-us.apache.org/repos/asf/ant/blob/d3f7c0e6/src/etc/poms/ant-commons-net/pom.xml
----------------------------------------------------------------------
diff --git a/src/etc/poms/ant-commons-net/pom.xml b/src/etc/poms/ant-commons-net/pom.xml
index a5fc544..f531701 100644
--- a/src/etc/poms/ant-commons-net/pom.xml
+++ b/src/etc/poms/ant-commons-net/pom.xml
@@ -71,6 +71,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
<configuration>
<basedir>../../../..</basedir>
<workingDirectory>../../../..</workingDirectory>
+ <!-- tests assume an FTP server listening on localhost -->
<skipTests>true</skipTests>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/ant/blob/d3f7c0e6/src/etc/poms/ant-jdepend/pom.xml
----------------------------------------------------------------------
diff --git a/src/etc/poms/ant-jdepend/pom.xml b/src/etc/poms/ant-jdepend/pom.xml
index 98c1e60..a35ccd5 100644
--- a/src/etc/poms/ant-jdepend/pom.xml
+++ b/src/etc/poms/ant-jdepend/pom.xml
@@ -58,10 +58,11 @@
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<includes>
- <include>org/apache/tools/ant/taskdefs/optional/jdepend/*</include>
+ <include>org/apache/tools/ant/taskdefs/optional/jdepend/</include>
</includes>
<testIncludes>
- <include>org/apache/tools/ant/taskdefs/optional/jdepend/*</include>
+ <include>org/apache/tools/ant/taskdefs/optional/jdepend/</include>
+ <include>/org/apache/tools/ant/util/facade/</include>
</testIncludes>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/ant/blob/d3f7c0e6/src/etc/poms/ant-launcher/pom.xml
----------------------------------------------------------------------
diff --git a/src/etc/poms/ant-launcher/pom.xml b/src/etc/poms/ant-launcher/pom.xml
index 902257e..c95222c 100644
--- a/src/etc/poms/ant-launcher/pom.xml
+++ b/src/etc/poms/ant-launcher/pom.xml
@@ -44,13 +44,17 @@
<includes>
<include>org/apache/tools/ant/launch/*.java</include>
</includes>
+ <testIncludes>
+ <include>org/apache/tools/ant/launch/*.java</include>
+ </testIncludes>
</configuration>
</plugin>
</plugins>
<sourceDirectory>../../../../src/main</sourceDirectory>
+ <!-- tests depend on Ant (Os) -->
<testSourceDirectory>../../../../src/testcases</testSourceDirectory>
- <outputDirectory>../../../../target/ant-launcher/classes</outputDirectory>
- <testOutputDirectory>../../../../target/ant-launcher/testcases</testOutputDirectory>
- <directory>../../../../target/ant-launcher</directory>
+ <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
+ <testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
+ <directory>../../../../target/${project.artifactId}</directory>
</build>
</project>