You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by bo...@apache.org on 2016/03/25 18:49:38 UTC
[1/2] ant git commit: master -> 1.10.x, requires java8
Repository: ant
Updated Branches:
refs/heads/master f8a27a13f -> 8becd9dd7
master -> 1.10.x, requires java8
closes #13
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/057c3f8a
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/057c3f8a
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/057c3f8a
Branch: refs/heads/master
Commit: 057c3f8aba9ea5ebddd26366aeb5567a01f94878
Parents: f8a27a1
Author: Stefan Bodewig <bo...@apache.org>
Authored: Fri Mar 25 18:46:45 2016 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Fri Mar 25 18:46:45 2016 +0100
----------------------------------------------------------------------
WHATSNEW | 15 +++++++++++++++
build.xml | 10 +++++-----
manual/cover.html | 6 +++---
manual/credits.html | 2 +-
release/ivy.xml | 2 +-
src/etc/poms/ant-antlr/pom.xml | 6 +++---
src/etc/poms/ant-apache-bcel/pom.xml | 6 +++---
src/etc/poms/ant-apache-bsf/pom.xml | 6 +++---
src/etc/poms/ant-apache-log4j/pom.xml | 6 +++---
src/etc/poms/ant-apache-oro/pom.xml | 6 +++---
src/etc/poms/ant-apache-regexp/pom.xml | 6 +++---
src/etc/poms/ant-apache-resolver/pom.xml | 6 +++---
src/etc/poms/ant-apache-xalan2/pom.xml | 6 +++---
src/etc/poms/ant-commons-logging/pom.xml | 6 +++---
src/etc/poms/ant-commons-net/pom.xml | 6 +++---
src/etc/poms/ant-jai/pom.xml | 6 +++---
src/etc/poms/ant-javamail/pom.xml | 6 +++---
src/etc/poms/ant-jdepend/pom.xml | 6 +++---
src/etc/poms/ant-jmf/pom.xml | 6 +++---
src/etc/poms/ant-jsch/pom.xml | 6 +++---
src/etc/poms/ant-junit/pom.xml | 6 +++---
src/etc/poms/ant-junit4/pom.xml | 6 +++---
src/etc/poms/ant-launcher/pom.xml | 4 ++--
src/etc/poms/ant-netrexx/pom.xml | 6 +++---
src/etc/poms/ant-swing/pom.xml | 6 +++---
src/etc/poms/ant-testutil/pom.xml | 6 +++---
src/etc/poms/ant/pom.xml | 6 +++---
src/etc/poms/pom.xml | 2 +-
src/etc/testcases/taskdefs/conditions/antversion.xml | 4 ++--
29 files changed, 93 insertions(+), 78 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/057c3f8a/WHATSNEW
----------------------------------------------------------------------
diff --git a/WHATSNEW b/WHATSNEW
index a0c575d..b5b38ba 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -1,3 +1,18 @@
+Changes from Ant 1.9.7 TO Ant 1.10.0
+====================================
+
+Changes that could break older environments:
+-------------------------------------------
+
+ * Ant 1.10.x requires Java8 or newer at compile or build time.
+ The 1.9.x series wil stay compatible with Java5.
+
+Fixed bugs:
+-----------
+
+Other changes:
+--------------
+
Changes from Ant 1.9.6 TO Ant 1.9.7
===================================
http://git-wip-us.apache.org/repos/asf/ant/blob/057c3f8a/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 2e61d98..4d52e64 100644
--- a/build.xml
+++ b/build.xml
@@ -34,10 +34,10 @@
<property name="name" value="ant"/>
<!-- this is the groupId of ant in the Maven repository -->
<property name="groupid" value="org/apache/ant"/>
- <property name="project.version" value="1.9.7alpha"/>
+ <property name="project.version" value="1.10.0alpha"/>
<!-- pom.version is used when doing a distribution and must match with what is checked in under src/etc/poms -->
- <property name="pom.version" value="1.9.7-SNAPSHOT"/>
- <property name="manifest-version" value="1.9.7"/>
+ <property name="pom.version" value="1.10.0-SNAPSHOT"/>
+ <property name="manifest-version" value="1.10.0"/>
<property name="bootstrap.jar" value="ant-bootstrap.jar"/>
<property name="ant.package" value="org/apache/tools/ant"/>
@@ -104,8 +104,8 @@
<property name="chmod.maxparallel" value="250"/>
<property name="deprecation" value="false"/>
<property name="optimize" value="true"/>
- <property name="javac.target" value="1.5"/>
- <property name="javac.source" value="1.5"/>
+ <property name="javac.target" value="1.8"/>
+ <property name="javac.source" value="1.8"/>
<property name="junit.filtertrace" value="off"/>
<property name="junit.summary" value="no"/>
<property name="test.haltonfailure" value="false"/>
http://git-wip-us.apache.org/repos/asf/ant/blob/057c3f8a/manual/cover.html
----------------------------------------------------------------------
diff --git a/manual/cover.html b/manual/cover.html
index 05bd971..59b8e43 100644
--- a/manual/cover.html
+++ b/manual/cover.html
@@ -19,14 +19,14 @@
<head>
<meta http-equiv="Content-Language" content="en-us">
<link rel="stylesheet" type="text/css" href="stylesheets/style.css">
-<title>Apache Ant 1.9.7 User Manual</title>
+<title>Apache Ant 1.10.0 User Manual</title>
</head>
<body bgcolor="#FFFFFF">
<div align="center">
<h1><img src="images/ant_logo_large.gif" width="190" height="120"></h1>
- <h1>Apache Ant™ 1.9.7 Manual</h1>
- <p align="left">This is the manual for version 1.9.7 of
+ <h1>Apache Ant™ 1.10.0 Manual</h1>
+ <p align="left">This is the manual for version 1.10.0 of
<a target="_top" href="http://ant.apache.org/index.html">Apache Ant</a>.
If your version
of Ant (as verified with <tt>ant -version</tt>) is older or newer than this
http://git-wip-us.apache.org/repos/asf/ant/blob/057c3f8a/manual/credits.html
----------------------------------------------------------------------
diff --git a/manual/credits.html b/manual/credits.html
index 3d7ebc0..d895dfd 100644
--- a/manual/credits.html
+++ b/manual/credits.html
@@ -62,7 +62,7 @@
</ul>
<center>
-<p>Version: 1.9.7</p>
+<p>Version: 1.10.0</p>
</center>
http://git-wip-us.apache.org/repos/asf/ant/blob/057c3f8a/release/ivy.xml
----------------------------------------------------------------------
diff --git a/release/ivy.xml b/release/ivy.xml
index 1541097..f8e13c1 100644
--- a/release/ivy.xml
+++ b/release/ivy.xml
@@ -20,7 +20,7 @@
xsi:noNamespaceSchemaLocation=
"http://ant.apache.org/ivy/schemas/ivy.xsd">
<info organisation="org/apache"
- module="ant" revision="1.9.7"/>
+ module="ant" revision="1.10.0"/>
<publications xmlns:e="urn:ant.apache.org:ivy-extras">
<artifact name="ant-parent" type="pom" ext="pom"/>
<artifact name="ant-parent" type="pom.asc" ext="pom.asc"/>
http://git-wip-us.apache.org/repos/asf/ant/blob/057c3f8a/src/etc/poms/ant-antlr/pom.xml
----------------------------------------------------------------------
diff --git a/src/etc/poms/ant-antlr/pom.xml b/src/etc/poms/ant-antlr/pom.xml
index 34ffd70..186191c 100644
--- a/src/etc/poms/ant-antlr/pom.xml
+++ b/src/etc/poms/ant-antlr/pom.xml
@@ -27,13 +27,13 @@
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-antlr</artifactId>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<name>Apache Ant + ANTLR</name>
<description>antlr specific task.
The implementation forks a java process, therefore the antlr jar file is only needed at runtime</description>
@@ -41,7 +41,7 @@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<optional>true</optional>
<scope>compile</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/057c3f8a/src/etc/poms/ant-apache-bcel/pom.xml
----------------------------------------------------------------------
diff --git a/src/etc/poms/ant-apache-bcel/pom.xml b/src/etc/poms/ant-apache-bcel/pom.xml
index 395e107..610a387 100644
--- a/src/etc/poms/ant-apache-bcel/pom.xml
+++ b/src/etc/poms/ant-apache-bcel/pom.xml
@@ -27,19 +27,19 @@
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-apache-bcel</artifactId>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<name>Apache Ant + BCEL</name>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/057c3f8a/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 aad7b70..b757de0 100644
--- a/src/etc/poms/ant-apache-bsf/pom.xml
+++ b/src/etc/poms/ant-apache-bsf/pom.xml
@@ -27,19 +27,19 @@
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-apache-bsf</artifactId>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<name>Apache Ant + BSF</name>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/057c3f8a/src/etc/poms/ant-apache-log4j/pom.xml
----------------------------------------------------------------------
diff --git a/src/etc/poms/ant-apache-log4j/pom.xml b/src/etc/poms/ant-apache-log4j/pom.xml
index cc9389b..4b48e2b 100644
--- a/src/etc/poms/ant-apache-log4j/pom.xml
+++ b/src/etc/poms/ant-apache-log4j/pom.xml
@@ -26,19 +26,19 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-apache-log4j</artifactId>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<name>Apache Ant + Log4J</name>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/057c3f8a/src/etc/poms/ant-apache-oro/pom.xml
----------------------------------------------------------------------
diff --git a/src/etc/poms/ant-apache-oro/pom.xml b/src/etc/poms/ant-apache-oro/pom.xml
index d34cfce..30569e1 100644
--- a/src/etc/poms/ant-apache-oro/pom.xml
+++ b/src/etc/poms/ant-apache-oro/pom.xml
@@ -27,19 +27,19 @@
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-apache-oro</artifactId>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<name>Apache Ant + Apache Oro</name>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/057c3f8a/src/etc/poms/ant-apache-regexp/pom.xml
----------------------------------------------------------------------
diff --git a/src/etc/poms/ant-apache-regexp/pom.xml b/src/etc/poms/ant-apache-regexp/pom.xml
index 22489bd..9fcafc8 100644
--- a/src/etc/poms/ant-apache-regexp/pom.xml
+++ b/src/etc/poms/ant-apache-regexp/pom.xml
@@ -26,19 +26,19 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-apache-regexp</artifactId>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<name>Apache Ant + Apache Regexp</name>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/057c3f8a/src/etc/poms/ant-apache-resolver/pom.xml
----------------------------------------------------------------------
diff --git a/src/etc/poms/ant-apache-resolver/pom.xml b/src/etc/poms/ant-apache-resolver/pom.xml
index 6911636..03c017c 100644
--- a/src/etc/poms/ant-apache-resolver/pom.xml
+++ b/src/etc/poms/ant-apache-resolver/pom.xml
@@ -26,19 +26,19 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-apache-resolver</artifactId>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<name>Apache Ant + Apache Resolver</name>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/057c3f8a/src/etc/poms/ant-apache-xalan2/pom.xml
----------------------------------------------------------------------
diff --git a/src/etc/poms/ant-apache-xalan2/pom.xml b/src/etc/poms/ant-apache-xalan2/pom.xml
index 557e738..3e49f1d 100644
--- a/src/etc/poms/ant-apache-xalan2/pom.xml
+++ b/src/etc/poms/ant-apache-xalan2/pom.xml
@@ -26,20 +26,20 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-apache-xalan2</artifactId>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<name>Apache Ant + Xalan 2</name>
<description>contains Xalan2-specific features</description>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/057c3f8a/src/etc/poms/ant-commons-logging/pom.xml
----------------------------------------------------------------------
diff --git a/src/etc/poms/ant-commons-logging/pom.xml b/src/etc/poms/ant-commons-logging/pom.xml
index e30836b..51ce038 100644
--- a/src/etc/poms/ant-commons-logging/pom.xml
+++ b/src/etc/poms/ant-commons-logging/pom.xml
@@ -26,20 +26,20 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-commons-logging</artifactId>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<name>Apache Ant + Commons Logging</name>
<description>Ant Listener based on commons-logging</description>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/057c3f8a/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 1683fc2..8e08ec5 100644
--- a/src/etc/poms/ant-commons-net/pom.xml
+++ b/src/etc/poms/ant-commons-net/pom.xml
@@ -26,20 +26,20 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-commons-net</artifactId>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<name>Apache Ant + Commons Net</name>
<description>ftp, rexec and telnet tasks</description>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/057c3f8a/src/etc/poms/ant-jai/pom.xml
----------------------------------------------------------------------
diff --git a/src/etc/poms/ant-jai/pom.xml b/src/etc/poms/ant-jai/pom.xml
index 4de10fb..7d3d9f3 100644
--- a/src/etc/poms/ant-jai/pom.xml
+++ b/src/etc/poms/ant-jai/pom.xml
@@ -27,13 +27,13 @@
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-jai</artifactId>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<name>Apache Ant + JAI</name>
<description>image task and corresponding types.
</description>
@@ -41,7 +41,7 @@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/057c3f8a/src/etc/poms/ant-javamail/pom.xml
----------------------------------------------------------------------
diff --git a/src/etc/poms/ant-javamail/pom.xml b/src/etc/poms/ant-javamail/pom.xml
index 0c8511b..ac36479 100644
--- a/src/etc/poms/ant-javamail/pom.xml
+++ b/src/etc/poms/ant-javamail/pom.xml
@@ -26,13 +26,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-javamail</artifactId>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<name>Apache Ant + JavaMail</name>
<description>implementation of the mail task based on javamail.
Required to send emails to SMTP servers using user/password combinations
@@ -41,7 +41,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/057c3f8a/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 eccfbe7..2f35da3 100644
--- a/src/etc/poms/ant-jdepend/pom.xml
+++ b/src/etc/poms/ant-jdepend/pom.xml
@@ -27,13 +27,13 @@
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-jdepend</artifactId>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<name>Apache Ant + JDepend</name>
<description>task jdepend invoking the jdepend parser. There is also a version 2.9.1 of the
jdepend parser available on the maven repository</description>
@@ -41,7 +41,7 @@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/057c3f8a/src/etc/poms/ant-jmf/pom.xml
----------------------------------------------------------------------
diff --git a/src/etc/poms/ant-jmf/pom.xml b/src/etc/poms/ant-jmf/pom.xml
index 02bd10f..d040c22 100644
--- a/src/etc/poms/ant-jmf/pom.xml
+++ b/src/etc/poms/ant-jmf/pom.xml
@@ -26,13 +26,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-jmf</artifactId>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<name>Apache Ant + JMF</name>
<description>contains the sound task and a soundplayer listener
download the dependency from http://java.sun.com/products/java-media/jmf/</description>
@@ -40,7 +40,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/ant/blob/057c3f8a/src/etc/poms/ant-jsch/pom.xml
----------------------------------------------------------------------
diff --git a/src/etc/poms/ant-jsch/pom.xml b/src/etc/poms/ant-jsch/pom.xml
index 2469a0a..1273d87 100644
--- a/src/etc/poms/ant-jsch/pom.xml
+++ b/src/etc/poms/ant-jsch/pom.xml
@@ -26,13 +26,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-jsch</artifactId>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<name>Apache Ant + JSch</name>
<description>contains the sshexec and scp tasks
</description>
@@ -40,7 +40,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/057c3f8a/src/etc/poms/ant-junit/pom.xml
----------------------------------------------------------------------
diff --git a/src/etc/poms/ant-junit/pom.xml b/src/etc/poms/ant-junit/pom.xml
index c352cf5..7ba833e 100644
--- a/src/etc/poms/ant-junit/pom.xml
+++ b/src/etc/poms/ant-junit/pom.xml
@@ -26,20 +26,20 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-junit</artifactId>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<name>Apache Ant + JUnit</name>
<description>contains the junit and junirreport tasks</description>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/057c3f8a/src/etc/poms/ant-junit4/pom.xml
----------------------------------------------------------------------
diff --git a/src/etc/poms/ant-junit4/pom.xml b/src/etc/poms/ant-junit4/pom.xml
index d22dc08..7e66219 100644
--- a/src/etc/poms/ant-junit4/pom.xml
+++ b/src/etc/poms/ant-junit4/pom.xml
@@ -26,20 +26,20 @@
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-junit4</artifactId>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<name>Apache Ant + JUnit 4</name>
<description>contains JUnit 4.x support</description>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/057c3f8a/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 517e78b..8f95569 100644
--- a/src/etc/poms/ant-launcher/pom.xml
+++ b/src/etc/poms/ant-launcher/pom.xml
@@ -27,13 +27,13 @@
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-launcher</artifactId>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<name>Apache Ant Launcher</name>
<build>
<plugins>
http://git-wip-us.apache.org/repos/asf/ant/blob/057c3f8a/src/etc/poms/ant-netrexx/pom.xml
----------------------------------------------------------------------
diff --git a/src/etc/poms/ant-netrexx/pom.xml b/src/etc/poms/ant-netrexx/pom.xml
index 9df3203..502dbe3 100644
--- a/src/etc/poms/ant-netrexx/pom.xml
+++ b/src/etc/poms/ant-netrexx/pom.xml
@@ -26,13 +26,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-netrexx</artifactId>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<name>Apache Ant + NetRexx</name>
<description>NetRexxC task
dependency can be downloaded from http://www.ibm.com/software/awdtools/netrexx/download.html</description>
@@ -40,7 +40,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<!-- Processed too early, before maven-antrun-plugin gets a chance to work:
http://git-wip-us.apache.org/repos/asf/ant/blob/057c3f8a/src/etc/poms/ant-swing/pom.xml
----------------------------------------------------------------------
diff --git a/src/etc/poms/ant-swing/pom.xml b/src/etc/poms/ant-swing/pom.xml
index 5459943..f41c055 100644
--- a/src/etc/poms/ant-swing/pom.xml
+++ b/src/etc/poms/ant-swing/pom.xml
@@ -27,20 +27,20 @@
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-swing</artifactId>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<name>Apache Ant + Swing</name>
<description>a listener and a splash task based on Swing</description>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/ant/blob/057c3f8a/src/etc/poms/ant-testutil/pom.xml
----------------------------------------------------------------------
diff --git a/src/etc/poms/ant-testutil/pom.xml b/src/etc/poms/ant-testutil/pom.xml
index 6109ff1..c362df2 100644
--- a/src/etc/poms/ant-testutil/pom.xml
+++ b/src/etc/poms/ant-testutil/pom.xml
@@ -27,20 +27,20 @@
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant-testutil</artifactId>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<name>Apache Ant Test Utilities</name>
<description>test utility classes</description>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/057c3f8a/src/etc/poms/ant/pom.xml
----------------------------------------------------------------------
diff --git a/src/etc/poms/ant/pom.xml b/src/etc/poms/ant/pom.xml
index b0b82f3..e6e4325 100644
--- a/src/etc/poms/ant/pom.xml
+++ b/src/etc/poms/ant/pom.xml
@@ -27,19 +27,19 @@
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://ant.apache.org/</url>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<name>Apache Ant Core</name>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-launcher</artifactId>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ant/blob/057c3f8a/src/etc/poms/pom.xml
----------------------------------------------------------------------
diff --git a/src/etc/poms/pom.xml b/src/etc/poms/pom.xml
index e15290e..c35c95e 100644
--- a/src/etc/poms/pom.xml
+++ b/src/etc/poms/pom.xml
@@ -25,7 +25,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ant</groupId>
<artifactId>ant-parent</artifactId>
- <version>1.9.7-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>pom</packaging>
<description>master POM</description>
<licenses>
http://git-wip-us.apache.org/repos/asf/ant/blob/057c3f8a/src/etc/testcases/taskdefs/conditions/antversion.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/taskdefs/conditions/antversion.xml b/src/etc/testcases/taskdefs/conditions/antversion.xml
index 50b525d..217f164 100644
--- a/src/etc/testcases/taskdefs/conditions/antversion.xml
+++ b/src/etc/testcases/taskdefs/conditions/antversion.xml
@@ -32,10 +32,10 @@
<fail>
<condition>
<not>
- <antversion exactly="1.9.7" />
+ <antversion exactly="1.10.0" />
</not>
</condition>
- Should be exactly 1.9.7
+ Should be exactly 1.10.0
</fail>
</target>
[2/2] ant git commit: try debugging Jenkins build failure on Windows
Posted by bo...@apache.org.
try debugging Jenkins build failure on Windows
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/8becd9dd
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/8becd9dd
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/8becd9dd
Branch: refs/heads/master
Commit: 8becd9dd7c8b8e2915a816b0598a9da43543db7c
Parents: 057c3f8
Author: Stefan Bodewig <bo...@apache.org>
Authored: Fri Mar 25 18:48:57 2016 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Fri Mar 25 18:48:57 2016 +0100
----------------------------------------------------------------------
bootstrap.bat | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/8becd9dd/bootstrap.bat
----------------------------------------------------------------------
diff --git a/bootstrap.bat b/bootstrap.bat
index 2f919b3..a901e3f 100755
--- a/bootstrap.bat
+++ b/bootstrap.bat
@@ -49,6 +49,10 @@ set CLASSDIR=build\classes
SET CLASSPATH=%LOCALCLASSPATH%;%CLASSDIR%;src\main;%CLASSPATH%
+echo Content of %JAVA_HOME%
+dir %JAVA_HOME%
+echo Content of %JAVA_HOME%\bin
+dir %JAVA_HOME%\bin
echo JAVA_HOME=%JAVA_HOME%
echo JAVA=%JAVA%
echo JAVAC=%JAVAC%