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 2017/12/26 20:43:00 UTC
ant git commit: fix POMs (cf master)
Repository: ant
Updated Branches:
refs/heads/1.9.x e74069411 -> e010b73d6
fix POMs (cf master)
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/e010b73d
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/e010b73d
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/e010b73d
Branch: refs/heads/1.9.x
Commit: e010b73d6871de21cdbff48b9f3f1dad99cf0786
Parents: e740694
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Tue Dec 26 21:43:30 2017 +0100
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Tue Dec 26 21:43:30 2017 +0100
----------------------------------------------------------------------
src/etc/poms/ant/pom.xml | 18 ++++++++++++------
src/etc/poms/pom.xml | 5 +++--
2 files changed, 15 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/e010b73d/src/etc/poms/ant/pom.xml
----------------------------------------------------------------------
diff --git a/src/etc/poms/ant/pom.xml b/src/etc/poms/ant/pom.xml
index 1819e1c..8a5e12f 100644
--- a/src/etc/poms/ant/pom.xml
+++ b/src/etc/poms/ant/pom.xml
@@ -48,13 +48,23 @@
<version>4.12</version>
<scope>test</scope>
</dependency>
- </dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-antunit</artifactId>
<version>1.3</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-launcher</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
+ </dependencies>
<build>
<filters>
<filter>../../../../target/ant/.build.timestamp.properties</filter>
@@ -151,8 +161,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <omitBasedir>true</omitBasedir>
<systemProperties>
+ <basedir>../../../..</basedir>
<property>
<name>ant.home</name>
<value>${env.ANT_HOME}</value>
@@ -169,10 +179,6 @@
<name>offline</name>
<value>true</value>
</property>
- <property>
- <name>root</name>
- <value>../../../..</value>
- </property>
</systemProperties>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/ant/blob/e010b73d/src/etc/poms/pom.xml
----------------------------------------------------------------------
diff --git a/src/etc/poms/pom.xml b/src/etc/poms/pom.xml
index bbb0ddb..95aa29a 100644
--- a/src/etc/poms/pom.xml
+++ b/src/etc/poms/pom.xml
@@ -20,8 +20,9 @@
Please contact us if you are not satisfied with the data contained in this POM.
URL : http://ant.apache.org
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>