ant-ivy git commit: Upgrade to 1.9.11 of Ant

[jaikiran]

Repository: ant-ivy
Updated Branches:
  refs/heads/master 62216968e -> 198af5cdf


Upgrade to 1.9.11 of Ant


Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/198af5cd
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/198af5cd
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/198af5cd

Branch: refs/heads/master
Commit: 198af5cdf183d4851568030a1e902ee8cc654506
Parents: 6221696
Author: Jaikiran Pai 
Authored: Sat Mar 31 10:58:18 2018 +0530
Committer: Jaikiran Pai 
Committed: Sat Mar 31 10:58:18 2018 +0530

--
 version.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/198af5cd/version.properties
--
diff --git a/version.properties b/version.properties
index f1a04ae..3a9d058 100644
--- a/version.properties
+++ b/version.properties
@@ -28,7 +28,7 @@ target.ivy.bundle.version.qualifier=alpha_
 #--
 # 'ant.version' is a built in name containing the version of the current 
 # running Ant, so we could not use that name here.
-apache-ant.version=1.9.10
+apache-ant.version=1.9.11
 ant-contrib.version=1.0b3
 bouncycastle.version=1.59
 commons-vfs2.version=2.2

ant-ivy git commit: Added makepom option to main/standalone

[jaikiran]

Repository: ant-ivy
Updated Branches:
  refs/heads/master 198af5cdf -> 73f7cf413


Added makepom option to main/standalone

This close PR #71 at github.com/apache/ant-ivy


Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/73f7cf41
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/73f7cf41
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/73f7cf41

Branch: refs/heads/master
Commit: 73f7cf413d07925db3f6a5abc4fb1a5543dce52c
Parents: 198af5c
Author: Thomas Pasch 
Authored: Tue Mar 27 21:17:01 2018 +0200
Committer: Jaikiran Pai 
Committed: Wed Apr 4 21:25:55 2018 +0530

--
 .gitignore |  1 +
 asciidoc/release-notes.adoc|  1 +
 src/java/org/apache/ivy/Main.java  | 13 +
 test/java/org/apache/ivy/MainTest.java | 26 ++
 4 files changed, 41 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/73f7cf41/.gitignore
--
diff --git a/.gitignore b/.gitignore
index 4f95270..8eb2a90 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@ test/repositories/norevision/ivy-mod1.1.xml
 test/repositories/norevision/mod1.1.jar
 test/test-repo/bundlerepo/*.jar
 test/test-repo/ivyrepo/org.apache.ivy.osgi
+out/

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/73f7cf41/asciidoc/release-notes.adoc
--
diff --git a/asciidoc/release-notes.adoc b/asciidoc/release-notes.adoc
index 3efa671..f2479ef 100644
--- a/asciidoc/release-notes.adoc
+++ b/asciidoc/release-notes.adoc
@@ -93,6 +93,7 @@ For details about the following changes, check our JIRA 
install at link:https://
 - NEW: Lets SSH-based resolvers use an `~/.ssh/config` file to find 
username/hostname/keyfile options (Thanks to Colin Stanfill)
 - NEW: Add ivy.maven.lookup.sources and ivy.maven.lookup.javadoc variables to 
control the lookup of the additional artifacts. Defaults to true, for backward 
compatibility (jira:IVY-1529[])
 - NEW: Add (conditional) support for SHA-256, SHA-512 and SHA-384 checksum 
algorithms (jira:IVY-1554[]) (Thanks to Jaikiran Pai)
+- NEW: The standalone Ivy jar can now be used to generate a pom file for the 
resolved module, using the `makepom` option (Thanks to 
link:https://github.com/aanno[aanno])
 
 
 

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/73f7cf41/src/java/org/apache/ivy/Main.java
--
diff --git a/src/java/org/apache/ivy/Main.java 
b/src/java/org/apache/ivy/Main.java
index e959bd5..6be36cd 100644
--- a/src/java/org/apache/ivy/Main.java
+++ b/src/java/org/apache/ivy/Main.java
@@ -47,6 +47,8 @@ import org.apache.ivy.core.resolve.ResolveOptions;
 import org.apache.ivy.core.resolve.ResolveProcessException;
 import org.apache.ivy.core.retrieve.RetrieveOptions;
 import org.apache.ivy.core.settings.IvySettings;
+import org.apache.ivy.plugins.parser.m2.PomModuleDescriptorWriter;
+import org.apache.ivy.plugins.parser.m2.PomWriterOptions;
 import org.apache.ivy.plugins.parser.xml.XmlModuleDescriptorWriter;
 import org.apache.ivy.plugins.report.XmlReportParser;
 import org.apache.ivy.util.DefaultMessageLogger;
@@ -174,6 +176,10 @@ public final class Main {
 new OptionBuilder("overwrite").description(
 "overwrite files in the repository if they 
exist").create())
 
+.addCategory("makepom options")
+.addOption(new OptionBuilder("makepom").arg("pomfilepath")
+.description("Creates a pom file for the 
module").create())
+
 .addCategory("http auth options")
 .addOption(
 new OptionBuilder("realm").arg("realm")
@@ -199,6 +205,7 @@ public final class Main {
 new OptionBuilder("cp").arg("cp")
 .description("extra classpath to use when 
launching process").create())
 
+
 .addCategory("message options")
 .addOption(
 new OptionBuilder("debug").description("set message level 
to debug").create())
@@ -419,6 +426,12 @@ public final class Main {
 .setOverwrite(line.hasOption("overwrite")));
 }
 }
+if (line.hasOption("makepom")) {
+final String pomFilePath = line.getOptionValue("makepom", 
"pom.xml");
+final File pomFile = new File(pomFilePath);
+PomModuleDescriptorWriter.write(md, pomFile, new 
PomWri

ant git commit: bz-62313 Enhance "linecontains" filter to allow any of the "contains" to match instead of all

[jaikiran]

Repository: ant
Updated Branches:
  refs/heads/master 34e658b07 -> 3094f5884


bz-62313 Enhance "linecontains" filter to allow any of the "contains" to match 
instead of all


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/3094f588
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/3094f588
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/3094f588

Branch: refs/heads/master
Commit: 3094f588408bd4c0805d305db7b68aecb4a60e1c
Parents: 34e658b
Author: Jaikiran Pai 
Authored: Tue May 1 10:30:21 2018 +0530
Committer: Jaikiran Pai 
Committed: Tue May 1 11:18:05 2018 +0530

--
 WHATSNEW|  5 ++
 manual/Types/filterchain.html   | 10 
 src/etc/testcases/filters/build.xml | 27 +
 .../expected/linecontains-matchany-negate.test  |  2 +
 .../filters/expected/linecontains-matchany.test |  5 ++
 .../apache/tools/ant/filters/LineContains.java  | 62 +++-
 .../tools/ant/filters/LineContainsTest.java | 26 
 7 files changed, 134 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/3094f588/WHATSNEW
--
diff --git a/WHATSNEW b/WHATSNEW
index a2d325e..0930328 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -46,6 +46,11 @@ Other changes:
properties with values taken as snapshots from the
availableProcessors, freeMemory, maxMemory and totalMemory methods
of the Java Runtime class.
+ 
+ * linecontains filter now has a new "matchAny" attribute which when
+   set to "true" allows any (instead of all) of the user-specified 
+   strings to be present in the line. 
+   Bugzilla Report 62313
 
 Changes from Ant 1.10.2 TO Ant 1.10.3
 =

http://git-wip-us.apache.org/repos/asf/ant/blob/3094f588/manual/Types/filterchain.html
--
diff --git a/manual/Types/filterchain.html b/manual/Types/filterchain.html
index f5266e5..d0db8ee 100644
--- a/manual/Types/filterchain.html
+++ b/manual/Types/filterchain.html
@@ -318,6 +318,16 @@ the source distribution).
 Whether to select non-matching lines only. Since Ant 
1.7
 No
   
+  
+matchAny
+If false, then all the strings are expected to be present in 
the line. If
+  true, then the presence of any of the strings in the line, is 
considered
+  a successful match. Defaults to false.
+  
+  Since Ant 1.10.4
+
+No
+  
 
 
 Example

http://git-wip-us.apache.org/repos/asf/ant/blob/3094f588/src/etc/testcases/filters/build.xml
--
diff --git a/src/etc/testcases/filters/build.xml 
b/src/etc/testcases/filters/build.xml
index dc32ad0..eb4dcdb 100644
--- a/src/etc/testcases/filters/build.xml
+++ b/src/etc/testcases/filters/build.xml
@@ -145,4 +145,31 @@
 File was modified
   
 
+  
+
+  
+
+  
+  
+
+  
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+  
+
+  
+  
+
+  
+
+  
 

http://git-wip-us.apache.org/repos/asf/ant/blob/3094f588/src/etc/testcases/filters/expected/linecontains-matchany-negate.test
--
diff --git 
a/src/etc/testcases/filters/expected/linecontains-matchany-negate.test 
b/src/etc/testcases/filters/expected/linecontains-matchany-negate.test
new file mode 100644
index 000..9dacab9
--- /dev/null
+++ b/src/etc/testcases/filters/expected/linecontains-matchany-negate.test
@@ -0,0 +1,2 @@
+This is line 4 with gamma.
+This is line 6 with delta.

http://git-wip-us.apache.org/repos/asf/ant/blob/3094f588/src/etc/testcases/filters/expected/linecontains-matchany.test
--
diff --git a/src/etc/testcases/filters/expected/linecontains-matchany.test 
b/src/etc/testcases/filters/expected/linecontains-matchany.test
new file mode 100644
index 000..0a472b2
--- /dev/null
+++ b/src/etc/testcases/filters/expected/linecontains-matchany.test
@@ -0,0 +1,5 @@
+This is line 1 with alpha.
+This is line 2 with beta.
+This is line 3 with beta.
+This is line 5 with beta.
+This is line 7 with beta.

http://git-wip-us.apache.org/repos/asf/ant/blob/3094f588/src/main/org/apache/tools/ant/filters/LineContains.java
--
diff --git a/src/main/org/apache/tools/ant/filters/LineContains.java 
b/src/main/org/apache/tools/ant/filters/LineContains.java
index 5c3609c..b55b8dd 100644
--- a/src/main/org/apache/tools/ant/filters/LineContains.java
+++ b/src/main/org

ant git commit: Fix parsing of module-info.class, when being analyzed by "depend" task

[jaikiran]

Repository: ant
Updated Branches:
  refs/heads/master cb92815cb -> d0f9c2e12


Fix parsing of module-info.class, when being analyzed by "depend" task


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/d0f9c2e1
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/d0f9c2e1
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/d0f9c2e1

Branch: refs/heads/master
Commit: d0f9c2e121e2b3a18b679705c2f2164426e7e6fb
Parents: cb92815
Author: Jaikiran Pai 
Authored: Sat May 12 18:35:55 2018 +0530
Committer: Jaikiran Pai 
Committed: Sat May 12 18:35:55 2018 +0530

--
 WHATSNEW|  5 +++
 .../taskdefs/optional/depend/depend.xml | 11 +++
 .../taskdefs/optional/depend/src6/Foo.java  | 22 +
 .../optional/depend/src6/module-info.java   |  3 ++
 .../depend/constantpool/ConstantPoolEntry.java  |  6 
 .../depend/constantpool/ModuleCPInfo.java   | 34 
 .../taskdefs/optional/depend/DependTest.java| 14 
 7 files changed, 95 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/d0f9c2e1/WHATSNEW
--
diff --git a/WHATSNEW b/WHATSNEW
index e5baae1..1b78144 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -31,6 +31,11 @@ Fixed bugs:
  *  died with a NullPointerException since Ant 1.10.2.
Bugzilla Report 62335
 
+ * The  task would fail with 
+   "java.lang.ClassFormatError: Invalid Constant Pool entry Type 19" while
+   parsing a module-info.class. This is now fixed.
+   Bug reported by Simon IJskes 
https://issues.apache.org/jira/browse/NETBEANS-781
+
 Other changes:
 --
 

http://git-wip-us.apache.org/repos/asf/ant/blob/d0f9c2e1/src/etc/testcases/taskdefs/optional/depend/depend.xml
--
diff --git a/src/etc/testcases/taskdefs/optional/depend/depend.xml 
b/src/etc/testcases/taskdefs/optional/depend/depend.xml
index 8465bb0..26260a7 100644
--- a/src/etc/testcases/taskdefs/optional/depend/depend.xml
+++ b/src/etc/testcases/taskdefs/optional/depend/depend.xml
@@ -33,6 +33,11 @@
   
   
   
+  
+
+  
+
+  
 
   
 This buildfile is used as part of Ant's test suite.
@@ -193,4 +198,10 @@
 
 
   
+
+  
+
+
+
+  
 

http://git-wip-us.apache.org/repos/asf/ant/blob/d0f9c2e1/src/etc/testcases/taskdefs/optional/depend/src6/Foo.java
--
diff --git a/src/etc/testcases/taskdefs/optional/depend/src6/Foo.java 
b/src/etc/testcases/taskdefs/optional/depend/src6/Foo.java
new file mode 100644
index 000..a305cb0
--- /dev/null
+++ b/src/etc/testcases/taskdefs/optional/depend/src6/Foo.java
@@ -0,0 +1,22 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+public class Foo {
+public static void main(final String[] args) {
+System.out.println("foo");
+}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ant/blob/d0f9c2e1/src/etc/testcases/taskdefs/optional/depend/src6/module-info.java
--
diff --git a/src/etc/testcases/taskdefs/optional/depend/src6/module-info.java 
b/src/etc/testcases/taskdefs/optional/depend/src6/module-info.java
new file mode 100644
index 000..24e075d
--- /dev/null
+++ b/src/etc/testcases/taskdefs/optional/depend/src6/module-info.java
@@ -0,0 +1,3 @@
+module dummy {
+requires java.base;
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ant/blob/d0f9c2e1/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPoolEntry.java
--
diff --git 
a/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPoolEntry.java
 
b/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPoolEntry.java
index b639fa9..ab66215 100644
--- 
a/src/main/org/apache/tools/ant/ta

ant git commit: Parse the CONSTANT_Package_info constant pool entry from class files

[jaikiran]

Repository: ant
Updated Branches:
  refs/heads/master d0f9c2e12 -> 333f5baaa


Parse the CONSTANT_Package_info constant pool entry from class files


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/333f5baa
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/333f5baa
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/333f5baa

Branch: refs/heads/master
Commit: 333f5baaa1987d0c89ce7d3666105e4d5bd73e77
Parents: d0f9c2e
Author: Jaikiran Pai 
Authored: Sun May 13 10:27:41 2018 +0530
Committer: Jaikiran Pai 
Committed: Sun May 13 10:27:41 2018 +0530

--
 .../taskdefs/optional/depend/src6/Foo.java  | 22 -
 .../optional/depend/src6/module-info.java   |  1 +
 .../optional/depend/src6/org.dummy/Foo.java | 24 ++
 .../depend/constantpool/ConstantPoolEntry.java  |  7 
 .../depend/constantpool/PackageCPInfo.java  | 34 
 5 files changed, 66 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/333f5baa/src/etc/testcases/taskdefs/optional/depend/src6/Foo.java
--
diff --git a/src/etc/testcases/taskdefs/optional/depend/src6/Foo.java 
b/src/etc/testcases/taskdefs/optional/depend/src6/Foo.java
deleted file mode 100644
index a305cb0..000
--- a/src/etc/testcases/taskdefs/optional/depend/src6/Foo.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-public class Foo {
-public static void main(final String[] args) {
-System.out.println("foo");
-}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ant/blob/333f5baa/src/etc/testcases/taskdefs/optional/depend/src6/module-info.java
--
diff --git a/src/etc/testcases/taskdefs/optional/depend/src6/module-info.java 
b/src/etc/testcases/taskdefs/optional/depend/src6/module-info.java
index 24e075d..d7b254f 100644
--- a/src/etc/testcases/taskdefs/optional/depend/src6/module-info.java
+++ b/src/etc/testcases/taskdefs/optional/depend/src6/module-info.java
@@ -1,3 +1,4 @@
 module dummy {
 requires java.base;
+exports org.dummy;
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ant/blob/333f5baa/src/etc/testcases/taskdefs/optional/depend/src6/org.dummy/Foo.java
--
diff --git a/src/etc/testcases/taskdefs/optional/depend/src6/org.dummy/Foo.java 
b/src/etc/testcases/taskdefs/optional/depend/src6/org.dummy/Foo.java
new file mode 100644
index 000..e3a061a
--- /dev/null
+++ b/src/etc/testcases/taskdefs/optional/depend/src6/org.dummy/Foo.java
@@ -0,0 +1,24 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package org.dummy;
+
+public class Foo {
+public static void main(final String[] args) {
+System.out.println("foo");
+}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ant/blob/333f5baa/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPoolEntry.java
--
diff --git 
a/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPoolEntry.java
 
b/src/

ant-antlibs-antunit git commit: Avoid potential thread safety issues in LogCapturer

[jaikiran]

Repository: ant-antlibs-antunit
Updated Branches:
  refs/heads/master e22525b32 -> 2014f42d7


Avoid potential thread safety issues in LogCapturer


Project: http://git-wip-us.apache.org/repos/asf/ant-antlibs-antunit/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/ant-antlibs-antunit/commit/2014f42d
Tree: http://git-wip-us.apache.org/repos/asf/ant-antlibs-antunit/tree/2014f42d
Diff: http://git-wip-us.apache.org/repos/asf/ant-antlibs-antunit/diff/2014f42d

Branch: refs/heads/master
Commit: 2014f42d7e9c9b352ee381a67e89ec0d35b98acb
Parents: e22525b
Author: Jaikiran Pai 
Authored: Mon May 14 11:13:26 2018 +0530
Committer: Jaikiran Pai 
Committed: Mon May 14 11:13:26 2018 +0530

--
 src/main/org/apache/ant/antunit/LogCapturer.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant-antlibs-antunit/blob/2014f42d/src/main/org/apache/ant/antunit/LogCapturer.java
--
diff --git a/src/main/org/apache/ant/antunit/LogCapturer.java 
b/src/main/org/apache/ant/antunit/LogCapturer.java
index 3dee342..601defb 100644
--- a/src/main/org/apache/ant/antunit/LogCapturer.java
+++ b/src/main/org/apache/ant/antunit/LogCapturer.java
@@ -23,6 +23,7 @@ package org.apache.ant.antunit;
 import java.util.Iterator;
 import java.util.List;
 import java.util.LinkedList;
+import java.util.Collections;
 
 import org.apache.tools.ant.BuildEvent;
 import org.apache.tools.ant.BuildListener;
@@ -40,7 +41,7 @@ import org.apache.tools.ant.util.StringUtils;
 public class LogCapturer implements BuildListener {
 public static final String REFERENCE_ID = "ant.antunit.log";
 
-private List/**/ events = new LinkedList();
+private List/**/ events = Collections.synchronizedList(new 
LinkedList());
 private Project p;
 
 public LogCapturer(Project p) {

ant git commit: Exclude JUnit 5 related classes from test execution, through junit task

[jaikiran]

Repository: ant
Updated Branches:
  refs/heads/master 64fbdb14d -> e4f117831


Exclude JUnit 5 related classes from test execution, through junit task


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/e4f11783
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/e4f11783
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/e4f11783

Branch: refs/heads/master
Commit: e4f11783198988a726b5ae057ff8fb9238eac3a7
Parents: 64fbdb1
Author: Jaikiran Pai 
Authored: Sat Jun 2 08:51:10 2018 +0530
Committer: Jaikiran Pai 
Committed: Sat Jun 2 08:51:10 2018 +0530

--
 build.xml | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/e4f11783/build.xml
--
diff --git a/build.xml b/build.xml
index b6eada1..f4c61b2 100644
--- a/build.xml
+++ b/build.xml
@@ -1828,6 +1828,9 @@ ${antunit.reports}
   
   
 
+  
+  
+
   
   
   

ant git commit: Update the junitlauncher task documentation to list "includeEngines" and "excludeEngines" attribute for the test definition

[jaikiran]

Repository: ant
Updated Branches:
  refs/heads/master e4f117831 -> 405aa4f8e


Update the junitlauncher task documentation to list "includeEngines" and 
"excludeEngines" attribute for the test definition


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/405aa4f8
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/405aa4f8
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/405aa4f8

Branch: refs/heads/master
Commit: 405aa4f8e01cf50d8097e17ac115d766c6c1af70
Parents: e4f1178
Author: Jaikiran Pai 
Authored: Sat Jun 2 09:16:37 2018 +0530
Committer: Jaikiran Pai 
Committed: Sat Jun 2 09:16:56 2018 +0530

--
 manual/Tasks/junitlauncher.html | 44 
 1 file changed, 44 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/405aa4f8/manual/Tasks/junitlauncher.html
--
diff --git a/manual/Tasks/junitlauncher.html b/manual/Tasks/junitlauncher.html
index 5f2d6bb..5a132f3 100644
--- a/manual/Tasks/junitlauncher.html
+++ b/manual/Tasks/junitlauncher.html
@@ -330,6 +330,28 @@
 is not set.
 No
 
+
+includeEngines
+A comma separated set of test engine ids. If specified, only these 
test engine(s)
+will be used for running the tests.
+
+For example: includeEngines="junit-jupiter" will only 
use the Jupiter
+test engine for execution of the tests and will ignore any other 
engines that might
+have been found in the classpath.
+
+No
+
+
+excludeEngines
+A comma separated set of test engine ids. If specified, these test 
engine(s)
+will be excluded when running the tests.
+
+For example: excludeEngines="junit-vintage" will 
exclude the vintage
+test engine during execution of the tests and will use any other 
engines that might
+have been found in the classpath.
+
+No
+
 
 
 
@@ -383,6 +405,28 @@
 is not set.
 No
 
+
+includeEngines
+A comma separated set of test engine ids. If specified, only these 
test engine(s)
+will be used for running the tests.
+
+For example: includeEngines="junit-jupiter" will only 
use the Jupiter
+test engine for execution of the tests and will ignore any other 
engines that might
+have been found in the classpath.
+
+No
+
+
+excludeEngines
+A comma separated set of test engine ids. If specified, these test 
engine(s)
+will be excluded when running the tests.
+
+For example: excludeEngines="junit-vintage" will 
exclude the vintage
+test engine during execution of the tests and will use any other 
engines that might
+have been found in the classpath.
+
+No
+
 
 
 

svn commit: r1832721 - /ant/site/ant/production/manual/Tasks/junitlauncher.html

[jaikiran]

Author: jaikiran
Date: Sat Jun  2 03:56:04 2018
New Revision: 1832721

URL: http://svn.apache.org/viewvc?rev=1832721&view=rev
Log:
junitlauncher task, in the current released version, already allows 
"includeEngines" and "excludeEngines" attribute for test definition; update the 
documentation to reflect that

Modified:
ant/site/ant/production/manual/Tasks/junitlauncher.html

Modified: ant/site/ant/production/manual/Tasks/junitlauncher.html
URL: 
http://svn.apache.org/viewvc/ant/site/ant/production/manual/Tasks/junitlauncher.html?rev=1832721&r1=1832720&r2=1832721&view=diff
==
--- ant/site/ant/production/manual/Tasks/junitlauncher.html (original)
+++ ant/site/ant/production/manual/Tasks/junitlauncher.html Sat Jun  2 03:56:04 
2018
@@ -118,9 +118,9 @@
 Parameters
 
 
-Attribute
-Description
-Required
+Attribute
+Description
+Required
 
 
 haltOnFailure
@@ -211,9 +211,9 @@
 
 
 
-Attribute
-Description
-Required
+Attribute
+Description
+Required
 
 
 type
@@ -285,9 +285,9 @@
 
 
 
-Attribute
-Description
-Required
+Attribute
+Description
+Required
 
 
 name
@@ -330,6 +330,28 @@
 is not set.
 No
 
+
+includeEngines
+A comma separated set of test engine ids. If specified, only these 
test engine(s)
+will be used for running the tests.
+
+For example: includeEngines="junit-jupiter" will only 
use the Jupiter
+test engine for execution of the tests and will ignore any other 
engines that might
+have been found in the classpath.
+
+No
+
+
+excludeEngines
+A comma separated set of test engine ids. If specified, these test 
engine(s)
+will be excluded when running the tests.
+
+For example: excludeEngines="junit-vintage" will 
exclude the vintage
+test engine during execution of the tests and will use any other 
engines that might
+have been found in the classpath.
+
+No
+
 
 
 
@@ -349,9 +371,9 @@
 
 
 
-Attribute
-Description
-Required
+Attribute
+Description
+Required
 
 
 haltOnFailure
@@ -383,6 +405,28 @@
 is not set.
 No
 
+
+includeEngines
+A comma separated set of test engine ids. If specified, only these 
test engine(s)
+will be used for running the tests.
+
+For example: includeEngines="junit-jupiter" will only 
use the Jupiter
+test engine for execution of the tests and will ignore any other 
engines that might
+have been found in the classpath.
+
+No
+
+
+excludeEngines
+A comma separated set of test engine ids. If specified, these test 
engine(s)
+will be excluded when running the tests.
+
+For example: excludeEngines="junit-vintage" will 
exclude the vintage
+test engine during execution of the tests and will use any other 
engines that might
+have been found in the classpath.
+
+No
+
 
 
 
@@ -392,6 +436,10 @@
 
 Examples
 
+
+Launch the JUnit 5 platform to run the org.myapp.SimpleTest 
test
+
+
 
 <path id="test.classpath">
 ...
@@ -403,7 +451,9 @@
 </junitlauncher>
 
 
-Launches the JUnit 5 platform to run the org.myapp.SimpleTest 
test
+Launch the JUnit 5 platform to run the org.myapp.SimpleTest 
and
+the org.myapp.AnotherTest tests. The build process will be 
stopped if any test, in
+the org.myapp.SimpleTest, fails.
 
 
 
@@ -415,9 +465,8 @@
 
 
 
-Launches the JUnit 5 platform to run the org.myapp.SimpleTest 
and
-the org.myapp.AnotherTest tests. The build process will be 
stopped if any test, in
-the org.myapp.SimpleTest, fails.
+Launch the JUnit 5 platform to run only the testFoo and 
testBar
+methods of the org.myapp.SimpleTest test class.
 
 
 
@@ -427,8 +476,10 @@
 </junitlauncher>
 
 
-Launches the JUnit 5 platform to run only the testFoo and 
testBar
-methods of the org.myapp.SimpleTest test class.
+Select any .class files that match
+the org/example/**/tests/**/ fileset filter, 
under
+the ${build.classes.dir} and passes those classes to the 
JUnit 5 platform for
+execution as tests.
 
 
 
@@ -443,10 +494,14 @@
 </junitlauncher>
 
 
-Selects any .class files that match
+Select any .class files that match
 the org/example/**/tests/**/ fileset filter, 
under
-the ${build.classes.dir} and passes those classes to 

ant git commit: Update the junitlauncher manual to include an example of configuring a nested classpath for including test engines

[jaikiran]

Repository: ant
Updated Branches:
  refs/heads/master 69a3f1c15 -> ddd729ba9


Update the junitlauncher manual to include an example of configuring a nested 
classpath for including test engines


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/ddd729ba
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/ddd729ba
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/ddd729ba

Branch: refs/heads/master
Commit: ddd729ba977787ffb9397ad653b6ea88ffaf645e
Parents: 69a3f1c
Author: Jaikiran Pai 
Authored: Sun Jun 3 15:07:07 2018 +0530
Committer: Jaikiran Pai 
Committed: Sun Jun 3 15:07:07 2018 +0530

--
 manual/Tasks/junitlauncher.html | 84 +---
 1 file changed, 78 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/ddd729ba/manual/Tasks/junitlauncher.html
--
diff --git a/manual/Tasks/junitlauncher.html b/manual/Tasks/junitlauncher.html
index 5a132f3..8a32e42 100644
--- a/manual/Tasks/junitlauncher.html
+++ b/manual/Tasks/junitlauncher.html
@@ -52,7 +52,7 @@
 are necessary to run the tests are:
 
 
-
+
 
 junit-platform-commons.jar
 
@@ -62,6 +62,9 @@
 
 junit-platform-launcher.jar
 
+
+opentest4j.jar
+
 
 
 
@@ -69,7 +72,7 @@
 following libraries in the classpath
 
 
-
+
 For junit-vintage engine:
 
 
@@ -82,7 +85,7 @@
 
 
 
-
+
 For junit-jupiter engine:
 
 
@@ -93,9 +96,6 @@
 
 junit-jupiter-engine.jar
 
-
-opentest4j.jar
-
 
 
 
@@ -108,6 +108,9 @@
 OR Leave ant-junitlauncher.jar in the 
ANT_HOME/lib directory and
 include all other relevant jars in the classpath by passing them as a 
-lib
 option, while invoking Ant
+OR Use the nested <classpath> element to specify 
the location of the
+test engines. For more details about this approach, please read the 
+using classpath element to include 
test engines section.
 
 
 
@@ -150,12 +153,81 @@
 
 
 Finding the test classes to execute
+Finding test engines that run the tests
 
 
 If the classpath element isn't configured for the task, then 
the classpath of Ant
 itself will be used for finding the test classes.
 
 
+Using the classpath element to include test 
engines
+
+The <classpath> can be used to include the test engines 
that you want to be
+considered for execution of the tests. 
+
+
+NOTE: An important aspect to remember is that 
+whether or not you use this approach, the JUnit 5 platform libraries 
+listed earlier in this 
+document and the ant-junitlauncher.jar, shouldn't 
be part of this classpath
+and instead they must be included in Ant runtime's classpath either by 
placing them 
+in ANT_HOME/lib or by passing the -lib option.
+
+
+Below is an example of setting up the classpath to include the Jupiter 
test engine during the
+execution of the tests. We assume that the JUnit 5 platform libraries and 
the 
+ant-junitlauncher.jar have been setup as explained previously.
+
+ 
+<project>
+
+<property name="output.dir" value="${basedir}/build"/>
+<property name="src.test.dir" value="${basedir}/src/test"/>
+<property name="build.classes.dir" value="${output.dir}/classes"/>
+
+<target name="init">
+<mkdir dir="${output.dir}"/>
+</target>
+
+<path id="junit.engine.jupiter.classpath">
+<fileset dir="${basedir}/src/lib/jupiter/"/>
+</path>
+
+<target name="compile-test" depends="init">
+<mkdir dir="${build.classes.dir}"/>
+<javac srcdir="${src.test.dir}"
+   destdir="${build.classes.dir}">
+   <classpath refid="junit.engine.jupiter.classpath"/>
+</javac>  
+</target> 
+
+<target name="test" depends="compile-test">
+<junitlauncher>
+<classpath refid="junit.engine.jupiter.classpath"/>
+<classpath>
+<pathelement location="${build.classes.dir}"/>
+</classpath>  
+<testclasses outputdir="${output.dir}">
+<fileset dir="${build.classes.dir}"/>
+<listener type="legacy-brief" sendSysOut="true"/>
+<listener type="legacy-xml" sendSysErr="true" 
sendSysOut="true"/>
+ 

ant git commit: Introduce a "printSummary" attribute on the junitlauncher task to print the test execution summary

[jaikiran]

Repository: ant
Updated Branches:
  refs/heads/master ddd729ba9 -> 047e89777


Introduce a "printSummary" attribute on the junitlauncher task to print the 
test execution summary


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/047e8977
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/047e8977
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/047e8977

Branch: refs/heads/master
Commit: 047e897775bd8f53a5cf324bf9f039911d15b081
Parents: ddd729b
Author: Jaikiran Pai 
Authored: Sun Jun 3 18:52:02 2018 +0530
Committer: Jaikiran Pai 
Committed: Sun Jun 3 18:52:02 2018 +0530

--
 manual/Tasks/junitlauncher.html   |  8 
 .../optional/junitlauncher/JUnitLauncherTask.java | 10 ++
 2 files changed, 18 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/047e8977/manual/Tasks/junitlauncher.html
--
diff --git a/manual/Tasks/junitlauncher.html b/manual/Tasks/junitlauncher.html
index 8a32e42..bc360a9 100644
--- a/manual/Tasks/junitlauncher.html
+++ b/manual/Tasks/junitlauncher.html
@@ -141,6 +141,14 @@
 
 No
 
+
+printSummary
+If the value is set to true then this task, upon 
completion of the test execution,
+prints the summary of the execution to System.out. 
The summary itself is generated
+by the JUnit 5 platform and not by this task.
+
+No; defaults to false
+
 
 
 Nested Elements

http://git-wip-us.apache.org/repos/asf/ant/blob/047e8977/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/JUnitLauncherTask.java
--
diff --git 
a/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/JUnitLauncherTask.java
 
b/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/JUnitLauncherTask.java
index dc09a5e..7309e99 100644
--- 
a/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/JUnitLauncherTask.java
+++ 
b/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/JUnitLauncherTask.java
@@ -21,6 +21,7 @@ import java.io.OutputStream;
 import java.io.PipedInputStream;
 import java.io.PipedOutputStream;
 import java.io.PrintStream;
+import java.io.PrintWriter;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.ArrayList;
@@ -57,6 +58,7 @@ public class JUnitLauncherTask extends Task {
 private Path classPath;
 private boolean haltOnFailure;
 private String failureProperty;
+private boolean printSummary;
 private final List tests = new ArrayList<>();
 private final List listeners = new ArrayList<>();
 
@@ -172,6 +174,10 @@ public class JUnitLauncherTask extends Task {
 this.failureProperty = failureProperty;
 }
 
+public void setPrintSummary(final boolean printSummary) {
+this.printSummary = printSummary;
+}
+
 private void preConfigure(final TestDefinition test) {
 if (test.getHaltOnFailure() == null) {
 test.setHaltOnFailure(this.haltOnFailure);
@@ -267,6 +273,10 @@ public class JUnitLauncherTask extends Task {
 }
 
 private void handleTestExecutionCompletion(final TestDefinition test, 
final TestExecutionSummary summary) {
+if (printSummary) {
+// print the summary to System.out
+summary.printTo(new PrintWriter(System.out, true));
+}
 final boolean hasTestFailures = summary.getTestsFailedCount() != 0;
 try {
 if (hasTestFailures && test.getFailureProperty() != null) {

ant git commit: Update WHATSNEW for the new "printSummary" attribute of junitlauncher task

[jaikiran]

Repository: ant
Updated Branches:
  refs/heads/master 047e89777 -> d228bfb07


Update WHATSNEW for the new "printSummary" attribute of junitlauncher task


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/d228bfb0
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/d228bfb0
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/d228bfb0

Branch: refs/heads/master
Commit: d228bfb07bba5bf56ad9140e205b7a0dfb8986c5
Parents: 047e897
Author: Jaikiran Pai 
Authored: Sun Jun 3 18:54:03 2018 +0530
Committer: Jaikiran Pai 
Committed: Sun Jun 3 18:54:03 2018 +0530

--
 WHATSNEW | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/d228bfb0/WHATSNEW
--
diff --git a/WHATSNEW b/WHATSNEW
index 3bdab33..d7b6733 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -75,6 +75,9 @@ Other changes:
attribute that defaults to "true" for consistency.
Bugzilla Report 22370
 
+ * The junitlauncher task now has a "printSummary" attribute which when
+   set to "true" will print the test execution summary to System.out.
+
 Changes from Ant 1.10.2 TO Ant 1.10.3
 =
 

[1/3] ant-ivyde git commit: Configure Ivy version in build.properties

[jaikiran]

Repository: ant-ivyde
Updated Branches:
  refs/heads/master f16c20ba4 -> 41d155cb7


Configure Ivy version in build.properties


Project: http://git-wip-us.apache.org/repos/asf/ant-ivyde/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivyde/commit/a6da5918
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivyde/tree/a6da5918
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivyde/diff/a6da5918

Branch: refs/heads/master
Commit: a6da591891b64ad7cf1acb29b7a7caac30d51148
Parents: f16c20b
Author: Jaikiran Pai 
Authored: Wed Jun 13 09:33:19 2018 +0530
Committer: Jaikiran Pai 
Committed: Wed Jun 13 09:33:19 2018 +0530

--
 build.properties | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/a6da5918/build.properties
--
diff --git a/build.properties b/build.properties
index 771a3a9..30179f5 100644
--- a/build.properties
+++ b/build.properties
@@ -25,6 +25,9 @@ eclipse.consoleLog=false
 # Comment out to fail builds if Checkstyle fails
 ignore.checkstyle=
 
+# Ivy version to use to build this project
+ivy.version=2.5.0-rc1
+
 # URL of the mirror to use when trying to install Ivy from an official release
 mirror.url=http://archive.apache.org/dist/
 

[3/3] ant-ivyde git commit: Fix package-sources target, now that we are no longer using SVN for source control

[jaikiran]

Fix package-sources target, now that we are no longer using SVN for source 
control


Project: http://git-wip-us.apache.org/repos/asf/ant-ivyde/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivyde/commit/41d155cb
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivyde/tree/41d155cb
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivyde/diff/41d155cb

Branch: refs/heads/master
Commit: 41d155cb72b57be6df90db09c0b0dcc3fc7dd225
Parents: f421b03
Author: Jaikiran Pai 
Authored: Wed Jun 13 12:39:15 2018 +0530
Committer: Jaikiran Pai 
Committed: Wed Jun 13 12:39:15 2018 +0530

--
 build.xml | 30 +-
 1 file changed, 13 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/41d155cb/build.xml
--
diff --git a/build.xml b/build.xml
index dd39853..5e8c8aa 100644
--- a/build.xml
+++ b/build.xml
@@ -304,28 +304,24 @@ ivyde.build.version=${build.version}
 
 
 
-
-
-
-
-
-
-
-
-
-
+
 
 
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
 
-
-
-
 
 
+
 
 
 

[2/3] ant-ivyde git commit: Asciidoc needs to be run unnested from their jar. (thanks to Nicolas)

[jaikiran]

Asciidoc needs to be run unnested from their jar. (thanks to Nicolas)

 cf 
https://github.com/spring-projects/spring-boot/issues/7399#issuecomment-260908153


Project: http://git-wip-us.apache.org/repos/asf/ant-ivyde/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivyde/commit/f421b035
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivyde/tree/f421b035
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivyde/diff/f421b035

Branch: refs/heads/master
Commit: f421b03580abddb9b932ffb694822ae64bdfae82
Parents: a6da591
Author: Jaikiran Pai 
Authored: Wed Jun 13 09:33:54 2018 +0530
Committer: Jaikiran Pai 
Committed: Wed Jun 13 09:33:54 2018 +0530

--
 build.xml | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/f421b035/build.xml
--
diff --git a/build.xml b/build.xml
index 667a32a..dd39853 100644
--- a/build.xml
+++ b/build.xml
@@ -50,7 +50,6 @@
 
 
 
-
 http://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.version}/ivy-${ivy.version}.jar"/>
 
 
@@ -78,11 +77,14 @@
 
 
 
-
-
+
+
+
+
+
 
 
-
+
 
 
 

ant-ivyde git commit: Place the packaged source in the correct directory

[jaikiran]

Repository: ant-ivyde
Updated Branches:
  refs/heads/master 41d155cb7 -> 2e88175b9


Place the packaged source in the correct directory


Project: http://git-wip-us.apache.org/repos/asf/ant-ivyde/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivyde/commit/2e88175b
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivyde/tree/2e88175b
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivyde/diff/2e88175b

Branch: refs/heads/master
Commit: 2e88175b99380749ab64fe4315cdf4ab88ddd9e2
Parents: 41d155c
Author: Jaikiran Pai 
Authored: Wed Jun 13 13:11:50 2018 +0530
Committer: Jaikiran Pai 
Committed: Wed Jun 13 13:11:50 2018 +0530

--
 build.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/2e88175b/build.xml
--
diff --git a/build.xml b/build.xml
index 5e8c8aa..db903ab 100644
--- a/build.xml
+++ b/build.xml
@@ -311,13 +311,13 @@ ivyde.build.version=${build.version}
 
 
 
-
+
 
 
 
 
 
-
+
 
 
 

[3/3] ant-ivyde git commit: Update release instructions

[jaikiran]

Update release instructions


Project: http://git-wip-us.apache.org/repos/asf/ant-ivyde/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivyde/commit/89a3ebcc
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivyde/tree/89a3ebcc
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivyde/diff/89a3ebcc

Branch: refs/heads/master
Commit: 89a3ebcc75e3dde10f989dc5f60fb398b82d63a2
Parents: b7a80d3
Author: Jaikiran Pai 
Authored: Wed Jun 13 20:10:24 2018 +0530
Committer: Jaikiran Pai 
Committed: Wed Jun 13 20:10:24 2018 +0530

--
 doc/src/dev/release.adoc| 78 +---
 doc/src/dev/updatesite.adoc | 26 +++---
 2 files changed, 37 insertions(+), 67 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/89a3ebcc/doc/src/dev/release.adoc
--
diff --git a/doc/src/dev/release.adoc b/doc/src/dev/release.adoc
index d1daa97..f3802c5 100644
--- a/doc/src/dev/release.adoc
+++ b/doc/src/dev/release.adoc
@@ -18,7 +18,7 @@
 
 
 This documentation is defining every steps that needs to be accomplished when 
releasing Apache IvyDE.
-In this doc, the released version is denoted as $VERSION, so it HAVE to be 
replaced in the command line argument accordingly. There is also some $LOGIN 
which is referencing your login on the Apache machines.
+In this doc, the released version is denoted as $VERSION, so it HAS to be 
replaced in the command line argument accordingly. There is also some $LOGIN 
which is referencing your login on the Apache machines.
 
 == Prepare
 
@@ -28,88 +28,58 @@ First in 
link:https://issues.apache.org/jira/browse/IVYDE[Jira] make sure that n
 
 === Release notes
 
-Make sure the release notes and the annoucement are up to date. Look at 
doc/release-notes.html. Remove there anything which refers to a draft status.
+Make sure the release notes and the annoucement are up to date in 
doc/src/release-notes.adoc.
 
 === Last checks
 
-Make sure that there is no missing ASL header in the source files. The build 
of IvyDE generate a report there: 
https://builds.apache.org/job/IvyDE/lastSuccessfulBuild/artifact/trunk/work/rat/report.txt
+Make sure that there is no missing ASL header in the source files. The build 
of IvyDE generate a report there: 
https://builds.apache.org/job/IvyDE/lastSuccessfulBuild/artifact/work/rat/report.txt
 
 Make sure the copyright year in the NOTICE file is the current year.
 
-Make sure the copyright year in the html template is the current year; the 3 
template files to check are: `template.html`, `template-eclipse.html` and 
`printTemplate.html`.
+Make sure the copyright year in the asciidoc template files is the current 
year; the 3 template files to check are:
+  - `doc/templates/book/document.html.slim`
+  - `doc/templates/articles/document.html.slim`
+  - `doc/templates/eclipse/document.html.slim`
 
-=== Release branch
 
-Some modifications of the branch are need to do the release. So a new branch 
is needed:
+== Building for release
 
-[source]
-
-svn copy https://svn.apache.org/repos/asf/ant/ivy/ivyde/trunk \
-   https://svn.apache.org/repos/asf/ant/ivy/ivyde/branches/$VERSION \
-  -m "Creating a release branch for IvyDE $VERSION"
-
-
-and then checkout it:
+Make sure you have a proper working copy with a `git status`. You should have 
no modification.
 
-[source]
-
-svn co https://svn.apache.org/repos/asf/ant/ivy/ivyde/branches/$VERSION 
ivyde-$VERSION
-
+Edit the `build.properties` and update the value of the `version.qualifier` 
property to an appropriate qualifier. For example, if you want to release the 
`Final` version of `2.3.0` then the `version.qualifier` value is expected to be 
`Final`. Similarly, if you are releasing `rc1` of `2.3.0` then the value for 
this property will be `rc1`
 
-=== Documentation release
-
-The documentation have to specify the correct version number:
-In the files:
+Then launch the build:
 
-* doc/template.html +
-The header should look like this
 [source]
 
-${title} | Apache IvyDE $VERSION Documentation
+ant /release clean dist -DbaseLocation=/home/me/./eclipse/
 
 
-You'll need to fix the revision of the svn:external in doc. Edit the 
svn:external property on the folder doc and set it to the latest revision. It 
should look like:
+And sign the artifacts:
 
 [source]
 
-xooki -r1306546 https://svn.apache.org/repos/asf/ant/site/xooki/
-style -r1306546 https://svn.apache.org/repos/asf/ant/site/ivyde/sources/style/
+./signArtifacts.sh
 
 
-=== Commit your changes
-
-Don't forget to commit the changes you've done into the release branch.
-
-== Building
-
-Make sure you have a proper working copy with a `svn status`. You should have 
no modification.
-
-Then launch the build:
+Then it is time to tag the release

[1/3] ant-ivyde git commit: Update year in copyright message

[jaikiran]

Repository: ant-ivyde
Updated Branches:
  refs/heads/master 2e88175b9 -> 89a3ebcc7


Update year in copyright message


Project: http://git-wip-us.apache.org/repos/asf/ant-ivyde/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivyde/commit/d733ac80
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivyde/tree/d733ac80
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivyde/diff/d733ac80

Branch: refs/heads/master
Commit: d733ac804e35fc319fa539431af0f09cd4a88574
Parents: 2e88175
Author: Jaikiran Pai 
Authored: Wed Jun 13 20:04:55 2018 +0530
Committer: Jaikiran Pai 
Committed: Wed Jun 13 20:04:55 2018 +0530

--
 doc/templates/articles/document.html.slim | 2 +-
 doc/templates/book/document.html.slim | 2 +-
 doc/templates/eclipse/document.html.slim  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/d733ac80/doc/templates/articles/document.html.slim
--
diff --git a/doc/templates/articles/document.html.slim 
b/doc/templates/articles/document.html.slim
index b5d7131..8c1ffe2 100644
--- a/doc/templates/articles/document.html.slim
+++ b/doc/templates/articles/document.html.slim
@@ -78,7 +78,7 @@ html lang=(attr :lang, 'en' unless attr? :nolang)
   div id="footer-message" class="footer"
 hr/
 i
-  | Copyright © 2017 The Apache Software Foundation, Licensed 
under the
+  | Copyright © 2018 The Apache Software Foundation, Licensed 
under the
   a href="http://www.apache.org/licenses/"; Apache License, Version 2.0
   | .
 br/

http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/d733ac80/doc/templates/book/document.html.slim
--
diff --git a/doc/templates/book/document.html.slim 
b/doc/templates/book/document.html.slim
index 126676e..fe33ed1 100644
--- a/doc/templates/book/document.html.slim
+++ b/doc/templates/book/document.html.slim
@@ -42,7 +42,7 @@ html lang=(attr :lang, 'en' unless attr? :nolang)
   div id="footer-message" class="footer"
 hr/
 i
-  | Copyright © 2017 The Apache Software Foundation, Licensed 
under the
+  | Copyright © 2018 The Apache Software Foundation, Licensed 
under the
   a href="http://www.apache.org/licenses/"; Apache License, Version 2.0
   | .
 br/

http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/d733ac80/doc/templates/eclipse/document.html.slim
--
diff --git a/doc/templates/eclipse/document.html.slim 
b/doc/templates/eclipse/document.html.slim
index f64412f..f19792c 100644
--- a/doc/templates/eclipse/document.html.slim
+++ b/doc/templates/eclipse/document.html.slim
@@ -32,7 +32,7 @@ html lang=(attr :lang, 'en' unless attr? :nolang)
   div id="footer-message" class="footer"
 hr/
 i
-  | Copyright © 2017 The Apache Software Foundation, Licensed 
under the
+  | Copyright © 2018 The Apache Software Foundation, Licensed 
under the
   a href="http://www.apache.org/licenses/"; Apache License, Version 2.0
   | .
 br/

[2/3] ant-ivyde git commit: Update release notes in preparation of release

[jaikiran]

Update release notes in preparation of release


Project: http://git-wip-us.apache.org/repos/asf/ant-ivyde/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivyde/commit/b7a80d39
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivyde/tree/b7a80d39
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivyde/diff/b7a80d39

Branch: refs/heads/master
Commit: b7a80d393e4fe0aa3645e070025b78e131bd8688
Parents: d733ac8
Author: Jaikiran Pai 
Authored: Wed Jun 13 20:10:12 2018 +0530
Committer: Jaikiran Pai 
Committed: Wed Jun 13 20:10:12 2018 +0530

--
 doc/src/release-notes.adoc | 79 +
 1 file changed, 33 insertions(+), 46 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/b7a80d39/doc/src/release-notes.adoc
--
diff --git a/doc/src/release-notes.adoc b/doc/src/release-notes.adoc
index e597bc6..920fcd4 100644
--- a/doc/src/release-notes.adoc
+++ b/doc/src/release-notes.adoc
@@ -18,63 +18,72 @@
 
 
 . link:#annoucement[Release Annoucement]
-. link:#what[What is Apache IvyDE?]
-. link:#status[Status of this release]
+. link:#what[What is Apache IvyDE?]
 . link:#majorchanges[Major Changes in this Release]
-. link:#contrib[Committers and Contributors for this Release]
 . link:#changes[List of Changes in this Release]
+. link:#contrib[Committers and Contributors for this Release]
 
 == [[annoucement]]Release Annoucement
 
-[source]
-
-The Apache IvyDE project is pleased to announce its 2.3.0 release.
+The Apache IvyDE project is pleased to announce its 2.3.0-rc1 release.
 
 The Apache IvyDE Eclipse plugin integrates Apache Ivy's dependency management 
into Eclipse. It lets you manage your dependencies declared in an ivy.xml in 
your Java Eclipse projects, or any other kind of project which needs dependency 
management. Apache IvyDE will contribute to the classpath of your Java project 
or you can make it retrieve your dependencies directly into your project. Last 
but not least Apache IvyDE offer editors of ivy.xml and ivysettings.xml files 
with completion. Get some preview here: 
http://ant.apache.org/ivy/ivyde/screenshots.html
 
-Major changes in this release:
+== [[what]]What is Apache IvyDE?
+
+Apache IvyDE is the Eclipse plugin which integrates Apache Ivy's dependency 
management into Eclipse(TM).
+
+Apache IvyDE lets you manage your dependencies declared in an ivy.xml in your 
Java Eclipse projects, or any other kind of project which needs dependency 
management. Apache IvyDE will contribute to the classpath of your Java project 
or you can make it retrieve your dependencies directly into your project. Last 
but not least Apache IvyDE offer editors of ivy.xml and ivysettings.xml files 
with completion. Get some preview here: 
http://ant.apache.org/ivy/ivyde/screenshots.html.
+
+=== [[majorchanges]]Major changes in this release:
 
-IvyDE can now manage credentials stored in a secured store. Rather than 
putting passwords for HTTP Authentication in a property file, IvyDE allow you 
to use the secure storage capability of Eclipse and your OS to store them. See 
the new "Security" panel in the global preferences of IvyDE.
+IvyDE can now manage credentials stored in a secured store. Rather than 
putting passwords for HTTP Authentication in a property file, IvyDE allows you 
to use the secure storage capability of Eclipse and your OS to store them. See 
the new "Security" panel in the global preferences of IvyDE.
 
-Compatibility:
+=== Compatibility:
 
 IvyDE now requires Java 7 and Eclipse 4.3 aka Eclipse Kepler as minimum.
 
-A more detailed release notes can be read there:
+A more detailed release notes can be read at:
 http://ant.apache.org/ivy/ivyde/history/latest-milestone/release-notes.html
 
-Download the 2.3.0 release at:
+Download the release at:
 http://ant.apache.org/ivy/ivyde/download.cgi
 
 Or use directly the Apache IvyDE's updatesite:
 http://www.apache.org/dist/ant/ivyde/updatesite
 
-Issues should be reported to:
+Issues should be reported at:
 https://issues.apache.org/jira/browse/IVYDE
 
 More information can be found on the Apache IvyDE website:
 http://ant.apache.org/ivy/ivyde/
-
-
-== [[what]]What is Apache IvyDE?
-
-Apache IvyDE is the Eclipse plugin which integrates Apache Ivy's dependency 
management into Eclipse(TM).
 
-Apache IvyDE lets you manage your dependencies declared in an ivy.xml in your 
Java Eclipse projects, or any other kind of project which needs dependency 
management. Apache IvyDE will contribute to the classpath of your Java project 
or you can make it retrieve your dependencies directly into your project. Last 
but not least Apache IvyDE offer editors of ivy.xml and ivysettings.xml files 
with completion. Get some preview here: 
http://ant.apache.org/ivy/ivy

svn commit: r27422 - in /dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806132023-RELEASE: ./ features/ plugins/

[jaikiran]

Author: jaikiran
Date: Wed Jun 13 15:02:57 2018
New Revision: 27422

Log:
Prepare IvyDE 2.3.0-rc1 release for voting

Added:
dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806132023-RELEASE/
dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806132023-RELEASE/artifacts.xml 
  (with props)
dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806132023-RELEASE/content.xml   
(with props)
dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806132023-RELEASE/features/

dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806132023-RELEASE/features/org.apache.ivyde.eclipse.resolvevisualizer.feature_2.3.0.rc1-201806132023-RELEASE.jar
   (with props)

dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806132023-RELEASE/features/org.apache.ivyde.eclipse.resolvevisualizer.feature_2.3.0.rc1-201806132023-RELEASE.jar.asc

dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806132023-RELEASE/features/org.apache.ivyde.eclipse.resolvevisualizer.feature_2.3.0.rc1-201806132023-RELEASE.jar.md5

dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806132023-RELEASE/features/org.apache.ivyde.eclipse.resolvevisualizer.feature_2.3.0.rc1-201806132023-RELEASE.jar.sha

dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806132023-RELEASE/features/org.apache.ivyde.feature_2.3.0.rc1-201806132023-RELEASE.jar
   (with props)

dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806132023-RELEASE/features/org.apache.ivyde.feature_2.3.0.rc1-201806132023-RELEASE.jar.asc

dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806132023-RELEASE/features/org.apache.ivyde.feature_2.3.0.rc1-201806132023-RELEASE.jar.md5

dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806132023-RELEASE/features/org.apache.ivyde.feature_2.3.0.rc1-201806132023-RELEASE.jar.sha
dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806132023-RELEASE/plugins/

dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806132023-RELEASE/plugins/org.apache.ivyde.eclipse.resolvevisualizer_2.3.0.rc1-201806132023-RELEASE.jar
   (with props)

dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806132023-RELEASE/plugins/org.apache.ivyde.eclipse.resolvevisualizer_2.3.0.rc1-201806132023-RELEASE.jar.asc

dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806132023-RELEASE/plugins/org.apache.ivyde.eclipse.resolvevisualizer_2.3.0.rc1-201806132023-RELEASE.jar.md5

dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806132023-RELEASE/plugins/org.apache.ivyde.eclipse.resolvevisualizer_2.3.0.rc1-201806132023-RELEASE.jar.sha

dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806132023-RELEASE/plugins/org.apache.ivyde.eclipse_2.3.0.rc1-201806132023-RELEASE.jar
   (with props)

dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806132023-RELEASE/plugins/org.apache.ivyde.eclipse_2.3.0.rc1-201806132023-RELEASE.jar.asc

dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806132023-RELEASE/plugins/org.apache.ivyde.eclipse_2.3.0.rc1-201806132023-RELEASE.jar.md5

dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806132023-RELEASE/plugins/org.apache.ivyde.eclipse_2.3.0.rc1-201806132023-RELEASE.jar.sha

Added: 
dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806132023-RELEASE/artifacts.xml
==
--- dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806132023-RELEASE/artifacts.xml 
(added)
+++ dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806132023-RELEASE/artifacts.xml 
Wed Jun 13 15:02:57 2018
@@ -0,0 +1,60 @@
+
+  
+
+
+  http://ant.apache.org/ivy/ivyde/updatesite/p2-mirrors--xml.cgi?path=ivyde-2.3.0.rc1-201806132023-RELEASE"/>
+  
+
+
+
+  
+  
+
+  
+
+
+
+  
+
+
+  
+
+
+
+  
+
+
+  
+
+
+
+
+  
+
+
+  
+
+
+
+
+  
+
+  
+
\ No newline at end of file

Propchange: 
dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806132023-RELEASE/artifacts.xml
--
svn:eol-style = native

Added: dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806132023-RELEASE/content.xml
==
--- dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806132023-RELEASE/content.xml 
(added)
+++ dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806132023-RELEASE/content.xml 
Wed Jun 13 15:02:57 2018
@@ -0,0 +1,341 @@
+
+
+
+
+  
+
+
+  
+  
+
+
+  
+  
+
+  
+
+
+
+
+
+
+
+
+  
+  
+
+
+
+  
+  
+(org.eclipse.update.install.features=true)
+  
+  
+
+  
+  
+  
+
+  
+true
+  
+
+  
+  
+
+  %license
+
+  
+  
+Copyright © 2018 The Apache Software Fo

svn commit: r27428 - /dev/ant/ivyde/2.3.0-rc1/

[jaikiran]

Author: jaikiran
Date: Wed Jun 13 15:19:53 2018
New Revision: 27428

Log:
Prepare voting for 2.3.0-rc1 of IvyDE

Added:
dev/ant/ivyde/2.3.0-rc1/
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806132023-RELEASE.tar.gz  
 (with props)

dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806132023-RELEASE.tar.gz.asc

dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806132023-RELEASE.tar.gz.md5

dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806132023-RELEASE.tar.gz.sha
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806132023-RELEASE.zip   
(with props)
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806132023-RELEASE.zip.asc
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806132023-RELEASE.zip.md5
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806132023-RELEASE.zip.sha

dev/ant/ivyde/2.3.0-rc1/apache-ivyde-sources-2.3.0.rc1-201806132023-RELEASE.tar.gz
   (with props)

dev/ant/ivyde/2.3.0-rc1/apache-ivyde-sources-2.3.0.rc1-201806132023-RELEASE.tar.gz.asc

dev/ant/ivyde/2.3.0-rc1/apache-ivyde-sources-2.3.0.rc1-201806132023-RELEASE.tar.gz.md5

dev/ant/ivyde/2.3.0-rc1/apache-ivyde-sources-2.3.0.rc1-201806132023-RELEASE.tar.gz.sha

dev/ant/ivyde/2.3.0-rc1/apache-ivyde-sources-2.3.0.rc1-201806132023-RELEASE.zip 
  (with props)

dev/ant/ivyde/2.3.0-rc1/apache-ivyde-sources-2.3.0.rc1-201806132023-RELEASE.zip.asc

dev/ant/ivyde/2.3.0-rc1/apache-ivyde-sources-2.3.0.rc1-201806132023-RELEASE.zip.md5

dev/ant/ivyde/2.3.0-rc1/apache-ivyde-sources-2.3.0.rc1-201806132023-RELEASE.zip.sha
dev/ant/ivyde/2.3.0-rc1/version.properties   (with props)

Added: 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806132023-RELEASE.tar.gz
==
Binary file - no diff available.

Propchange: 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806132023-RELEASE.tar.gz
--
svn:mime-type = application/x-gzip

Added: 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806132023-RELEASE.tar.gz.asc
==
--- 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806132023-RELEASE.tar.gz.asc 
(added)
+++ 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806132023-RELEASE.tar.gz.asc 
Wed Jun 13 15:19:53 2018
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCAAdFiEEjacMAN968bDS+dx03bzBJwop0IEFAlshMDgACgkQ3bzBJwop
+0IGCsg//d+DizCU+qk3kCnJPfZWHYx25OFM6HHrt58MSZZIv/JDBlAj1jPpY1luM
+WaFFCPYRPt150hT5hPdsxb6jh2q/qm+5RecmcAIDHsVnNNkv0RDI7SxIPW8XbBrV
+HKvHULKP9B7BzpZtrjK5uZFwkHEeEwSUQsDlhqAHLOzIXKtDOJ3JAR2LsbwQhENZ
+zYBQG7IVNa+k0iFb20WkmgWFY0l4VGDSmUHMy+YS7DpZH9jLTkTAmSjBZq/ud/2n
+YvdotmfPaoun/8o254gUaJ7tWu9HA+npNDgvp4v4H87AhKdikPzLwtNgimTliFfz
+tPw4I1sPVHFsPYcKYknclP9l4FXr9KzsAc+ypPmw73jl7pPJMbXN5vAx5RMzj9B/
++XkAbDLoej8Jx4tzOjGX0PJYFJ5tPqUQ7IPzeEtyiDb2TO6hTOUmkx0bJ2A+gh4k
+Em9WnTRInNb6v8i7bIcvHzO/7FONMfheJbUA2MV/b8wCSjKp2Q4++kVJ/OF1HLem
+mjPKzdKaK8DajXa4/am7ePkdUS7Og8hIqFs39QToKsWIqVoYZNmTjJiVMQlfW2y4
+TzJ/Eg+vtTynaMnjUxQiU6bMKNT/TDJAU7GzVOulakxmgwJgnwP66QhCmMYk63Bk
+NRk1/qbNHRxn8ucjTTRZLg0QTrg0wL6e1GvIgQJoBi7Cw0du+c8=
+=9Z5S
+-END PGP SIGNATURE-

Added: 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806132023-RELEASE.tar.gz.md5
==
--- 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806132023-RELEASE.tar.gz.md5 
(added)
+++ 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806132023-RELEASE.tar.gz.md5 
Wed Jun 13 15:19:53 2018
@@ -0,0 +1 @@
+96397b5fda19cb150906151a61e157ac 
*apache-ivyde-2.3.0.rc1-201806132023-RELEASE.tar.gz

Added: 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806132023-RELEASE.tar.gz.sha
==
--- 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806132023-RELEASE.tar.gz.sha 
(added)
+++ 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806132023-RELEASE.tar.gz.sha 
Wed Jun 13 15:19:53 2018
@@ -0,0 +1 @@
+9812b0778b623e348b5856be82d839d9ef056e78 
*apache-ivyde-2.3.0.rc1-201806132023-RELEASE.tar.gz

Added: dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806132023-RELEASE.zip
==
Binary file - no diff available.

Propchange: 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806132023-RELEASE.zip
--
svn:mime-type = application/octet-stream

Added: 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806132023-RELEASE.zip.asc
==
--- dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806132023-RELEASE.zip.asc 
(added)
+++ dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806132023-RELEASE.zip.asc 
Wed Jun 13 15:19:53 2018
@@ -0,0

[1/2] ant-ivyde git commit: Release 2.3.0-rc1

[jaikiran]

Repository: ant-ivyde
Updated Branches:
  refs/heads/master 89a3ebcc7 -> 93f9adc3b
Updated Tags:  refs/tags/2.3.0-rc1 [created] 668fe6bf9


Release 2.3.0-rc1


Project: http://git-wip-us.apache.org/repos/asf/ant-ivyde/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivyde/commit/41679849
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivyde/tree/41679849
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivyde/diff/41679849

Branch: refs/heads/master
Commit: 41679849a4069bf1b9076f8d7594d367e82b9705
Parents: 89a3ebc
Author: Jaikiran Pai 
Authored: Wed Jun 13 20:25:26 2018 +0530
Committer: Jaikiran Pai 
Committed: Wed Jun 13 20:25:26 2018 +0530

--
 build.properties | 2 +-
 doc/src/dev/release.adoc | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/41679849/build.properties
--
diff --git a/build.properties b/build.properties
index 30179f5..d573f80 100644
--- a/build.properties
+++ b/build.properties
@@ -17,7 +17,7 @@
 #   * under the License.
 #   ***
 
-version.qualifier=beta1
+version.qualifier=rc1
 
 # For deeper debugging of the build system, set it to true
 eclipse.consoleLog=false

http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/41679849/doc/src/dev/release.adoc
--
diff --git a/doc/src/dev/release.adoc b/doc/src/dev/release.adoc
index f3802c5..4b29d75 100644
--- a/doc/src/dev/release.adoc
+++ b/doc/src/dev/release.adoc
@@ -62,10 +62,11 @@ And sign the artifacts:
 ./signArtifacts.sh
 
 
-Then it is time to tag the release as soon as you are happy with your 
artifacts:
+Then it is time to commit the changes and tag the release as soon as you are 
happy with your artifacts:
 
 [source]
 
+git commit -m "Release $VERSION" ./
 git tag $VERSION -m "Tag IvyDE release $VERSION"
 
 

[2/2] ant-ivyde git commit: Update release instruction

[jaikiran]

Update release instruction


Project: http://git-wip-us.apache.org/repos/asf/ant-ivyde/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivyde/commit/93f9adc3
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivyde/tree/93f9adc3
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivyde/diff/93f9adc3

Branch: refs/heads/master
Commit: 93f9adc3b75322e32d8f8b15d907874fe03e75e2
Parents: 4167984
Author: Jaikiran Pai 
Authored: Wed Jun 13 20:48:34 2018 +0530
Committer: Jaikiran Pai 
Committed: Wed Jun 13 20:48:34 2018 +0530

--
 doc/src/dev/updatesite.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/93f9adc3/doc/src/dev/updatesite.adoc
--
diff --git a/doc/src/dev/updatesite.adoc b/doc/src/dev/updatesite.adoc
index e6c773e..d1c5005 100644
--- a/doc/src/dev/updatesite.adoc
+++ b/doc/src/dev/updatesite.adoc
@@ -33,7 +33,7 @@ Checkout that SVN repo and `cd` to the `trunk` directory. We 
will build the p2 r
 The zip distribution needs to be unpacked into the updatesite directory:
 [source]
 
-ant build-ivyde-p2-repo 
-Divyde.zip=./path/to/org.apache.ivyde.feature-${VERSION}.zip
+ant build-ivyde-p2-repo -Divyde.zip=./path/to/apache-ivyde-${VERSION}.zip
 
 
 Now the binary files need to be signed.

svn commit: r27444 - /dev/ant/ivyde/2.3.0-rc1/

[jaikiran]

Author: jaikiran
Date: Thu Jun 14 08:13:29 2018
New Revision: 27444

Log:
Replace md5 and sha checksum files with sha256 and sha512

Added:

dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806132023-RELEASE.tar.gz.sha256

dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806132023-RELEASE.tar.gz.sha512

dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806132023-RELEASE.zip.sha256

dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806132023-RELEASE.zip.sha512

dev/ant/ivyde/2.3.0-rc1/apache-ivyde-sources-2.3.0.rc1-201806132023-RELEASE.tar.gz.sha256

dev/ant/ivyde/2.3.0-rc1/apache-ivyde-sources-2.3.0.rc1-201806132023-RELEASE.tar.gz.sha512

dev/ant/ivyde/2.3.0-rc1/apache-ivyde-sources-2.3.0.rc1-201806132023-RELEASE.zip.sha256

dev/ant/ivyde/2.3.0-rc1/apache-ivyde-sources-2.3.0.rc1-201806132023-RELEASE.zip.sha512
Removed:

dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806132023-RELEASE.tar.gz.md5

dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806132023-RELEASE.tar.gz.sha
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806132023-RELEASE.zip.md5
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806132023-RELEASE.zip.sha

dev/ant/ivyde/2.3.0-rc1/apache-ivyde-sources-2.3.0.rc1-201806132023-RELEASE.tar.gz.md5

dev/ant/ivyde/2.3.0-rc1/apache-ivyde-sources-2.3.0.rc1-201806132023-RELEASE.tar.gz.sha

dev/ant/ivyde/2.3.0-rc1/apache-ivyde-sources-2.3.0.rc1-201806132023-RELEASE.zip.md5

dev/ant/ivyde/2.3.0-rc1/apache-ivyde-sources-2.3.0.rc1-201806132023-RELEASE.zip.sha

Added: 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806132023-RELEASE.tar.gz.sha256
==
--- 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806132023-RELEASE.tar.gz.sha256
 (added)
+++ 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806132023-RELEASE.tar.gz.sha256
 Thu Jun 14 08:13:29 2018
@@ -0,0 +1 @@
+f1b866605a908c619be47480fbb47dd025ac8528331514349833bbb569e1ee87

Added: 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806132023-RELEASE.tar.gz.sha512
==
--- 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806132023-RELEASE.tar.gz.sha512
 (added)
+++ 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806132023-RELEASE.tar.gz.sha512
 Thu Jun 14 08:13:29 2018
@@ -0,0 +1 @@
+6bc0c4c71333de31dbe1284eb3eb15f30b50f181f1b3d0736c63b1b0d60ed627eebb72522093cb83c245113f466d11f13c635560d0656020aa44051245c3213f

Added: 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806132023-RELEASE.zip.sha256
==
--- 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806132023-RELEASE.zip.sha256 
(added)
+++ 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806132023-RELEASE.zip.sha256 
Thu Jun 14 08:13:29 2018
@@ -0,0 +1 @@
+e3c9066339113dd62b4e7e8b71895fcc921a27105559d4fb58527d78a1cb6e96

Added: 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806132023-RELEASE.zip.sha512
==
--- 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806132023-RELEASE.zip.sha512 
(added)
+++ 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806132023-RELEASE.zip.sha512 
Thu Jun 14 08:13:29 2018
@@ -0,0 +1 @@
+c6ec7c64a34377d24e0e4e0b1fc5035c5784b9be456036dee0ec2665e0a7a3061ce8fe1d475166039bd424aae7308fae682c62c85bbca7db2d78c3d9f9b767da

Added: 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-sources-2.3.0.rc1-201806132023-RELEASE.tar.gz.sha256
==
--- 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-sources-2.3.0.rc1-201806132023-RELEASE.tar.gz.sha256
 (added)
+++ 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-sources-2.3.0.rc1-201806132023-RELEASE.tar.gz.sha256
 Thu Jun 14 08:13:29 2018
@@ -0,0 +1 @@
+44b9daf0ac00903142f0bdc3c7daf098e520dd86bb8a7a7ec31ab94c2b38ccca

Added: 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-sources-2.3.0.rc1-201806132023-RELEASE.tar.gz.sha512
==
--- 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-sources-2.3.0.rc1-201806132023-RELEASE.tar.gz.sha512
 (added)
+++ 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-sources-2.3.0.rc1-201806132023-RELEASE.tar.gz.sha512
 Thu Jun 14 08:13:29 2018
@@ -0,0 +1 @@
+c7ecdf5b4a9c8adcff51b781449c168daf7c869853bb96d94a3733cc8376e8a0895334613801395bd315a2f671bf26a815c74bb454ac529aac2bfbf3aafd10e1

Added: 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-sources-2.3.0.rc1-201806132023-RELEASE.zip.sha256
==
--- 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-sources-2.3.0.rc1-201806132023-RELEASE.zip.sha256
 (added)
+++ 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-sources-2.3.0.rc1-201806132023-RELEASE.zip.sha256
 Thu Jun 14 08:13:29 2018
@@ -0,0 +1

ant-ivyde git commit: Replace MD5 and SHA1 checksum files with SHA-256 and SHA-512

[jaikiran]

Repository: ant-ivyde
Updated Branches:
  refs/heads/master 93f9adc3b -> 7613862f1


Replace MD5 and SHA1 checksum files with SHA-256 and SHA-512


Project: http://git-wip-us.apache.org/repos/asf/ant-ivyde/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivyde/commit/7613862f
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivyde/tree/7613862f
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivyde/diff/7613862f

Branch: refs/heads/master
Commit: 7613862f190f5439276a459f409ea4555ba6913d
Parents: 93f9adc
Author: Jaikiran Pai 
Authored: Thu Jun 14 13:45:41 2018 +0530
Committer: Jaikiran Pai 
Committed: Thu Jun 14 13:45:41 2018 +0530

--
 build.xml | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/7613862f/build.xml
--
diff --git a/build.xml b/build.xml
index db903ab..3dc31de 100644
--- a/build.xml
+++ b/build.xml
@@ -461,13 +461,13 @@ You have to specify the Ivy to install with one of the 
following property:
  -->
 
 
-
+
 
 
 
 
 
-
+
 
 
 
@@ -476,30 +476,30 @@ You have to specify the Ivy to install with one of the 
following property:
 
 
 
-
+
 
 
 
 
 
-
+
 
-
+
 
 
-
-
+
+
 
 
 
 
 
-
+
 
-
+
 
 
-
+
 
 
 

svn commit: r27445 - /dev/ant/ivyde/2.3.0-rc1/version.properties

[jaikiran]

Author: jaikiran
Date: Thu Jun 14 08:20:31 2018
New Revision: 27445

Log:
This file isn't needed in the released distribution

Removed:
dev/ant/ivyde/2.3.0-rc1/version.properties

svn commit: r1833573 - in /ant/site/ivy/production/history/latest-milestone: ./ configuration/ configuration/caches/ configuration/macrodef/ configuration/namespace/ dev/ images/ ivyfile/ js/ osgi/ re

[jaikiran]

Author: jaikiran
Date: Fri Jun 15 04:39:29 2018
New Revision: 1833573

URL: http://svn.apache.org/viewvc?rev=1833573&view=rev
Log:
Fix the "latest-milestone" documetation for Ivy site


[This commit notification would consist of 163 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

svn commit: r1833574 - /ant/site/ivy/build.xml

[jaikiran]

Author: jaikiran
Date: Fri Jun 15 04:47:05 2018
New Revision: 1833574

URL: http://svn.apache.org/viewvc?rev=1833574&view=rev
Log:
Allow "install-doc" to install the documentation (optionally) into a different 
target directory

Modified:
ant/site/ivy/build.xml

Modified: ant/site/ivy/build.xml
URL: 
http://svn.apache.org/viewvc/ant/site/ivy/build.xml?rev=1833574&r1=1833573&r2=1833574&view=diff
==
--- ant/site/ivy/build.xml (original)
+++ ant/site/ivy/build.xml Fri Jun 15 04:47:05 2018
@@ -98,8 +98,9 @@
 
 
 
-
-
+
+
+
 
 
 

svn commit: r27506 - /dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806132023-RELEASE/

[jaikiran]

Author: jaikiran
Date: Sat Jun 16 14:02:32 2018
New Revision: 27506

Log:
Remove rejected release

Removed:
dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806132023-RELEASE/

svn commit: r27507 - /dev/ant/ivyde/2.3.0-rc1/

[jaikiran]

Author: jaikiran
Date: Sat Jun 16 14:03:24 2018
New Revision: 27507

Log:
Remove rejected release

Removed:
dev/ant/ivyde/2.3.0-rc1/

[ant-ivyde] Git Push Summary

[jaikiran]

Repository: ant-ivyde
Updated Tags:  refs/tags/2.3.0-rc1 [deleted] 668fe6bf9

svn commit: r1833638 - /ant/ivy/updatesite/trunk/build.xml

[jaikiran]

Author: jaikiran
Date: Sat Jun 16 14:16:27 2018
New Revision: 1833638

URL: http://svn.apache.org/viewvc?rev=1833638&view=rev
Log:
Don't generate MD5 checksums and instead generate SHA-256 and SHA-512

Modified:
ant/ivy/updatesite/trunk/build.xml

Modified: ant/ivy/updatesite/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/ant/ivy/updatesite/trunk/build.xml?rev=1833638&r1=1833637&r2=1833638&view=diff
==
--- ant/ivy/updatesite/trunk/build.xml (original)
+++ ant/ivy/updatesite/trunk/build.xml Sat Jun 16 14:16:27 2018
@@ -184,13 +184,13 @@ ${ASL2-header}
 
 
 
-
+
 
 
 
 
 
-
+
 
 
 
@@ -341,13 +341,13 @@ ${ASL2-header}
 
 
 
-
+
 
 
 
 
 
-
+
 
 
 
@@ -361,30 +361,30 @@ ${ASL2-header}
 -->
 
 
-
+
 
 
 
 
 
-
+
 
-
+
 
 
-
-
+
+
 
 
 
 
 
-
+
 
-
+
 
 
-
+
 
 
 

ant-ivyde git commit: Include NOTICE and LICENSE files in the resolvevisualizer feature

[jaikiran]

Repository: ant-ivyde
Updated Branches:
  refs/heads/master 5a26e00f1 -> 98a25fc91


Include NOTICE and LICENSE files in the resolvevisualizer feature


Project: http://git-wip-us.apache.org/repos/asf/ant-ivyde/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivyde/commit/98a25fc9
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivyde/tree/98a25fc9
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivyde/diff/98a25fc9

Branch: refs/heads/master
Commit: 98a25fc91fdc086d99cb8dd77702716fde2b3039
Parents: 5a26e00
Author: Jaikiran Pai 
Authored: Sun Jun 17 09:37:08 2018 +0530
Committer: Jaikiran Pai 
Committed: Sun Jun 17 09:37:08 2018 +0530

--
 .../build.properties| 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/98a25fc9/org.apache.ivyde.eclipse.resolvevisualizer.feature/build.properties
--
diff --git 
a/org.apache.ivyde.eclipse.resolvevisualizer.feature/build.properties 
b/org.apache.ivyde.eclipse.resolvevisualizer.feature/build.properties
index a747157..7921eaa 100644
--- a/org.apache.ivyde.eclipse.resolvevisualizer.feature/build.properties
+++ b/org.apache.ivyde.eclipse.resolvevisualizer.feature/build.properties
@@ -17,7 +17,10 @@
 #   * under the License.
 #   ***
 bin.includes = feature.xml,\
-   feature.properties
+   feature.properties,\
+   LICENSE,\
+   NOTICE
+
 src.includes = .project,\
build.properties,\
feature.properties,\

ant git commit: Add my signing keys

[jaikiran]

Repository: ant
Updated Branches:
  refs/heads/1.9.x 9a9647c8b -> c55d57c42


Add my signing keys


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/c55d57c4
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/c55d57c4
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/c55d57c4

Branch: refs/heads/1.9.x
Commit: c55d57c42c1cb1bb8a7178fcea704c7c874e0156
Parents: 9a9647c
Author: Jaikiran Pai 
Authored: Sun Jun 17 09:41:45 2018 +0530
Committer: Jaikiran Pai 
Committed: Sun Jun 17 09:41:45 2018 +0530

--
 KEYS | 59 +++
 1 file changed, 59 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/c55d57c4/KEYS
--
diff --git a/KEYS b/KEYS
index fb21736..a8f3b89 100644
--- a/KEYS
+++ b/KEYS
@@ -1495,3 +1495,62 @@ 
G3GJoHIALPVs33ykG7MKFFqpbJHHc95hcOzs8eVh2/jD53CXILjbhKEGGbejFlx+
 RHkiOuu1l6jXCeh/J1R6YidjsDjKWlRkHifMmw==
 =j+uw
 -END PGP PUBLIC KEY BLOCK-
+pub   rsa4096 2018-06-13 [SC] [expires: 2022-06-13]
+  8DA70C00DF7AF1B0D2F9DC74DDBCC1270A29D081
+uid   [ultimate] jaikiran@apache 
+sig 3DDBCC1270A29D081 2018-06-13  jaikiran@apache 
+sub   rsa4096 2018-06-13 [E] [expires: 2022-06-13]
+sig  DDBCC1270A29D081 2018-06-13  jaikiran@apache 
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+
+mQINBFsgsskBEACy8rzosITgdGsfQijFhWkRo/iyXv7LdSD5FezMu6C4UosENKlP
+85y0XBsE3Z7K50uxVizyjXTetK+EIS684c6pU1t0vbWyvJzSgHeqf0GEaqiUNWTo
+9Jk6jAaeYeNu+6/TVUCYrb+zmQqmJPZq5W4FvTnpRed/t4zBPLlFPe2+QNaNRE03
+JqCrnmih0hrxVcM5jyynXSozuS50DcMuiOCZL3zPBW6mDGaXH6+yUfFVrReuCB//
+D0u0sCSiV5TvhSh2+8lLUG5tuvOKfg2SlRFtF9JQIPsm/qV/fK2muW2mc+Ti0n+k
+3gzxtr4eC5YvShJCe0DoxR9q/CItx6vRg8h+G4HhL1P5N+Tj4N0zfcUs/2vaJbm3
+LrjK8o+coNa8dgiIN6AbdcS8szIRYUG2MJzUI1mggYw/i4YcnNhrKTPZtdbKRfmK
+AIq1d1eEt/rJ97ypTzeYO6jq6Jkmnb3rWzmx9XA9Mo4J8X7587E6zkiD3FoFrSaM
+o20q+byMuXC8kKIEiDOa7UFQUh1ku8RDAmjXlWwqw3+RtrRt0TXoHRNWRoShiBee
+TjkQ3ZW7FlSk1hs80qeVCcSJ6lf1texmZzonAJCyibEWdzvceGvs2/PenetsnP/5
+nDlJuEs4jhoYuU57HjXfcSSOqmLAFAym7pL0Yd+KNhvxjBF/SoJ1wgoLBQARAQAB
+tCVqYWlraXJhbkBhcGFjaGUgPGphaWtpcmFuQGFwYWNoZS5vcmc+iQJUBBMBCAA+
+FiEEjacMAN968bDS+dx03bzBJwop0IEFAlsgsskCGwMFCQeGH4AFCwkIBwIGFQoJ
+CAsCBBYCAwECHgECF4AACgkQ3bzBJwop0IECdA/+OTyhXffGztoNrvIYF9tamNCV
+T5dzzY9qOos6pHShgX6O3xic33UMt3O6ec6RSILEmc1IJlthmxVTsu0XJ57+eDYJ
+zzA1JYD1RkLcS6+aqmopfoPdpzOftshQ8yEXPKQl69IhKn0B6yQc98d3EHYQtun0
+t9fwQA3LGoMWH7RIsFycMKi6+Z6TOaLdkpNs9ipuIGkouNdqdVTIgQGBmHvQwgO6
+r6mYSiApE7lQ8+s/7J1hJuA3GzV9gQ8DK9g0hr1E1EmbG9enxn2XT2V4H4hXFJfr
+CEYjMTsa6EYEOnA4BqwMmBHx2LOClydhPOJbc3/09XzAUdwUsxbVgByZ1kUvfo76
+eLYC2/YXtyVluLyYwUyGLXlBWMChHM+AIVyTg7HNVvFF99cwdpBgpDjUFx60+ftY
+fFxXJJbu4lq1ULKOyqqoDwaebp2C/gZ3bIVmqZ2GFUCoeIuBh94pRhENK/O0FBua
+Bp3mYaGrpDVMglu1p9lxz0H2uuAUgXu1hRM7GWbq5TWUKcD/zb6NH7DO82cRqCJE
+n//p3Wqc4tAZt8B3bQGQWRGQ3iOU8RxmDvyneuVyqWR0dIkb7ByjtD7SKRkSomNq
+6o6mw+Kuj+6M0dwhZdmPB8O/RiLLJDKL83DZN6P+yEBIsc73qS3QPnCuvENPfxgm
+0JI2d63wnXbW4bkOzN+5Ag0EWyCyyQEQAKwUmKfCA62QiJwk+NAHfVmrXgk6lpSC
+ExCjC8RvWgt7R6upLfOdKFLRLNR4aybLF9/XcW5rsmfF7eTonsA3vnIsfLHtLazL
+MoUVgj9jZjlvjcxWX5F8pXL7BH0x443GZvZNIdIt9SCOPJUKVZfc9VCcvw564E8q
+IbFJBSCPVMTibPNLZw5N3Iv5WfdqRsIg70jURqiSOMDnn1VpXid0X5iU0ruqlqi5
+giud8p/1isBtVQyiGmpDs2UoPaUFUxmIWJ/srxNx5fAyOKd2WsWALn0nJuaIlL0A
+25zTzLU3WpTkHFvimWH8ogonXtjLQfh70GJ4NjBhIAjtQFVptGGNLleDVTD1AIMN
+imc7GxFGf4EUAgK8fcDrF6WtLtK3QnA3hSXHMgzpLo1NmirWy1cfvwNwnse7KCX/
++axld1slAgnNZl3UADj2irI/j1bl2ntsriE0Q1N+n729G3zlkg0Twj/IjPxo1PW6
+5A7b62PDhGtajdwfPKM43dHgJ8ZYGL/zaKt4elhsVQPBZcUOl6YV9fg9c5jqAJhU
+IbhfuyQW+/EGYnR4/2G3wbIKiYPsuBiQw4nN1IdGTpfoW9DymYpIcrLJZkt2/4qe
+SxXxHa1/qF7CjOoNV5Vza17+mLRS2NN7/Hz+lcyIuYf7dzLJ/U/DIyK4QBcCqm72
+9ISsCgK2Hbd3ABEBAAGJAjwEGAEIACYWIQSNpwwA33rxsNL53HTdvMEnCinQgQUC
+WyCyyQIbDAUJB4YfgAAKCRDdvMEnCinQgTfiD/9C1jk1iTIeh8KZDQOEkwVXEjIw
+Dng0fxSq3ICNjyH58JGysFbOTIyVoqaDPcIWM5/IAbF4DpuXZvaVu0nufpVKupIi
+Lq2jRwXC14G+gC/BEsB7KVqzoon/zhKlHEo6sVtumckFVtjXG9SfAqf3q8rSGwaS
+WzSOrg7gyKznizOPBWs1kkJ9h+Paj48uP9EUYIr+s8BVlXSRr4TDF++/drPhZ2sz
+uphS8fr1fedfaBD++xMmpGEGE2KenTk3oBjvBHusHsSdoqw8IaZ0Bhc4vajuqHWE
+4nacvBGaIp5so5kA+MFf69l/G/+cWj+PP7xuGPy9TkqKXi8CNdQE1iEa6UKhBYaA
+xpRzaugIDDhSnu9WcoaGixpGVCYojRW1+OloumEhl7WkiWfq3db0q/+uoSJEPqmQ
+M7+i7Z6/vPI/3Nu+NvFsDygQA97FF1Tl1ISxfWgd3YplQjuTLLyawxWT7fHKCrx4
+TjUM+JPy+xGDd/RP/YksSfM9dsV/EEruN02qBDoUADpuhw0vkKC/OAxuLkWDm0h9
+S3vUQ3zGioMMYLvbNe8rAP3VC5fJ7H80spv/z05JfO7c4hutU8D0ykQ0ZNuWdL79
+2HEociC3YdVmiCxmvsabeeOeMVU0WgFSHjPRqfPnoSu4ytA0Szn2dsZ64VV01BHm
+3rZzxBZRMmQz3CJrMw==
+=vLW3
+-END PGP PUBLIC KEY BLOCK-

[1/2] ant git commit: Add my signing keys

[jaikiran]

Repository: ant
Updated Branches:
  refs/heads/master 1ab929e74 -> a196ab352


Add my signing keys


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/c55d57c4
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/c55d57c4
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/c55d57c4

Branch: refs/heads/master
Commit: c55d57c42c1cb1bb8a7178fcea704c7c874e0156
Parents: 9a9647c
Author: Jaikiran Pai 
Authored: Sun Jun 17 09:41:45 2018 +0530
Committer: Jaikiran Pai 
Committed: Sun Jun 17 09:41:45 2018 +0530

--
 KEYS | 59 +++
 1 file changed, 59 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/c55d57c4/KEYS
--
diff --git a/KEYS b/KEYS
index fb21736..a8f3b89 100644
--- a/KEYS
+++ b/KEYS
@@ -1495,3 +1495,62 @@ 
G3GJoHIALPVs33ykG7MKFFqpbJHHc95hcOzs8eVh2/jD53CXILjbhKEGGbejFlx+
 RHkiOuu1l6jXCeh/J1R6YidjsDjKWlRkHifMmw==
 =j+uw
 -END PGP PUBLIC KEY BLOCK-
+pub   rsa4096 2018-06-13 [SC] [expires: 2022-06-13]
+  8DA70C00DF7AF1B0D2F9DC74DDBCC1270A29D081
+uid   [ultimate] jaikiran@apache 
+sig 3DDBCC1270A29D081 2018-06-13  jaikiran@apache 
+sub   rsa4096 2018-06-13 [E] [expires: 2022-06-13]
+sig  DDBCC1270A29D081 2018-06-13  jaikiran@apache 
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+
+mQINBFsgsskBEACy8rzosITgdGsfQijFhWkRo/iyXv7LdSD5FezMu6C4UosENKlP
+85y0XBsE3Z7K50uxVizyjXTetK+EIS684c6pU1t0vbWyvJzSgHeqf0GEaqiUNWTo
+9Jk6jAaeYeNu+6/TVUCYrb+zmQqmJPZq5W4FvTnpRed/t4zBPLlFPe2+QNaNRE03
+JqCrnmih0hrxVcM5jyynXSozuS50DcMuiOCZL3zPBW6mDGaXH6+yUfFVrReuCB//
+D0u0sCSiV5TvhSh2+8lLUG5tuvOKfg2SlRFtF9JQIPsm/qV/fK2muW2mc+Ti0n+k
+3gzxtr4eC5YvShJCe0DoxR9q/CItx6vRg8h+G4HhL1P5N+Tj4N0zfcUs/2vaJbm3
+LrjK8o+coNa8dgiIN6AbdcS8szIRYUG2MJzUI1mggYw/i4YcnNhrKTPZtdbKRfmK
+AIq1d1eEt/rJ97ypTzeYO6jq6Jkmnb3rWzmx9XA9Mo4J8X7587E6zkiD3FoFrSaM
+o20q+byMuXC8kKIEiDOa7UFQUh1ku8RDAmjXlWwqw3+RtrRt0TXoHRNWRoShiBee
+TjkQ3ZW7FlSk1hs80qeVCcSJ6lf1texmZzonAJCyibEWdzvceGvs2/PenetsnP/5
+nDlJuEs4jhoYuU57HjXfcSSOqmLAFAym7pL0Yd+KNhvxjBF/SoJ1wgoLBQARAQAB
+tCVqYWlraXJhbkBhcGFjaGUgPGphaWtpcmFuQGFwYWNoZS5vcmc+iQJUBBMBCAA+
+FiEEjacMAN968bDS+dx03bzBJwop0IEFAlsgsskCGwMFCQeGH4AFCwkIBwIGFQoJ
+CAsCBBYCAwECHgECF4AACgkQ3bzBJwop0IECdA/+OTyhXffGztoNrvIYF9tamNCV
+T5dzzY9qOos6pHShgX6O3xic33UMt3O6ec6RSILEmc1IJlthmxVTsu0XJ57+eDYJ
+zzA1JYD1RkLcS6+aqmopfoPdpzOftshQ8yEXPKQl69IhKn0B6yQc98d3EHYQtun0
+t9fwQA3LGoMWH7RIsFycMKi6+Z6TOaLdkpNs9ipuIGkouNdqdVTIgQGBmHvQwgO6
+r6mYSiApE7lQ8+s/7J1hJuA3GzV9gQ8DK9g0hr1E1EmbG9enxn2XT2V4H4hXFJfr
+CEYjMTsa6EYEOnA4BqwMmBHx2LOClydhPOJbc3/09XzAUdwUsxbVgByZ1kUvfo76
+eLYC2/YXtyVluLyYwUyGLXlBWMChHM+AIVyTg7HNVvFF99cwdpBgpDjUFx60+ftY
+fFxXJJbu4lq1ULKOyqqoDwaebp2C/gZ3bIVmqZ2GFUCoeIuBh94pRhENK/O0FBua
+Bp3mYaGrpDVMglu1p9lxz0H2uuAUgXu1hRM7GWbq5TWUKcD/zb6NH7DO82cRqCJE
+n//p3Wqc4tAZt8B3bQGQWRGQ3iOU8RxmDvyneuVyqWR0dIkb7ByjtD7SKRkSomNq
+6o6mw+Kuj+6M0dwhZdmPB8O/RiLLJDKL83DZN6P+yEBIsc73qS3QPnCuvENPfxgm
+0JI2d63wnXbW4bkOzN+5Ag0EWyCyyQEQAKwUmKfCA62QiJwk+NAHfVmrXgk6lpSC
+ExCjC8RvWgt7R6upLfOdKFLRLNR4aybLF9/XcW5rsmfF7eTonsA3vnIsfLHtLazL
+MoUVgj9jZjlvjcxWX5F8pXL7BH0x443GZvZNIdIt9SCOPJUKVZfc9VCcvw564E8q
+IbFJBSCPVMTibPNLZw5N3Iv5WfdqRsIg70jURqiSOMDnn1VpXid0X5iU0ruqlqi5
+giud8p/1isBtVQyiGmpDs2UoPaUFUxmIWJ/srxNx5fAyOKd2WsWALn0nJuaIlL0A
+25zTzLU3WpTkHFvimWH8ogonXtjLQfh70GJ4NjBhIAjtQFVptGGNLleDVTD1AIMN
+imc7GxFGf4EUAgK8fcDrF6WtLtK3QnA3hSXHMgzpLo1NmirWy1cfvwNwnse7KCX/
++axld1slAgnNZl3UADj2irI/j1bl2ntsriE0Q1N+n729G3zlkg0Twj/IjPxo1PW6
+5A7b62PDhGtajdwfPKM43dHgJ8ZYGL/zaKt4elhsVQPBZcUOl6YV9fg9c5jqAJhU
+IbhfuyQW+/EGYnR4/2G3wbIKiYPsuBiQw4nN1IdGTpfoW9DymYpIcrLJZkt2/4qe
+SxXxHa1/qF7CjOoNV5Vza17+mLRS2NN7/Hz+lcyIuYf7dzLJ/U/DIyK4QBcCqm72
+9ISsCgK2Hbd3ABEBAAGJAjwEGAEIACYWIQSNpwwA33rxsNL53HTdvMEnCinQgQUC
+WyCyyQIbDAUJB4YfgAAKCRDdvMEnCinQgTfiD/9C1jk1iTIeh8KZDQOEkwVXEjIw
+Dng0fxSq3ICNjyH58JGysFbOTIyVoqaDPcIWM5/IAbF4DpuXZvaVu0nufpVKupIi
+Lq2jRwXC14G+gC/BEsB7KVqzoon/zhKlHEo6sVtumckFVtjXG9SfAqf3q8rSGwaS
+WzSOrg7gyKznizOPBWs1kkJ9h+Paj48uP9EUYIr+s8BVlXSRr4TDF++/drPhZ2sz
+uphS8fr1fedfaBD++xMmpGEGE2KenTk3oBjvBHusHsSdoqw8IaZ0Bhc4vajuqHWE
+4nacvBGaIp5so5kA+MFf69l/G/+cWj+PP7xuGPy9TkqKXi8CNdQE1iEa6UKhBYaA
+xpRzaugIDDhSnu9WcoaGixpGVCYojRW1+OloumEhl7WkiWfq3db0q/+uoSJEPqmQ
+M7+i7Z6/vPI/3Nu+NvFsDygQA97FF1Tl1ISxfWgd3YplQjuTLLyawxWT7fHKCrx4
+TjUM+JPy+xGDd/RP/YksSfM9dsV/EEruN02qBDoUADpuhw0vkKC/OAxuLkWDm0h9
+S3vUQ3zGioMMYLvbNe8rAP3VC5fJ7H80spv/z05JfO7c4hutU8D0ykQ0ZNuWdL79
+2HEociC3YdVmiCxmvsabeeOeMVU0WgFSHjPRqfPnoSu4ytA0Szn2dsZ64VV01BHm
+3rZzxBZRMmQz3CJrMw==
+=vLW3
+-END PGP PUBLIC KEY BLOCK-

[2/2] ant git commit: Merge branch '1.9.x'

[jaikiran]

Merge branch '1.9.x'


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/a196ab35
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/a196ab35
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/a196ab35

Branch: refs/heads/master
Commit: a196ab3523f4c7337e506c5e63610d6ffda823e4
Parents: 1ab929e c55d57c
Author: Jaikiran Pai 
Authored: Sun Jun 17 09:42:22 2018 +0530
Committer: Jaikiran Pai 
Committed: Sun Jun 17 09:42:22 2018 +0530

--
 KEYS | 59 +++
 1 file changed, 59 insertions(+)
--

ant-ivyde git commit: Package the sources within a version specific root directory

[jaikiran]

Repository: ant-ivyde
Updated Branches:
  refs/heads/master 98a25fc91 -> 86f0ba22c


Package the sources within a version specific root directory


Project: http://git-wip-us.apache.org/repos/asf/ant-ivyde/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivyde/commit/86f0ba22
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivyde/tree/86f0ba22
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivyde/diff/86f0ba22

Branch: refs/heads/master
Commit: 86f0ba22c9ee62c142f6a102128beb2d14849f25
Parents: 98a25fc
Author: Jaikiran Pai 
Authored: Sun Jun 17 09:51:23 2018 +0530
Committer: Jaikiran Pai 
Committed: Sun Jun 17 09:51:23 2018 +0530

--
 build.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/86f0ba22/build.xml
--
diff --git a/build.xml b/build.xml
index 3dc31de..67fe16a 100644
--- a/build.xml
+++ b/build.xml
@@ -305,17 +305,18 @@ ivyde.build.version=${build.version}
 
 
 
-
-
+
 
 
 
+
 
 
 
 
 
 
+
 
 
 

svn commit: r27514 - /dev/ant/ivyde/2.3.0-rc1/

[jaikiran]

Author: jaikiran
Date: Sun Jun 17 05:02:57 2018
New Revision: 27514

Log:
Prepare for voting 2.3.0-rc1 of IvyDE

Added:
dev/ant/ivyde/2.3.0-rc1/
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806171016-RELEASE.tar.gz  
 (with props)

dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806171016-RELEASE.tar.gz.asc

dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806171016-RELEASE.tar.gz.sha256

dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806171016-RELEASE.tar.gz.sha512
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806171016-RELEASE.zip   
(with props)
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806171016-RELEASE.zip.asc

dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806171016-RELEASE.zip.sha256

dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806171016-RELEASE.zip.sha512

dev/ant/ivyde/2.3.0-rc1/apache-ivyde-sources-2.3.0.rc1-201806171016-RELEASE.tar.gz
   (with props)

dev/ant/ivyde/2.3.0-rc1/apache-ivyde-sources-2.3.0.rc1-201806171016-RELEASE.tar.gz.asc

dev/ant/ivyde/2.3.0-rc1/apache-ivyde-sources-2.3.0.rc1-201806171016-RELEASE.tar.gz.sha256

dev/ant/ivyde/2.3.0-rc1/apache-ivyde-sources-2.3.0.rc1-201806171016-RELEASE.tar.gz.sha512

dev/ant/ivyde/2.3.0-rc1/apache-ivyde-sources-2.3.0.rc1-201806171016-RELEASE.zip 
  (with props)

dev/ant/ivyde/2.3.0-rc1/apache-ivyde-sources-2.3.0.rc1-201806171016-RELEASE.zip.asc

dev/ant/ivyde/2.3.0-rc1/apache-ivyde-sources-2.3.0.rc1-201806171016-RELEASE.zip.sha256

dev/ant/ivyde/2.3.0-rc1/apache-ivyde-sources-2.3.0.rc1-201806171016-RELEASE.zip.sha512

Added: 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806171016-RELEASE.tar.gz
==
Binary file - no diff available.

Propchange: 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806171016-RELEASE.tar.gz
--
svn:mime-type = application/x-gzip

Added: 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806171016-RELEASE.tar.gz.asc
==
--- 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806171016-RELEASE.tar.gz.asc 
(added)
+++ 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806171016-RELEASE.tar.gz.asc 
Sun Jun 17 05:02:57 2018
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCAAdFiEEjacMAN968bDS+dx03bzBJwop0IEFAlsl5/cACgkQ3bzBJwop
+0IFavhAAsZt9wHWM2LYQWkEVxPtIkV/2emthrfD+W3ryO++6a1R3pSyVuY2+jkWG
+mQYxyBDprSNKcIIdnys9TZwvWrmhJqAqIufoYAAM5C9QHEdNV64/IubrgjqTgzY/
+I6pPkEwOWLFochyUnpqiq/aawjJKuI6pKHZ4L61iXjiE928qly5Y5Fxi//cow/7f
+7PXBnVtxDpSG9iUQHooUFHLs8RV6g/wzTH4nGVe4OIX7eDbo1RtKDvvCy7Pz33Ei
+Md9z5l2i0n5OX0usnJvASmPGxoGe1zEjlawVZT5PS6cOs5oTSbzQOaPZQw5xMCxg
+ts803klJs4ZO3EBywtHXd8IKPUHLou/+mrdQidM8vzJj1kEw93Gdn3DxvV9JShn0
+un4skeCw3Lu+IyuYuGANTr/nTVuA/QDP4GCqBqJVv7XJoZA+7HzemIhjgvjOhZ/4
+M4uZeXdfPvPT3kXRbaHOuTLltIBNDNG8G1zbFzDw2+bekaqR6arRuTlry0BUZ10C
+foXS6M1Ymupjk6Kl6O/En4yhUMCaNC1a0o6GDn6iVVtH4fJXsl698qbu5cWwlBJK
+5XDY/i3mmanvM26JYTvBGVmKOYTTpncfjWesyiurPPLYZYx1CMnGthMNEZX23kWm
+G0MD+jZYYgl2WvgfUDvAQakHOwgJx9UtGfwM/2OiCfSQDzKb0Xs=
+=lkBP
+-END PGP SIGNATURE-

Added: 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806171016-RELEASE.tar.gz.sha256
==
--- 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806171016-RELEASE.tar.gz.sha256
 (added)
+++ 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806171016-RELEASE.tar.gz.sha256
 Sun Jun 17 05:02:57 2018
@@ -0,0 +1 @@
+e784a07e88acea520f2f08fa8c5bdedd688109f1c9f1179be34fafecc666f771

Added: 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806171016-RELEASE.tar.gz.sha512
==
--- 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806171016-RELEASE.tar.gz.sha512
 (added)
+++ 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806171016-RELEASE.tar.gz.sha512
 Sun Jun 17 05:02:57 2018
@@ -0,0 +1 @@
+30951c9258ed7c1e26e5714b4c5392f511c4e2e9444bae2c0a9808056d6aa377549094d1f6bdfa8bc23d912c228d2d6862da2ed9e996af03df873c30910481e4

Added: dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806171016-RELEASE.zip
==
Binary file - no diff available.

Propchange: 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806171016-RELEASE.zip
--
svn:mime-type = application/octet-stream

Added: 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806171016-RELEASE.zip.asc
==
--- dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806171016-RELEASE.zip.asc 
(added)
+++ dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806171016-RELEASE.zip.asc 
Sun Jun 17 05:02:57 2018
@@ -0,0 +1,16

svn commit: r27515 - in /dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806171016-RELEASE: ./ features/ plugins/

[jaikiran]

Author: jaikiran
Date: Sun Jun 17 05:05:29 2018
New Revision: 27515

Log:
Prepare updatesite for voting of IvyDE 2.3.0-rc1 release

Added:
dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806171016-RELEASE/
dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806171016-RELEASE/artifacts.xml 
  (with props)
dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806171016-RELEASE/content.xml   
(with props)
dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806171016-RELEASE/features/

dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806171016-RELEASE/features/org.apache.ivyde.eclipse.resolvevisualizer.feature_2.3.0.rc1-201806171016-RELEASE.jar
   (with props)

dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806171016-RELEASE/features/org.apache.ivyde.eclipse.resolvevisualizer.feature_2.3.0.rc1-201806171016-RELEASE.jar.asc

dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806171016-RELEASE/features/org.apache.ivyde.eclipse.resolvevisualizer.feature_2.3.0.rc1-201806171016-RELEASE.jar.sha256

dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806171016-RELEASE/features/org.apache.ivyde.eclipse.resolvevisualizer.feature_2.3.0.rc1-201806171016-RELEASE.jar.sha512

dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806171016-RELEASE/features/org.apache.ivyde.feature_2.3.0.rc1-201806171016-RELEASE.jar
   (with props)

dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806171016-RELEASE/features/org.apache.ivyde.feature_2.3.0.rc1-201806171016-RELEASE.jar.asc

dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806171016-RELEASE/features/org.apache.ivyde.feature_2.3.0.rc1-201806171016-RELEASE.jar.sha256

dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806171016-RELEASE/features/org.apache.ivyde.feature_2.3.0.rc1-201806171016-RELEASE.jar.sha512
dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806171016-RELEASE/plugins/

dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806171016-RELEASE/plugins/org.apache.ivyde.eclipse.resolvevisualizer_2.3.0.rc1-201806171016-RELEASE.jar
   (with props)

dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806171016-RELEASE/plugins/org.apache.ivyde.eclipse.resolvevisualizer_2.3.0.rc1-201806171016-RELEASE.jar.asc

dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806171016-RELEASE/plugins/org.apache.ivyde.eclipse.resolvevisualizer_2.3.0.rc1-201806171016-RELEASE.jar.sha256

dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806171016-RELEASE/plugins/org.apache.ivyde.eclipse.resolvevisualizer_2.3.0.rc1-201806171016-RELEASE.jar.sha512

dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806171016-RELEASE/plugins/org.apache.ivyde.eclipse_2.3.0.rc1-201806171016-RELEASE.jar
   (with props)

dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806171016-RELEASE/plugins/org.apache.ivyde.eclipse_2.3.0.rc1-201806171016-RELEASE.jar.asc

dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806171016-RELEASE/plugins/org.apache.ivyde.eclipse_2.3.0.rc1-201806171016-RELEASE.jar.sha256

dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806171016-RELEASE/plugins/org.apache.ivyde.eclipse_2.3.0.rc1-201806171016-RELEASE.jar.sha512

Added: 
dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806171016-RELEASE/artifacts.xml
==
--- dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806171016-RELEASE/artifacts.xml 
(added)
+++ dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806171016-RELEASE/artifacts.xml 
Sun Jun 17 05:05:29 2018
@@ -0,0 +1,60 @@
+
+  
+
+
+  http://ant.apache.org/ivy/ivyde/updatesite/p2-mirrors--xml.cgi?path=ivyde-2.3.0.rc1-201806171016-RELEASE"/>
+  
+
+
+
+  
+  
+
+  
+
+
+
+
+  
+
+
+  
+
+
+
+  
+
+
+  
+
+
+
+  
+
+
+  
+
+
+
+
+  
+
+  
+
\ No newline at end of file

Propchange: 
dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806171016-RELEASE/artifacts.xml
--
svn:eol-style = native

Added: dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806171016-RELEASE/content.xml
==
--- dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806171016-RELEASE/content.xml 
(added)
+++ dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806171016-RELEASE/content.xml 
Sun Jun 17 05:05:29 2018
@@ -0,0 +1,341 @@
+
+
+
+
+  
+
+
+  
+  
+
+
+  
+  
+
+  
+  
+
+
+  
+  
+
+
+
+
+
+
+
+
+
+
+
+  
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  
+  
+
+  
+  
+  
+
+  
+

[ant-ivyde] Git Push Summary

[jaikiran]

Repository: ant-ivyde
Updated Tags:  refs/tags/2.3.0-rc1 [created] 3dfca41f3

ant-ivyde git commit: IVYDE-388 Fix initialization of PreferenceConstants

[jaikiran]

Repository: ant-ivyde
Updated Branches:
  refs/heads/master c92ed1b92 -> 8bf3f490a


IVYDE-388 Fix initialization of PreferenceConstants


Project: http://git-wip-us.apache.org/repos/asf/ant-ivyde/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivyde/commit/8bf3f490
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivyde/tree/8bf3f490
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivyde/diff/8bf3f490

Branch: refs/heads/master
Commit: 8bf3f490a66cb4e7ea318f35e6832f31446df886
Parents: c92ed1b
Author: Jaikiran Pai 
Authored: Tue Jun 19 06:21:23 2018 +0530
Committer: Jaikiran Pai 
Committed: Tue Jun 19 06:21:23 2018 +0530

--
 .../ivyde/internal/eclipse/ui/preferences/PreferenceConstants.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/8bf3f490/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/preferences/PreferenceConstants.java
--
diff --git 
a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/preferences/PreferenceConstants.java
 
b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/preferences/PreferenceConstants.java
index aa5503d..7f9b7c1 100644
--- 
a/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/preferences/PreferenceConstants.java
+++ 
b/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/internal/eclipse/ui/preferences/PreferenceConstants.java
@@ -135,7 +135,7 @@ public final class PreferenceConstants {
 
 static {
 for (Field field : PreferenceConstants.class.getFields()) {
-if (Modifier.isStatic(field.getModifiers())) {
+if (Modifier.isStatic(field.getModifiers()) && 
String.class.equals(field.getType())) {
 try {
 ALL.add((String) field.get(null));
 } catch (IllegalArgumentException | IllegalAccessException e) {

ant-antlibs-antunit git commit: Fix assertTrue example in docs

[jaikiran]

Repository: ant-antlibs-antunit
Updated Branches:
  refs/heads/master a08cb64ca -> 592579abf


Fix assertTrue example in docs


Project: http://git-wip-us.apache.org/repos/asf/ant-antlibs-antunit/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/ant-antlibs-antunit/commit/592579ab
Tree: http://git-wip-us.apache.org/repos/asf/ant-antlibs-antunit/tree/592579ab
Diff: http://git-wip-us.apache.org/repos/asf/ant-antlibs-antunit/diff/592579ab

Branch: refs/heads/master
Commit: 592579abfdc3088e7203653424e5a40a55548e58
Parents: a08cb64
Author: Jaikiran Pai 
Authored: Wed Jun 20 09:03:10 2018 +0530
Committer: Jaikiran Pai 
Committed: Wed Jun 20 09:03:10 2018 +0530

--
 docs/assert.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant-antlibs-antunit/blob/592579ab/docs/assert.html
--
diff --git a/docs/assert.html b/docs/assert.html
index 3bd0c95..e6481d2 100644
--- a/docs/assert.html
+++ b/docs/assert.html
@@ -62,7 +62,7 @@
 <not>
   <equals arg1="${foo}" arg2="bar"/>
 </not>
-  </assertTrue message="foo is bar">
+  </assertTrue>
 
 
 

ant-ivyde git commit: Update release notes

[jaikiran]

Repository: ant-ivyde
Updated Branches:
  refs/heads/master 8bf3f490a -> 3581a61ec


Update release notes


Project: http://git-wip-us.apache.org/repos/asf/ant-ivyde/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivyde/commit/3581a61e
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivyde/tree/3581a61e
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivyde/diff/3581a61e

Branch: refs/heads/master
Commit: 3581a61ec159ede16005f36e58e5e258d32090fa
Parents: 8bf3f49
Author: Jaikiran Pai 
Authored: Mon Jun 25 10:07:17 2018 +0530
Committer: Jaikiran Pai 
Committed: Mon Jun 25 10:07:17 2018 +0530

--
 doc/src/release-notes.adoc | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/3581a61e/doc/src/release-notes.adoc
--
diff --git a/doc/src/release-notes.adoc b/doc/src/release-notes.adoc
index 7e12a7a..fe94f1a 100644
--- a/doc/src/release-notes.adoc
+++ b/doc/src/release-notes.adoc
@@ -67,6 +67,7 @@ List of changes since 
link:/ivy/ivyde/history/2.2.0.final/release-notes.html[Apa
 * FIX: Typo in IvyResolveJob (jira:IVYDE-362[]) (thanks to Nicolas Gavalda)
 * FIX: User-selected configurations not checked in the viewer 
(jira:IVYDE-378[]) (thanks to Carsten Pfeiffer)
 * FIX: Fix ClassCastException (jira:IVYDE-386[])
+* FIX: Fix the issue where the IvyDE preferences couldn't be saved 
(jira:IVYDE-388[])
 
 * NEW: add support for OSGi 'Bundle-Classpath' directive (Ivy 2.4.0-rc1 is 
required)
 * NEW: basic support for the workspace resolver to find OSGi bundles managed 
by Ivy in the workspace (Ivy 2.4.0-rc2 is required)

svn commit: r27705 - /dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806171016-RELEASE/

[jaikiran]

Author: jaikiran
Date: Mon Jun 25 04:55:10 2018
New Revision: 27705

Log:
Delete cancelled release

Removed:
dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806171016-RELEASE/

svn commit: r27706 - /dev/ant/ivyde/2.3.0-rc1/

[jaikiran]

Author: jaikiran
Date: Mon Jun 25 04:56:23 2018
New Revision: 27706

Log:
Remove cancelled ivyde release

Removed:
dev/ant/ivyde/2.3.0-rc1/

[ant-ivyde] Git Push Summary

[jaikiran]

Repository: ant-ivyde
Updated Tags:  refs/tags/2.3.0-rc1 [deleted] 3dfca41f3

svn commit: r27707 - in /dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806251008-RELEASE: ./ features/ plugins/

[jaikiran]

Author: jaikiran
Date: Mon Jun 25 05:20:45 2018
New Revision: 27707

Log:
Prepare for voting 2.3.0-rc1 release of IvyDE

Added:
dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806251008-RELEASE/
dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806251008-RELEASE/artifacts.xml 
  (with props)
dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806251008-RELEASE/content.xml   
(with props)
dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806251008-RELEASE/features/

dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806251008-RELEASE/features/org.apache.ivyde.eclipse.resolvevisualizer.feature_2.3.0.rc1-201806251008-RELEASE.jar
   (with props)

dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806251008-RELEASE/features/org.apache.ivyde.eclipse.resolvevisualizer.feature_2.3.0.rc1-201806251008-RELEASE.jar.asc

dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806251008-RELEASE/features/org.apache.ivyde.eclipse.resolvevisualizer.feature_2.3.0.rc1-201806251008-RELEASE.jar.sha256

dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806251008-RELEASE/features/org.apache.ivyde.eclipse.resolvevisualizer.feature_2.3.0.rc1-201806251008-RELEASE.jar.sha512

dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806251008-RELEASE/features/org.apache.ivyde.feature_2.3.0.rc1-201806251008-RELEASE.jar
   (with props)

dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806251008-RELEASE/features/org.apache.ivyde.feature_2.3.0.rc1-201806251008-RELEASE.jar.asc

dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806251008-RELEASE/features/org.apache.ivyde.feature_2.3.0.rc1-201806251008-RELEASE.jar.sha256

dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806251008-RELEASE/features/org.apache.ivyde.feature_2.3.0.rc1-201806251008-RELEASE.jar.sha512
dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806251008-RELEASE/plugins/

dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806251008-RELEASE/plugins/org.apache.ivyde.eclipse.resolvevisualizer_2.3.0.rc1-201806251008-RELEASE.jar
   (with props)

dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806251008-RELEASE/plugins/org.apache.ivyde.eclipse.resolvevisualizer_2.3.0.rc1-201806251008-RELEASE.jar.asc

dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806251008-RELEASE/plugins/org.apache.ivyde.eclipse.resolvevisualizer_2.3.0.rc1-201806251008-RELEASE.jar.sha256

dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806251008-RELEASE/plugins/org.apache.ivyde.eclipse.resolvevisualizer_2.3.0.rc1-201806251008-RELEASE.jar.sha512

dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806251008-RELEASE/plugins/org.apache.ivyde.eclipse_2.3.0.rc1-201806251008-RELEASE.jar
   (with props)

dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806251008-RELEASE/plugins/org.apache.ivyde.eclipse_2.3.0.rc1-201806251008-RELEASE.jar.asc

dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806251008-RELEASE/plugins/org.apache.ivyde.eclipse_2.3.0.rc1-201806251008-RELEASE.jar.sha256

dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806251008-RELEASE/plugins/org.apache.ivyde.eclipse_2.3.0.rc1-201806251008-RELEASE.jar.sha512

Added: 
dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806251008-RELEASE/artifacts.xml
==
--- dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806251008-RELEASE/artifacts.xml 
(added)
+++ dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806251008-RELEASE/artifacts.xml 
Mon Jun 25 05:20:45 2018
@@ -0,0 +1,60 @@
+
+  
+
+
+  http://ant.apache.org/ivy/ivyde/updatesite/p2-mirrors--xml.cgi?path=ivyde-2.3.0.rc1-201806251008-RELEASE"/>
+  
+
+
+
+  
+  
+
+  
+
+
+
+
+  
+
+
+  
+
+
+
+
+  
+
+
+  
+
+
+
+  
+
+
+  
+
+
+
+  
+
+  
+
\ No newline at end of file

Propchange: 
dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806251008-RELEASE/artifacts.xml
--
svn:eol-style = native

Added: dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806251008-RELEASE/content.xml
==
--- dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806251008-RELEASE/content.xml 
(added)
+++ dev/ant/ivyde/updatesite/ivyde-2.3.0.rc1-201806251008-RELEASE/content.xml 
Mon Jun 25 05:20:45 2018
@@ -0,0 +1,341 @@
+
+
+
+
+  
+
+
+  
+  
+
+
+  
+  
+
+  
+
+
+
+
+
+
+
+
+
+  
+  
+
+
+
+  
+  
+(org.eclipse.update.install.features=true)
+  
+  
+
+  
+  
+  
+
+  
+true
+  
+
+  
+  
+
+  %license
+
+  
+  
+Copyright © 2018 The Apache Software Fo

[ant-ivyde] Git Push Summary

[jaikiran]

Repository: ant-ivyde
Updated Tags:  refs/tags/2.3.0-rc1 [created] 90fe66276

svn commit: r27709 - /dev/ant/ivyde/2.3.0-rc1/

[jaikiran]

Author: jaikiran
Date: Mon Jun 25 05:28:22 2018
New Revision: 27709

Log:
Prepare for release of 2.3.0-rc1 of IvyDE

Added:
dev/ant/ivyde/2.3.0-rc1/
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806251008-RELEASE.tar.gz  
 (with props)

dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806251008-RELEASE.tar.gz.asc

dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806251008-RELEASE.tar.gz.sha256

dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806251008-RELEASE.tar.gz.sha512
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806251008-RELEASE.zip   
(with props)
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806251008-RELEASE.zip.asc

dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806251008-RELEASE.zip.sha256

dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806251008-RELEASE.zip.sha512

dev/ant/ivyde/2.3.0-rc1/apache-ivyde-sources-2.3.0.rc1-201806251008-RELEASE.tar.gz
   (with props)

dev/ant/ivyde/2.3.0-rc1/apache-ivyde-sources-2.3.0.rc1-201806251008-RELEASE.tar.gz.asc

dev/ant/ivyde/2.3.0-rc1/apache-ivyde-sources-2.3.0.rc1-201806251008-RELEASE.tar.gz.sha256

dev/ant/ivyde/2.3.0-rc1/apache-ivyde-sources-2.3.0.rc1-201806251008-RELEASE.tar.gz.sha512

dev/ant/ivyde/2.3.0-rc1/apache-ivyde-sources-2.3.0.rc1-201806251008-RELEASE.zip 
  (with props)

dev/ant/ivyde/2.3.0-rc1/apache-ivyde-sources-2.3.0.rc1-201806251008-RELEASE.zip.asc

dev/ant/ivyde/2.3.0-rc1/apache-ivyde-sources-2.3.0.rc1-201806251008-RELEASE.zip.sha256

dev/ant/ivyde/2.3.0-rc1/apache-ivyde-sources-2.3.0.rc1-201806251008-RELEASE.zip.sha512

Added: 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806251008-RELEASE.tar.gz
==
Binary file - no diff available.

Propchange: 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806251008-RELEASE.tar.gz
--
svn:mime-type = application/x-gzip

Added: 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806251008-RELEASE.tar.gz.asc
==
--- 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806251008-RELEASE.tar.gz.asc 
(added)
+++ 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806251008-RELEASE.tar.gz.asc 
Mon Jun 25 05:28:22 2018
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCAAdFiEEjacMAN968bDS+dx03bzBJwop0IEFAlswchcACgkQ3bzBJwop
+0IG6gRAAqROXxsogWibrNWMK8y+GBeEYchjGs7QgcVUSlSLvp3l/4xiD47xAgdCe
+Cr7ekgLw7Ox9/MMqeyP2VEN7I3wuYj93+LPpMnSjNPtb28Mnza3XTBh4lxnSo2qr
+1XcDdgI6+o4Ye1hcKIPVlEF6zohKpVns+3+4XQH/Z+V3l4q4J9SzOPZu4N5tjQIX
+G+y405ieSHRKHkqBVwMcUVahv/Qx5wqfMRhmL80YQg/8lOYjzCPjTvM70s5UHD/a
+etWfQzcR2MDez8QwTGtjEJYUGuLH9MSSyTzM1PtbV6AdXgZwuzxHtlBn+BRYxs06
+uZHLoiNovutJ7xVFLnzn1Uine5nhJ6B1ZIcIW48vooHu/wfBn+j0hFuExqG1IdMN
+2LiZqwZEW+gLqaMMVkHw3EBjs67RKtTgWI2vI63HDQblxMph0HJq20NggUHUhJKR
+Os7Evi57/ZkCwmNpfam0kH/GsaFANTP3M0tZ+HibopCJQqh5+F/a6jYRXUpXLyrg
+Xi52OWMsoaay2K/FhX2FwnzgYgE2hI3Fe0Uc0no8SS/oEcwHlogoGl0cM9Tmn0rV
+59qL9El4VP/iukGq9TCJHtbtdFCHlXVtoFDBmCEpiv0i84R+GZNlDoqhoa4P2AF6
+Ih0JtQXRIqTjV0eV0QDAMMJPZZSVpFlMZJb04MV7d4eRZe7hmEc=
+=Psaf
+-END PGP SIGNATURE-

Added: 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806251008-RELEASE.tar.gz.sha256
==
--- 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806251008-RELEASE.tar.gz.sha256
 (added)
+++ 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806251008-RELEASE.tar.gz.sha256
 Mon Jun 25 05:28:22 2018
@@ -0,0 +1 @@
+c775483c76b7015bd78459a9f838fc0c02e88e5ee0aff6aee9d36d9d2ae1842c

Added: 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806251008-RELEASE.tar.gz.sha512
==
--- 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806251008-RELEASE.tar.gz.sha512
 (added)
+++ 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806251008-RELEASE.tar.gz.sha512
 Mon Jun 25 05:28:22 2018
@@ -0,0 +1 @@
+33ecc7b06d43900c99eb0226154c2470d26d40edeee0d3f654e5dd46e0b2a5c7ceb98c7c3fe43cce2e69c84224a81400f582835a39da83667f6a34868e95f017

Added: dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806251008-RELEASE.zip
==
Binary file - no diff available.

Propchange: 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806251008-RELEASE.zip
--
svn:mime-type = application/octet-stream

Added: 
dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806251008-RELEASE.zip.asc
==
--- dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806251008-RELEASE.zip.asc 
(added)
+++ dev/ant/ivyde/2.3.0-rc1/apache-ivyde-2.3.0.rc1-201806251008-RELEASE.zip.asc 
Mon Jun 25 05:28:22 2018
@@ -0,0

ant-ivyde git commit: Update release instructions to make a mention of the git hash and svn revision of the releases

[jaikiran]

Repository: ant-ivyde
Updated Branches:
  refs/heads/master 3581a61ec -> 307e362ca


Update release instructions to make a mention of the git hash and svn revision 
of the releases


Project: http://git-wip-us.apache.org/repos/asf/ant-ivyde/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivyde/commit/307e362c
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivyde/tree/307e362c
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivyde/diff/307e362c

Branch: refs/heads/master
Commit: 307e362cae68f75e85eec4eb899f1a510baf34d7
Parents: 3581a61
Author: Jaikiran Pai 
Authored: Mon Jun 25 11:30:10 2018 +0530
Committer: Jaikiran Pai 
Committed: Mon Jun 25 11:30:10 2018 +0530

--
 doc/src/dev/release.adoc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant-ivyde/blob/307e362c/doc/src/dev/release.adoc
--
diff --git a/doc/src/dev/release.adoc b/doc/src/dev/release.adoc
index 9d287c9..254291f 100644
--- a/doc/src/dev/release.adoc
+++ b/doc/src/dev/release.adoc
@@ -96,11 +96,11 @@ Subject: [VOTE] IvyDE $VERSION Release
 
 I have built a release candidate for Apache IvyDE $VERSION
 
-The tag is here: 
https://git1-us-west.apache.org/repos/asf?p=ant-ivyde.git;a=commit;h=refs/tags/$VERSION
+The tag is here: 
https://git1-us-west.apache.org/repos/asf?p=ant-ivyde.git;a=commit;h=refs/tags/$VERSION
 with the sha1 ${githash-of-tag}
 
-You can download the distribution from this URL: 
https://dist.apache.org/repos/dist/dev/ant/ivyde/$VERSION
+You can download the distribution from this URL: 
https://dist.apache.org/repos/dist/dev/ant/ivyde/$VERSION at revision 
${svn-rev-of-the-commit}
 
-The Eclipse p2 repository is there: 
https://dist.apache.org/repos/dist/dev/ant/ivyde/updatesite/ivyde-$VERSION
+The Eclipse p2 repository is there: 
https://dist.apache.org/repos/dist/dev/ant/ivyde/updatesite/ivyde-$VERSION at 
revision ${svn-rev-of-the-commit}
 
 Do you vote for the release of these binaries?
 

svn commit: r1834574 - in /ant/site/ant/production/webtest/gettest: .htaccess helloworld.txt

[jaikiran]

Author: jaikiran
Date: Thu Jun 28 04:22:54 2018
New Revision: 1834574

URL: http://svn.apache.org/viewvc?rev=1834574&view=rev
Log:
bz-62499 Add a http to https redirect test for get task

Added:
ant/site/ant/production/webtest/gettest/helloworld.txt   (with props)
Modified:
ant/site/ant/production/webtest/gettest/.htaccess

Modified: ant/site/ant/production/webtest/gettest/.htaccess
URL: 
http://svn.apache.org/viewvc/ant/site/ant/production/webtest/gettest/.htaccess?rev=1834574&r1=1834573&r2=1834574&view=diff
==
--- ant/site/ant/production/webtest/gettest/.htaccess (original)
+++ ant/site/ant/production/webtest/gettest/.htaccess Thu Jun 28 04:22:54 2018
@@ -9,3 +9,4 @@ Redirect /webtest/gettest/redir5-1.txt /
 Redirect /webtest/gettest/redir5-2.txt /webtest/gettest/redir5-3.txt
 Redirect /webtest/gettest/redir5-3.txt /webtest/gettest/redir5-4.txt
 Redirect /webtest/gettest/redir5-4.txt /webtest/gettest/testredir5.txt
+Redirect temp /webtest/gettest/http-to-https.txt 
https://ant.apache.org/webtest/gettest/helloworld.txt

Added: ant/site/ant/production/webtest/gettest/helloworld.txt
URL: 
http://svn.apache.org/viewvc/ant/site/ant/production/webtest/gettest/helloworld.txt?rev=1834574&view=auto
==
--- ant/site/ant/production/webtest/gettest/helloworld.txt (added)
+++ ant/site/ant/production/webtest/gettest/helloworld.txt Thu Jun 28 04:22:54 
2018
@@ -0,0 +1 @@
+hello world

Propchange: ant/site/ant/production/webtest/gettest/helloworld.txt
--
svn:eol-style = native

ant git commit: bz-62499 Revert the change which caused regression in "get" task. Plus introduce a test case to reproduce the issue and verify the fix

[jaikiran]

Repository: ant
Updated Branches:
  refs/heads/1.9.x fa986a4d4 -> 9e3951403


bz-62499 Revert the change which caused regression in "get" task. Plus 
introduce a test case to reproduce the issue and verify the fix


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/9e395140
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/9e395140
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/9e395140

Branch: refs/heads/1.9.x
Commit: 9e395140343025ec7a5e738a28e364fbd749c0cc
Parents: fa986a4
Author: Jaikiran Pai 
Authored: Thu Jun 28 10:27:26 2018 +0530
Committer: Jaikiran Pai 
Committed: Thu Jun 28 10:27:26 2018 +0530

--
 src/main/org/apache/tools/ant/taskdefs/Get.java | 41 +++-
 src/tests/antunit/taskdefs/get-test.xml |  9 +
 2 files changed, 32 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/9e395140/src/main/org/apache/tools/ant/taskdefs/Get.java
--
diff --git a/src/main/org/apache/tools/ant/taskdefs/Get.java 
b/src/main/org/apache/tools/ant/taskdefs/Get.java
index 13f610c..1d4ba4f 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Get.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Get.java
@@ -669,29 +669,34 @@ public class Get extends Task {
 
 
 private boolean redirectionAllowed(final URL aSource, final URL aDest) 
{
-if (aSource.getProtocol().equals(aDest.getProtocol())
-&& (HTTP.equals(aSource.getProtocol()) || 
HTTPS.equals(aDest.getProtocol( {
-redirections++;
-if (redirections > REDIRECT_LIMIT) {
-final String message = "More than " + REDIRECT_LIMIT
-+ " times redirected, giving up";
-if (ignoreErrors) {
-log(message, logLevel);
-return false;
-}
+if (!(aSource.getProtocol().equals(aDest.getProtocol()) || (HTTP
+.equals(aSource.getProtocol()) && HTTPS.equals(aDest
+.getProtocol() {
+final String message = "Redirection detected from "
++ aSource.getProtocol() + " to " + aDest.getProtocol()
++ ". Protocol switch unsafe, not allowed.";
+if (ignoreErrors) {
+log(message, logLevel);
+return false;
+} else {
 throw new BuildException(message);
 }
-return true;
 }
 
-final String message = "Redirection detected from "
-+ aSource.getProtocol() + " to " + aDest.getProtocol()
-+ ". Protocol switch unsafe, not allowed.";
-if (ignoreErrors) {
-log(message, logLevel);
-return false;
+redirections++;
+if (redirections > REDIRECT_LIMIT) {
+final String message = "More than " + REDIRECT_LIMIT
++ " times redirected, giving up";
+if (ignoreErrors) {
+log(message, logLevel);
+return false;
+} else {
+throw new BuildException(message);
+}
 }
-throw new BuildException(message);
+
+
+return true;
 }
 
 private URLConnection openConnection(final URL aSource) throws 
IOException {

http://git-wip-us.apache.org/repos/asf/ant/blob/9e395140/src/tests/antunit/taskdefs/get-test.xml
--
diff --git a/src/tests/antunit/taskdefs/get-test.xml 
b/src/tests/antunit/taskdefs/get-test.xml
index a8ca6a9..b4543f5 100644
--- a/src/tests/antunit/taskdefs/get-test.xml
+++ b/src/tests/antunit/taskdefs/get-test.xml
@@ -122,4 +122,13 @@
 
   
   
+
+  
+
+
+
+  
+
+  
 

ant git commit: Update WHATSNEW for bz-62499

[jaikiran]

Repository: ant
Updated Branches:
  refs/heads/1.9.x 9e3951403 -> 3cbf031b8


Update WHATSNEW for bz-62499


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/3cbf031b
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/3cbf031b
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/3cbf031b

Branch: refs/heads/1.9.x
Commit: 3cbf031b851a280e34ff59260307ee49e077869d
Parents: 9e39514
Author: Jaikiran Pai 
Authored: Thu Jun 28 10:30:11 2018 +0530
Committer: Jaikiran Pai 
Committed: Thu Jun 28 10:30:11 2018 +0530

--
 WHATSNEW | 8 
 1 file changed, 8 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/3cbf031b/WHATSNEW
--
diff --git a/WHATSNEW b/WHATSNEW
index 1c2d0ca..527d0e2 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -1,6 +1,14 @@
 Changes from Ant 1.9.12 TO Ant 1.9.13
 =
 
+Fixed bugs:
+---
+
+ * Fixes a regression in the "get" task where redirects
+   from a HTTP resource to a HTTPS resource started throwing
+   an exception.
+   Bugzilla Report 62499
+
 Changes from Ant 1.9.11 TO Ant 1.9.12
 =
 

[4/4] ant git commit: Merge changes from 1.9.x branch

[jaikiran]

Merge changes from 1.9.x branch


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/19e263a7
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/19e263a7
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/19e263a7

Branch: refs/heads/master
Commit: 19e263a7ddc08610d10859374e7d7bd151f0c46e
Parents: aa1ad87 3cbf031
Author: Jaikiran Pai 
Authored: Thu Jun 28 10:35:25 2018 +0530
Committer: Jaikiran Pai 
Committed: Thu Jun 28 10:35:25 2018 +0530

--
 WHATSNEW|  8 
 manual/credits.html |  2 +-
 src/main/org/apache/tools/ant/taskdefs/Get.java | 41 +++-
 src/tests/antunit/taskdefs/get-test.xml |  9 +
 4 files changed, 41 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/19e263a7/WHATSNEW
--
diff --cc WHATSNEW
index ff97c14,527d0e2..b34197e
--- a/WHATSNEW
+++ b/WHATSNEW
@@@ -1,7 -1,15 +1,15 @@@
 -Changes from Ant 1.9.12 TO Ant 1.9.13
 +Changes from Ant 1.10.4 TO Ant 1.10.5
  =
  
+ Fixed bugs:
+ ---
+ 
+  * Fixes a regression in the "get" task where redirects
+from a HTTP resource to a HTTPS resource started throwing
+an exception.
+Bugzilla Report 62499
+ 
 -Changes from Ant 1.9.11 TO Ant 1.9.12
 +Changes from Ant 1.10.3 TO Ant 1.10.4
  =
  
  Changes that could break older environments:

http://git-wip-us.apache.org/repos/asf/ant/blob/19e263a7/manual/credits.html
--
diff --cc manual/credits.html
index 77327ac,03d8291..5c12b47
--- a/manual/credits.html
+++ b/manual/credits.html
@@@ -18,8 -18,7 +18,8 @@@
  
  
  
 +
- Apache Ant User Manual—Credits
+ Apache Ant User Manual - Credits
  
  
  

http://git-wip-us.apache.org/repos/asf/ant/blob/19e263a7/src/main/org/apache/tools/ant/taskdefs/Get.java
--

[3/4] ant git commit: Update WHATSNEW for bz-62499

[jaikiran]

Update WHATSNEW for bz-62499


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/3cbf031b
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/3cbf031b
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/3cbf031b

Branch: refs/heads/master
Commit: 3cbf031b851a280e34ff59260307ee49e077869d
Parents: 9e39514
Author: Jaikiran Pai 
Authored: Thu Jun 28 10:30:11 2018 +0530
Committer: Jaikiran Pai 
Committed: Thu Jun 28 10:30:11 2018 +0530

--
 WHATSNEW | 8 
 1 file changed, 8 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/3cbf031b/WHATSNEW
--
diff --git a/WHATSNEW b/WHATSNEW
index 1c2d0ca..527d0e2 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -1,6 +1,14 @@
 Changes from Ant 1.9.12 TO Ant 1.9.13
 =
 
+Fixed bugs:
+---
+
+ * Fixes a regression in the "get" task where redirects
+   from a HTTP resource to a HTTPS resource started throwing
+   an exception.
+   Bugzilla Report 62499
+
 Changes from Ant 1.9.11 TO Ant 1.9.12
 =
 

[2/4] ant git commit: bz-62499 Revert the change which caused regression in "get" task. Plus introduce a test case to reproduce the issue and verify the fix

[jaikiran]

bz-62499 Revert the change which caused regression in "get" task. Plus 
introduce a test case to reproduce the issue and verify the fix


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/9e395140
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/9e395140
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/9e395140

Branch: refs/heads/master
Commit: 9e395140343025ec7a5e738a28e364fbd749c0cc
Parents: fa986a4
Author: Jaikiran Pai 
Authored: Thu Jun 28 10:27:26 2018 +0530
Committer: Jaikiran Pai 
Committed: Thu Jun 28 10:27:26 2018 +0530

--
 src/main/org/apache/tools/ant/taskdefs/Get.java | 41 +++-
 src/tests/antunit/taskdefs/get-test.xml |  9 +
 2 files changed, 32 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/9e395140/src/main/org/apache/tools/ant/taskdefs/Get.java
--
diff --git a/src/main/org/apache/tools/ant/taskdefs/Get.java 
b/src/main/org/apache/tools/ant/taskdefs/Get.java
index 13f610c..1d4ba4f 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Get.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Get.java
@@ -669,29 +669,34 @@ public class Get extends Task {
 
 
 private boolean redirectionAllowed(final URL aSource, final URL aDest) 
{
-if (aSource.getProtocol().equals(aDest.getProtocol())
-&& (HTTP.equals(aSource.getProtocol()) || 
HTTPS.equals(aDest.getProtocol( {
-redirections++;
-if (redirections > REDIRECT_LIMIT) {
-final String message = "More than " + REDIRECT_LIMIT
-+ " times redirected, giving up";
-if (ignoreErrors) {
-log(message, logLevel);
-return false;
-}
+if (!(aSource.getProtocol().equals(aDest.getProtocol()) || (HTTP
+.equals(aSource.getProtocol()) && HTTPS.equals(aDest
+.getProtocol() {
+final String message = "Redirection detected from "
++ aSource.getProtocol() + " to " + aDest.getProtocol()
++ ". Protocol switch unsafe, not allowed.";
+if (ignoreErrors) {
+log(message, logLevel);
+return false;
+} else {
 throw new BuildException(message);
 }
-return true;
 }
 
-final String message = "Redirection detected from "
-+ aSource.getProtocol() + " to " + aDest.getProtocol()
-+ ". Protocol switch unsafe, not allowed.";
-if (ignoreErrors) {
-log(message, logLevel);
-return false;
+redirections++;
+if (redirections > REDIRECT_LIMIT) {
+final String message = "More than " + REDIRECT_LIMIT
++ " times redirected, giving up";
+if (ignoreErrors) {
+log(message, logLevel);
+return false;
+} else {
+throw new BuildException(message);
+}
 }
-throw new BuildException(message);
+
+
+return true;
 }
 
 private URLConnection openConnection(final URL aSource) throws 
IOException {

http://git-wip-us.apache.org/repos/asf/ant/blob/9e395140/src/tests/antunit/taskdefs/get-test.xml
--
diff --git a/src/tests/antunit/taskdefs/get-test.xml 
b/src/tests/antunit/taskdefs/get-test.xml
index a8ca6a9..b4543f5 100644
--- a/src/tests/antunit/taskdefs/get-test.xml
+++ b/src/tests/antunit/taskdefs/get-test.xml
@@ -122,4 +122,13 @@
 
   
   
+
+  
+
+
+
+  
+
+  
 

[1/4] ant git commit: No need to force Latin-1

[jaikiran]

Repository: ant
Updated Branches:
  refs/heads/master aa1ad8792 -> 19e263a7d


No need to force Latin-1

Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/fa986a4d
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/fa986a4d
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/fa986a4d

Branch: refs/heads/master
Commit: fa986a4d46d21076914876944bedfb3fe4d3d807
Parents: f015980
Author: Gintas Grigelionis 
Authored: Tue Jun 26 18:36:54 2018 +0200
Committer: Gintas Grigelionis 
Committed: Tue Jun 26 18:36:54 2018 +0200

--
 manual/credits.html | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/fa986a4d/manual/credits.html
--
diff --git a/manual/credits.html b/manual/credits.html
index d45c5bc..03d8291 100644
--- a/manual/credits.html
+++ b/manual/credits.html
@@ -18,7 +18,6 @@
 
 
 
-
 Apache Ant User Manual - Credits
 
 

ant git commit: Checking to see if our Jenkins setup has issues with HTTPS cert of apache.org for older Java runtime versions

[jaikiran]

Repository: ant
Updated Branches:
  refs/heads/1.9.x 3cbf031b8 -> b77c75d33


Checking to see if our Jenkins setup has issues with HTTPS cert of apache.org 
for older Java runtime versions


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/b77c75d3
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/b77c75d3
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/b77c75d3

Branch: refs/heads/1.9.x
Commit: b77c75d33d37e96fc9da25c535f65879cf66fef9
Parents: 3cbf031
Author: Jaikiran Pai 
Authored: Thu Jun 28 11:12:19 2018 +0530
Committer: Jaikiran Pai 
Committed: Thu Jun 28 11:12:19 2018 +0530

--
 src/tests/antunit/taskdefs/get-test.xml | 10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/b77c75d3/src/tests/antunit/taskdefs/get-test.xml
--
diff --git a/src/tests/antunit/taskdefs/get-test.xml 
b/src/tests/antunit/taskdefs/get-test.xml
index b4543f5..44d5af9 100644
--- a/src/tests/antunit/taskdefs/get-test.xml
+++ b/src/tests/antunit/taskdefs/get-test.xml
@@ -20,8 +20,12 @@
   
 
   http://ant.apache.org/webtest/gettest"; />
-
-  
+  
+  
+  
+
+
+
 
   
 
@@ -124,7 +128,7 @@
   
 
   
+from HTTP to HTTPS works without an error. See bugzilla-62499 for 
details" if="java.atleast.1_8">
 
 
 

ant git commit: Enhance the Java task to allow single file source program execution, a feature, introduced in Java 11

[jaikiran]

Repository: ant
Updated Branches:
  refs/heads/master ca9942f43 -> c05c56df6


Enhance the Java task to allow single file source program execution, a feature, 
introduced in Java 11


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/c05c56df
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/c05c56df
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/c05c56df

Branch: refs/heads/master
Commit: c05c56df68b9f89e0e3de9bc3f6097837fe0f9e3
Parents: ca9942f
Author: Jaikiran Pai 
Authored: Wed Jul 4 17:19:11 2018 +0530
Committer: Jaikiran Pai 
Committed: Wed Jul 4 17:20:38 2018 +0530

--
 WHATSNEW|  5 ++
 manual/Tasks/java.html  |  9 ++-
 src/etc/testcases/taskdefs/java.xml | 64 +++
 .../org/apache/tools/ant/taskdefs/Java.java | 50 +---
 .../apache/tools/ant/types/CommandlineJava.java | 20 -
 .../org/apache/tools/ant/taskdefs/JavaTest.java | 82 +++-
 6 files changed, 212 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/c05c56df/WHATSNEW
--
diff --git a/WHATSNEW b/WHATSNEW
index 5233a0a..1523a8c 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -15,6 +15,11 @@ Fixed bugs:
root.
Bugzilla Report 62502
 
+Other changes:
+--
+ * Java task now accepts a "sourcefile" attribute to allow single file
+   source program execution, a feature that is introduced in Java 11.
+
 Changes from Ant 1.10.3 TO Ant 1.10.4
 =
 

http://git-wip-us.apache.org/repos/asf/ant/blob/c05c56df/manual/Tasks/java.html
--
diff --git a/manual/Tasks/java.html b/manual/Tasks/java.html
index f644988..849f594 100644
--- a/manual/Tasks/java.html
+++ b/manual/Tasks/java.html
@@ -50,7 +50,7 @@ because it tries to read from the standard input.
   
 classname
 the Java class to execute.
-Exactly one of the three
+Exactly one of the four
   
   
 jar
@@ -66,6 +66,13 @@ because it tries to read from the standard input.
   selected. since Ant 1.9.7
   
   
+sourcefile
+The location of a ".java" file or a file containing 
shebang with Java source code.
+  Set this attribute to run Java single file source programs, a feature 
introduced in Java 11.
+  fork must be set to true if this option is selected.
+  since Ant 1.10.5
+  
+  
 args
 the arguments for the class that is executed. Deprecated, 
use
   nested <arg> elements instead.

http://git-wip-us.apache.org/repos/asf/ant/blob/c05c56df/src/etc/testcases/taskdefs/java.xml
--
diff --git a/src/etc/testcases/taskdefs/java.xml 
b/src/etc/testcases/taskdefs/java.xml
index 022a10f..720959a 100644
--- a/src/etc/testcases/taskdefs/java.xml
+++ b/src/etc/testcases/taskdefs/java.xml
@@ -417,4 +417,68 @@ redirect.err="${redirect.err}" should be 
empty
 
 
 
+
+
+
+
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.io.BufferedWriter;
+public class A {
+public static void main(String[] args) throws Exception {
+final String outFile = args[0];
+try(BufferedWriter bw = 
Files.newBufferedWriter(Paths.get(outFile));) {
+bw.write("Hello world!");
+}
+}
+}
+
+
+
+
+
+
+
+
+Java source-file 
execution did not yield the expected
+result
+
+
+
+
+
+
+
+public class ThrowsException {
+public static void main(String[] args) throws Exception {
+throw new RuntimeException("Wasn't expected to be run");
+}
+}
+
+
+
+
+
+Execution of java task, for sourcefile, was expected to fail 
since fork wasn't set
+
+
+
+
+Execution of java task, for sourcefile, was expected to fail 
since classname attribute was set
+
+
+
+
+Execution of java task, for sourcefile, was expected to fail 
since jar attribute was set
+
+
+
+
+Execution of java task, for sourcefile, was expected to fail 
since module attribute was set
+
+
 

http://git-wip-us.apache.org/repos/asf/ant/blob/c05c56df/src/main/org/apache/tools/ant/taskdefs/Java.java
--

svn commit: r1835057 - in /ant/site/ivy: production/faq.html sources/faq.html

[jaikiran]

Author: jaikiran
Date: Wed Jul  4 13:24:14 2018
New Revision: 1835057

URL: http://svn.apache.org/viewvc?rev=1835057&view=rev
Log:
Update the FAQ to include a section about Ivy's (optional) Apache HTTP client 
usage

Modified:
ant/site/ivy/production/faq.html
ant/site/ivy/sources/faq.html

Modified: ant/site/ivy/production/faq.html
URL: 
http://svn.apache.org/viewvc/ant/site/ivy/production/faq.html?rev=1835057&r1=1835056&r2=1835057&view=diff
==
--- ant/site/ivy/production/faq.html (original)
+++ ant/site/ivy/production/faq.html Wed Jul  4 13:24:14 2018
@@ -194,7 +194,7 @@ Or for authenticated proxy:
 Or for authenticated proxy:
 set ANT_OPTS=-Dhttp.proxyHost=myproxyhost -Dhttp.proxyPort=8080 
-Dhttp.proxyUser=myproxyusername -Dhttp.proxyPassword=myproxypassword 
-Dhttps.proxyHost=myproxyhost -Dhttps.proxyPort=8080
 For http authentication, fill in the appropriate data at configuration time.
-If you still have no idea of what is wrong, then I suggest to use 
commons-httpclient if it isn't already the case (you should just put 
commons-httpclient in you classpath), and then http://jakarta.apache.org/commons/httpclient/logging.html";>turn on the 
debug logging. You will then have very detailed information on how your url 
is handled. If you still have problem, ask for help on the Mailing lists.
+If you still have no idea of what is wrong, then setup Ivy to use Apache HTTP Client library 
and turn on the debug logging for that library. You will then have very 
detailed information on how your url is handled. If you still have problem, ask 
for help on the Mailing lists.
 What if I do not want to put my 
library files in the lib directory ? 
 No problem, you just have to set an ant property:
 <property name="ivy.lib.dir" value="pathtomylibdir"/>
@@ -231,6 +231,10 @@ For http authentication, fill in the app
 This the default behaviour of Apache Ivy, which relies on the revision and 
on its cache to avoid too many downloads. However, this can be changed on each 
resolver using the checkmodified attribute, or globally by setting 
ivy.resolver.default.check.modified variable to true.
 When I use Ivy within an ant parallel task, I 
get surprising behavior. What's going on here?
 The majority of Ivy's code is not written to be thread-safe. At this time, 
such usage is not supported behavior.
+How do I setup Ivy to use Apache HTTP 
Client library?
+Ivy doesn't mandate the use of Apache HTTP client library, for dealing with 
HTTP backed resolvers. By default, Ivy uses necessary APIs available in Java 
for handling HTTP access. However, we do recommend the usage of Apache HTTP 
client library, given that its more feature rich and performant than the basic 
implementation shipped in Java. Starting 2.5.0-rc1 of Ivy, we use https://hc.apache.org/httpcomponents-client-4.5.x/index.html";>4.5.x 
version of Apache HTTP client.
+
+In order to make Ivy use this library, place this library's jar and its 
dependency jars in Ivy's build classpath. Please refer to the Apache HTTP 
client library's project documentation for details about where to get the jar 
and its dependencies from.   
 Misc
 Where are the release notes ?
 Release notes can be found in the documentation.

Modified: ant/site/ivy/sources/faq.html
URL: 
http://svn.apache.org/viewvc/ant/site/ivy/sources/faq.html?rev=1835057&r1=1835056&r2=1835057&view=diff
==
--- ant/site/ivy/sources/faq.html (original)
+++ ant/site/ivy/sources/faq.html Wed Jul  4 13:24:14 2018
@@ -60,7 +60,7 @@ Or for authenticated proxy:
 Or for authenticated proxy:
 set ANT_OPTS=-Dhttp.proxyHost=myproxyhost -Dhttp.proxyPort=8080 
-Dhttp.proxyUser=myproxyusername -Dhttp.proxyPassword=myproxypassword 
-Dhttps.proxyHost=myproxyhost -Dhttps.proxyPort=8080
 For http authentication, fill in the appropriate data at [[doc:use/configure 
configuration]] time.
-If you still have no idea of what is wrong, then I suggest to use 
commons-httpclient if it isn't already the case (you should just put 
commons-httpclient in you classpath), and then http://jakarta.apache.org/commons/httpclient/logging.html";>turn on the 
debug logging. You will then have very detailed information on how your url 
is handled. If you still have problem, ask for help on the 
[[mailing-lists]].
+If you still have no idea of what is wrong, then setup Ivy to use Apache HTTP Client library 
and turn on the debug logging for that library. You will then have very 
detailed information on how your url is handled. If you still have problem, ask 
for help on the [[mailing-lists]].
 What if I do not want to put my 
library files in the lib directory ? 
 No problem, you just have to set an ant property:
 
@@ -98,6 +98,12 @@ him to use comp-build2596.jar instead of
 Th

ant git commit: Add javadoc to CommandLineJava for source-file execution APIs

[jaikiran]

Repository: ant
Updated Branches:
  refs/heads/master bbec119eb -> 4ce54bf3b


Add javadoc to CommandLineJava for source-file execution APIs


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/4ce54bf3
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/4ce54bf3
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/4ce54bf3

Branch: refs/heads/master
Commit: 4ce54bf3b6c521af9c8db3229df5cd8b3199a3b2
Parents: bbec119
Author: Jaikiran Pai 
Authored: Thu Jul 5 12:30:07 2018 +0530
Committer: Jaikiran Pai 
Committed: Thu Jul 5 12:30:26 2018 +0530

--
 .../org/apache/tools/ant/types/CommandlineJava.java| 13 +
 1 file changed, 13 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/4ce54bf3/src/main/org/apache/tools/ant/types/CommandlineJava.java
--
diff --git a/src/main/org/apache/tools/ant/types/CommandlineJava.java 
b/src/main/org/apache/tools/ant/types/CommandlineJava.java
index 1ee821a..8ddebc9 100644
--- a/src/main/org/apache/tools/ant/types/CommandlineJava.java
+++ b/src/main/org/apache/tools/ant/types/CommandlineJava.java
@@ -368,11 +368,24 @@ public class CommandlineJava implements Cloneable {
 return null;
 }
 
+/**
+ * Set the source-file, to execute as single file source programs, a 
feature, available
+ * since Java 11.
+ *
+ * @param sourceFile The path to the source file
+ * @since Ant 1.10.5
+ */
 public void setSourceFile(final String sourceFile) {
 this.executableType = ExecutableType.SOURCE_FILE;
 javaCommand.setExecutable(sourceFile);
 }
 
+/**
+ * @return Returns the source-file to execute, if this command line has
+ * been {@link #setSourceFile(String) configured for single file source 
program
+ * execution}. Else returns null.
+ * @since Ant 1.10.5
+ */
 public String getSourceFile() {
 return this.executableType == ExecutableType.SOURCE_FILE ? 
this.javaCommand.getExecutable() : null;
 }

[08/11] ant git commit: Revert "Trailing whitespace (cherry-pick 2f64e0b)"

[jaikiran]

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/optional/depend/depend.xml
--
diff --git a/src/etc/testcases/taskdefs/optional/depend/depend.xml 
b/src/etc/testcases/taskdefs/optional/depend/depend.xml
index de87e44..8465bb0 100644
--- a/src/etc/testcases/taskdefs/optional/depend/depend.xml
+++ b/src/etc/testcases/taskdefs/optional/depend/depend.xml
@@ -24,7 +24,7 @@
 
 
   
-
+
 
   
 
@@ -100,17 +100,17 @@
   
 
   
-
+
 
   
-
-
+
+
   
 
 
   
-
-
+
+
   
 
   
@@ -154,7 +154,7 @@
 
   
 
-  
+
 
   
 
@@ -171,7 +171,7 @@
 
 
 
+   classpathref="path.compile" fork="false" />
 

 
   
-
-
   
 

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/optional/depend/src1/A.java
--
diff --git a/src/etc/testcases/taskdefs/optional/depend/src1/A.java 
b/src/etc/testcases/taskdefs/optional/depend/src1/A.java
index b7452c7..dc6df23 100644
--- a/src/etc/testcases/taskdefs/optional/depend/src1/A.java
+++ b/src/etc/testcases/taskdefs/optional/depend/src1/A.java
@@ -17,3 +17,4 @@ limitations under the License.
 public class A extends B {
 private D d = new D();
 }
+

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/optional/depend/src1/B.java
--
diff --git a/src/etc/testcases/taskdefs/optional/depend/src1/B.java 
b/src/etc/testcases/taskdefs/optional/depend/src1/B.java
index 86abefd..4be51f7 100644
--- a/src/etc/testcases/taskdefs/optional/depend/src1/B.java
+++ b/src/etc/testcases/taskdefs/optional/depend/src1/B.java
@@ -16,3 +16,4 @@ limitations under the License.
 */
 public class B extends C {
 }
+

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/optional/depend/src1/C.java
--
diff --git a/src/etc/testcases/taskdefs/optional/depend/src1/C.java 
b/src/etc/testcases/taskdefs/optional/depend/src1/C.java
index 766c9bb..d2bfca9 100644
--- a/src/etc/testcases/taskdefs/optional/depend/src1/C.java
+++ b/src/etc/testcases/taskdefs/optional/depend/src1/C.java
@@ -16,3 +16,4 @@ limitations under the License.
 */
 public class C {
 }
+

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/optional/depend/src1/D.java
--
diff --git a/src/etc/testcases/taskdefs/optional/depend/src1/D.java 
b/src/etc/testcases/taskdefs/optional/depend/src1/D.java
index 81f4545..127de57 100644
--- a/src/etc/testcases/taskdefs/optional/depend/src1/D.java
+++ b/src/etc/testcases/taskdefs/optional/depend/src1/D.java
@@ -16,3 +16,4 @@ limitations under the License.
 */
 public class D {
 }
+

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/optional/depend/src1/E.java
--
diff --git a/src/etc/testcases/taskdefs/optional/depend/src1/E.java 
b/src/etc/testcases/taskdefs/optional/depend/src1/E.java
index 4f4834f..0efd613 100644
--- a/src/etc/testcases/taskdefs/optional/depend/src1/E.java
+++ b/src/etc/testcases/taskdefs/optional/depend/src1/E.java
@@ -19,3 +19,4 @@ public class E {
 System.out.println(A.class);
 }
 }
+

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/optional/depend/src2/A.java
--
diff --git a/src/etc/testcases/taskdefs/optional/depend/src2/A.java 
b/src/etc/testcases/taskdefs/optional/depend/src2/A.java
index a9a07fa..02b35be 100644
--- a/src/etc/testcases/taskdefs/optional/depend/src2/A.java
+++ b/src/etc/testcases/taskdefs/optional/depend/src2/A.java
@@ -18,3 +18,4 @@ public class A {
 static private class Inner extends B {
 }
 }
+

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/optional/depend/src2/B.java
--
diff --git a/src/etc/testcases/taskdefs/optional/depend/src2/B.java 
b/src/etc/testcases/taskdefs/optional/depend/src2/B.java
index 0811180..bc7b7d2 100644
--- a/src/etc/testcases/taskdefs/optional/depend/src2/B.java
+++ b/src/etc/testcases/taskdefs/optional/depend/src2/B.java
@@ -16,3 +16,4 @@ limitations under the License.
 */
 public class B {
 }
+

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/optional/depend/src3/A.java
---

[02/11] ant git commit: Revert "Trailing whitespace (cherry-pick 2f64e0b)"

[jaikiran]

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/tests/antunit/taskdefs/truncate/truncate-test.xml
--
diff --git a/src/tests/antunit/taskdefs/truncate/truncate-test.xml 
b/src/tests/antunit/taskdefs/truncate/truncate-test.xml
index 717df99..86f896c 100644
--- a/src/tests/antunit/taskdefs/truncate/truncate-test.xml
+++ b/src/tests/antunit/taskdefs/truncate/truncate-test.xml
@@ -20,98 +20,98 @@
 
   
 
-  
+  
 
   
 
   
-
-
-
+
+
+
   
 
   
-
+
 
-  
+  
 
   
 
   
-
+
 
-  
+  
 
   
 
   
-
+
 
-  
+  
 
-
+
 
-  
+  
 
   
 
   
-
+
 
-  
+  
 
-
+
 
-  
+  
 
   
 
   
-
+
 
   
-
-
+
+
   
 
   
 
   
-
+
 
-  
+  
 
-
+
 
-  
+  
 
   
 
   
-
-
-
+
+
+
   
 
   
-
-
+
+
 
-  
+  
 
   
 
   
 
   
-
-
+
+
   
 
 
   
-
-
+
+
   
 
   
@@ -119,26 +119,26 @@
   
 
   
-
+
   
 
   
 
   
 
-  
+  
 
   
 
   
 
-  
+  
 
   
 
   
 
-  
+  
 
   
 

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/tests/antunit/taskdefs/tstamp-test.xml
--
diff --git a/src/tests/antunit/taskdefs/tstamp-test.xml 
b/src/tests/antunit/taskdefs/tstamp-test.xml
index 67dc4ae..c9bebf8 100644
--- a/src/tests/antunit/taskdefs/tstamp-test.xml
+++ b/src/tests/antunit/taskdefs/tstamp-test.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 
-  
+  
 
   
 

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/tests/antunit/taskdefs/unzip-test.xml
--
diff --git a/src/tests/antunit/taskdefs/unzip-test.xml 
b/src/tests/antunit/taskdefs/unzip-test.xml
index fcb16a9..bdf5f61 100644
--- a/src/tests/antunit/taskdefs/unzip-test.xml
+++ b/src/tests/antunit/taskdefs/unzip-test.xml
@@ -18,10 +18,10 @@
 
 
-  
+  
 
   
-
+
   
 
   
@@ -49,7 +49,8 @@
   
 
   https://issues.apache.org/bugzilla/show_bug.cgi?id=42940";>
+  
description="https://issues.apache.org/bugzilla/show_bug.cgi?id=42940";
+  >
 
 
 
@@ -58,7 +59,8 @@
   
 
   https://issues.apache.org/bugzilla/show_bug.cgi?id=46559";>
+  
description="https://issues.apache.org/bugzilla/show_bug.cgi?id=46559";
+  >
 
 
 

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/tests/antunit/taskdefs/uptodate-test.xml
--
diff --git a/src/tests/antunit/taskdefs/uptodate-test.xml 
b/src/tests/antunit/taskdefs/uptodate-test.xml
index 3851f69..e477803 100644
--- a/src/tests/antunit/taskdefs/uptodate-test.xml
+++ b/src/tests/antunit/taskdefs/uptodate-test.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 
-  
+  
 
   https://issues.apache.org/bugzilla/show_bug.cgi?id=39122

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/tests/antunit/taskdefs/war-test.xml
--
diff --git a/src/tests/antunit/taskdefs/war-test.xml 
b/src/tests/antunit/taskdefs/war-test.xml
index 6c2437f..e264ebd 100644
--- a/src/tests/antunit/taskdefs/war-test.xml
+++ b/src/tests/antunit/taskdefs/war-test.xml
@@ -19,7 +19,7 @@
 
 
-  
+  
 
   
 
@@ -43,10 +43,10 @@
   
 
 
-
+
   
 
-  
@@ -55,62 +55,62 @@
   
 
 
-
+
   
 
   
-
+
 
 
   
 
 
-
+
   
 
   
-
+
 
-
+
   
 
 
-
+
   
 
   
-
+
 
-
+
   
 
 
-
+
   
 
 
   
-
+
   
   
   
 
 
-
+
   
 
   
-
-
+
+
   
   
   
 
 
-
+
 
   
 
@@ -124,15 +124,15 @@
   
 
 
-
+
 
-  
+  
 
   
 
   
 
-  
+  
 
   
 
@@ -151,7 +151,7 @@
   
 
 
-
+
   
 
   
@@ -159,7 +159,7 @@
   
 
 
-
+
   
 
   

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/tests/antunit/taskdefs/whichresource-test.xml
--
diff --git a/src/tests/antunit/taskdefs/whichresource-test.xml 
b/src/tests/antunit/taskdefs/whichresource-test.xml
index c78d405..6bf5a88 100644
--- a/src/tests/antunit/taskdefs/whichresource-test.xml
+++ b/src/tests/antunit/taskdefs/whichresource-test.xml
@@ -16,7 +16,7 @@
   limitatio

[11/11] ant git commit: Revert "Trailing whitespace (cherry-pick 2f64e0b)"

[jaikiran]

Revert "Trailing whitespace (cherry-pick 2f64e0b)"

This reverts commit 7df9120ebc1f9bee97a6a1a47f0a5fda986e4ab0.
Discussion in ant dev mailing list 
https://www.mail-archive.com/dev@ant.apache.org/msg47356.html


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/9b1b8dbb
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/9b1b8dbb
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/9b1b8dbb

Branch: refs/heads/1.9.x
Commit: 9b1b8dbbc6e9aa98922da28683f3773f586811e5
Parents: 7df9120
Author: Jaikiran Pai 
Authored: Sat Jul 7 16:29:31 2018 +0530
Committer: Jaikiran Pai 
Committed: Sat Jul 7 16:30:03 2018 +0530

--
 src/etc/ant-update.xsl  |  20 +-
 src/etc/changelog.xsl   |  18 +-
 .../checkstyle-frames-sortby-check.xsl  | 188 +++
 src/etc/checkstyle/checkstyle-frames.xsl|   6 +-
 src/etc/checkstyle/checkstyle-text.xsl  |   1 +
 src/etc/checkstyle/checkstyle-xdoc.xsl  |   3 +-
 src/etc/common2master.xsl   |  11 +-
 src/etc/coverage-frames.xsl |   2 +-
 src/etc/jdepend-frames.xsl  |   2 +-
 src/etc/jdepend.xsl |  46 +-
 src/etc/junit-frames-xalan1.xsl |  28 +-
 src/etc/junit-frames.xsl|   8 +-
 src/etc/junit-noframes.xsl  |  18 +-
 src/etc/log.xsl |  20 +-
 src/etc/maudit-frames.xsl   |   2 +-
 src/etc/mmetrics-frames.xsl |   2 +-
 src/etc/performance/build.xml   |   4 +-
 src/etc/performance/dirscanner.xml  |   4 +-
 src/etc/poms/ant-apache-log4j/pom.xml   |   4 +-
 src/etc/poms/ant-apache-regexp/pom.xml  |   4 +-
 src/etc/poms/ant-apache-resolver/pom.xml|   2 +-
 src/etc/poms/ant-apache-xalan2/pom.xml  |   6 +-
 src/etc/poms/ant-commons-logging/pom.xml|   2 +-
 src/etc/poms/ant-commons-net/pom.xml|   2 +-
 src/etc/poms/ant-javamail/pom.xml   |   6 +-
 src/etc/poms/ant-jdepend/pom.xml|   2 +-
 src/etc/poms/ant-jmf/pom.xml|   4 +-
 src/etc/poms/ant-jsch/pom.xml   |   4 +-
 src/etc/poms/ant-junit/pom.xml  |   6 +-
 src/etc/poms/ant-netrexx/pom.xml|   4 +-
 src/etc/poms/ant-swing/pom.xml  |   4 +-
 src/etc/poms/ant-testutil/pom.xml   |   4 +-
 src/etc/tagdiff.xsl |  20 +-
 src/etc/testcases/buildfiletest-base.xml|   2 +-
 src/etc/testcases/core/directoryscanner.xml |   2 +-
 src/etc/testcases/core/dispatch/dispatch.xml|   6 +-
 src/etc/testcases/core/executor.xml |   2 +-
 src/etc/testcases/core/extended-taskdef.xml |   4 +-
 src/etc/testcases/core/immutable.xml|  12 +-
 src/etc/testcases/core/loaderref/loaderref.xml  |   2 +-
 src/etc/testcases/core/location.xml |   6 +-
 src/etc/testcases/core/taskcontainer.xml|  26 +-
 .../testcases/core/topleveltasks/notarget.xml   |   4 +-
 .../core/topleveltasks/targetlevelant.xml   |   2 +-
 .../core/topleveltasks/toplevelant.xml  |   4 +-
 src/etc/testcases/core/unknownelement.xml   |   2 +-
 src/etc/testcases/filters/build.xml |  26 +-
 src/etc/testcases/filters/concat.xml|   2 +-
 src/etc/testcases/filters/dynamicfilter.xml |  12 +-
 src/etc/testcases/filters/head-tail.xml |   6 +-
 src/etc/testcases/filters/tokenfilter.xml   |  20 +-
 src/etc/testcases/taskdefs/abstractcvstask.xml  |   6 +-
 src/etc/testcases/taskdefs/ant.xml  |  84 +--
 src/etc/testcases/taskdefs/ant/ant.xml  |   6 +-
 src/etc/testcases/taskdefs/ant/references.xml   |   4 +-
 src/etc/testcases/taskdefs/antlib.xml   |  12 +-
 src/etc/testcases/taskdefs/available.xml|  62 +--
 src/etc/testcases/taskdefs/basename.xml |   4 +-
 src/etc/testcases/taskdefs/bunzip2.xml  |   2 +-
 src/etc/testcases/taskdefs/bzip2.xml|   4 +-
 src/etc/testcases/taskdefs/checksum.xml | 108 ++--
 src/etc/testcases/taskdefs/classloader.xml  |  18 +-
 src/etc/testcases/taskdefs/concat.xml   |  14 +-
 src/etc/testcases/taskdefs/condition.xml| 232 -
 .../taskdefs/conditions/antversion.xml  |  12 +-
 .../testcases/taskdefs/conditions/isfailure.xml |  36 +-
 .../testcases/taskdefs/conditions/issigned.xml  |   2 +-
 .../taskdefs/conditions/parsersupports.xml  |  17 +-
 .../testcases/taskdefs/conditions/typefound.xml |   4 +-
 src/etc/testcases/taskdefs/conditions/xor.xml   |  48 +-
 src/etc/testcases/taskdefs/copy.xml |  38 +-
 src/etc/testcases/taskdefs/copydir.xml  |  10 +-
 src/etc/testcases/taskdefs/co

[07/11] ant git commit: Revert "Trailing whitespace (cherry-pick 2f64e0b)"

[jaikiran]

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/rename.xml
--
diff --git a/src/etc/testcases/taskdefs/rename.xml 
b/src/etc/testcases/taskdefs/rename.xml
index 49b776c..a23a81e 100644
--- a/src/etc/testcases/taskdefs/rename.xml
+++ b/src/etc/testcases/taskdefs/rename.xml
@@ -31,19 +31,19 @@
   
 
   
-
   
 
   
-
   
 
   
-
-
   
 

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/replace.xml
--
diff --git a/src/etc/testcases/taskdefs/replace.xml 
b/src/etc/testcases/taskdefs/replace.xml
index b4ba9ae..a4039e5 100644
--- a/src/etc/testcases/taskdefs/replace.xml
+++ b/src/etc/testcases/taskdefs/replace.xml
@@ -42,25 +42,25 @@
   
 
   
-
   
 
   
 
-  
+  
 
   
 
   
 
-  
+  
 
   
 
   
 
-  
+  
 
   
 
@@ -70,8 +70,8 @@
 
 
 
-
-
+
+
 
   
   

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/rmic/rmic.xml
--
diff --git a/src/etc/testcases/taskdefs/rmic/rmic.xml 
b/src/etc/testcases/taskdefs/rmic/rmic.xml
index a4f3b8e..4670f43 100644
--- a/src/etc/testcases/taskdefs/rmic/rmic.xml
+++ b/src/etc/testcases/taskdefs/rmic/rmic.xml
@@ -17,13 +17,13 @@
 -->
 
 
-  
+  
   
 
   
 
   
-
+
 
 
   
@@ -52,7 +52,8 @@
   
+classname="unimplemented.class"
+/>
 
 
 
@@ -64,7 +65,7 @@
 
 
 
-  
+  
   
 Not found : ${build.dir}/@{file}
   
@@ -75,7 +76,7 @@
 
 
 
-  
+  
   
 Not found : ${dest.dir}/@{file}
   
@@ -86,7 +87,7 @@
 
 
 
-  
+  
   
 Expected to be missing : ${build.dir}/@{file}
   
@@ -97,7 +98,7 @@
 
 
 
-  
+  
   
 Expected to be missing : ${dest.dir}/@{file}
   
@@ -106,69 +107,69 @@
 
   
 
-
+
 
   
-
+
   
 
 
 
   
-
+
   
 
 
 
   
-
+
   
 
 
 
   
-
+
   
 
 
 
   
-
+
   
 
-
+
 
   
-
+
   
 
 
 
   
-
-
+
+
   
 
 
 
   
-
-
+
+
   
 
-
+
 
   
 
   
 
-
+
 
   
 
   
 
-
+
 
   
 
@@ -183,20 +184,20 @@
 
 
   
-
-
+
+
   
 
 
 
   
-
-
+
+
   
 
 
   
-
+  
   
 
 
@@ -240,37 +241,37 @@
   
 
   
-
+
 
   
 
   
-
+
 
   
 
   
-
+
 
 
   
-
+  
   
-
+
 
 
   
-
+  
   
-
+
 
   
-
+  
   
-
+
 
   
-
+  
   
 
 
@@ -283,63 +284,71 @@
 
   
 
-  
+  
 
 
   
 
   
 
-  
+  
 
 
   
 
   
 
+  compiler="kaffe"
+  />
 
   
 
   
 
+  compiler="kaffe"
+  />
 
   
-
+   
 
   
 
+  compiler="forking"
+  />
 
   
 
   
 
+  compiler="no-such-compiler"
+  />
   
 
   
 
+compiler="org.apache.tools.ant.taskdefs.rmic.ForkingSunRmic"
+/>
 
   
-
+  
   
 
+  compiler="org.apache.tools.ant.BuildException"
+  />
   
 
   
@@ -364,9 +373,10 @@
 
   
 
+  
compiler="org.apache.tools.ant.taskdefs.rmic.RmicAdvancedTest$FailingRmicAdapter"
+  />
   
-
+  
   
 
 
+  compiler="default"
+  />
 
   
 
   
 
+  compiler="default"
+  />
 
   
 
   
 
-
+  compiler="forking"
+  />
+
   
 
   
 
-
+  compiler="forking"
+  />
+
   
 
   
@@ -405,17 +419,19 @@
 
   
 
-
+
   
 
   
 
-
+
   
 
   
 
-
+
 
   
 

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/signjar.xml
--
diff --git a/src/etc/testcases/taskdefs/signjar.xml 
b/src/etc/testcases/taskdefs/signjar.xml
index 7c55e58..38a1359 100644
--- a/src/etc/testcases/taskdefs/signjar.xml
+++ b/src/etc/testcases/taskdefs/signjar.xml
@@ -20,21 +20,21 @@
   
 
   
-
-
+
+
 
-
-
+
+
 
   
 
 
   
-
+
 
-  
+  
 
-  
+  
 
   
 
@@ -51,7 +51,7 @@
   
 
   
-
+
   
 
   
@@ -63,7 +63,7 @@
   
 
   
-
+
 
   
 
@@ -85,12 +85,13 @@
 
   
 http://ant.apache.org/webtest/testkeystore"/>
+  keystore="http://ant.apache.org/we

[05/11] ant git commit: Revert "Trailing whitespace (cherry-pick 2f64e0b)"

[jaikiran]

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/tests/antunit/taskdefs/condition/resourcecontains-test.xml
--
diff --git a/src/tests/antunit/taskdefs/condition/resourcecontains-test.xml 
b/src/tests/antunit/taskdefs/condition/resourcecontains-test.xml
index 0c946ea..11c6a9e 100644
--- a/src/tests/antunit/taskdefs/condition/resourcecontains-test.xml
+++ b/src/tests/antunit/taskdefs/condition/resourcecontains-test.xml
@@ -48,15 +48,15 @@
 
   
 
-  
+  
 
   
 
   
-
+
 
   
+substring="${testContainsEmptyProperty}" />
 
   
 
@@ -81,7 +81,7 @@
   
 
   
-
+
 
   
 
@@ -105,7 +105,7 @@
 
   
 
-  
+  
 
 
   
@@ -118,7 +118,7 @@
 HEADER
 FOOTER
 foo
-
+
 bar
   
 
@@ -129,7 +129,7 @@
 
   
 
-  
+  
 
 
   

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/tests/antunit/taskdefs/copy-test.xml
--
diff --git a/src/tests/antunit/taskdefs/copy-test.xml 
b/src/tests/antunit/taskdefs/copy-test.xml
index 45065ca..1fd4b59 100644
--- a/src/tests/antunit/taskdefs/copy-test.xml
+++ b/src/tests/antunit/taskdefs/copy-test.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 
-  
+  
 
   
 
@@ -194,7 +194,8 @@ public class NullByteStreamResource extends Resource {
   
 
   https://issues.apache.org/bugzilla/show_bug.cgi?id=43574";>
+  
description="https://issues.apache.org/bugzilla/show_bug.cgi?id=43574";
+  >
 
 
 
@@ -215,16 +216,16 @@ public class NullByteStreamResource extends Resource {
 
 
   
-
-
+
+
   
 
 
 
 
   
-
-
+
+
   
 
 
@@ -243,8 +244,8 @@ public class NullByteStreamResource extends Resource {
   
 
 
-
-
+
+   
   
 
   
@@ -410,7 +411,8 @@ public class NullByteStreamResource extends Resource {
   
 
   https://issues.apache.org/bugzilla/show_bug.cgi?id=49756";>
+  
description="https://issues.apache.org/bugzilla/show_bug.cgi?id=49756";
+  >
 
 
 
@@ -476,8 +478,8 @@ public class NullByteStreamResource extends Resource {
 
 
   
-
-
+   
+   
   
 
 

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/tests/antunit/taskdefs/cvs/cvs.xml
--
diff --git a/src/tests/antunit/taskdefs/cvs/cvs.xml 
b/src/tests/antunit/taskdefs/cvs/cvs.xml
index e1101ea..564e587 100644
--- a/src/tests/antunit/taskdefs/cvs/cvs.xml
+++ b/src/tests/antunit/taskdefs/cvs/cvs.xml
@@ -20,7 +20,7 @@
  requires a working CVS client. -->
 
 
-  
+  
 
   
   

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/tests/antunit/taskdefs/defaultexcludes-test.xml
--
diff --git a/src/tests/antunit/taskdefs/defaultexcludes-test.xml 
b/src/tests/antunit/taskdefs/defaultexcludes-test.xml
index 6e1c36c..cbea93c 100644
--- a/src/tests/antunit/taskdefs/defaultexcludes-test.xml
+++ b/src/tests/antunit/taskdefs/defaultexcludes-test.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 
-  
+  
 
   
 

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/tests/antunit/taskdefs/delete-and-symlinks-test.xml
--
diff --git a/src/tests/antunit/taskdefs/delete-and-symlinks-test.xml 
b/src/tests/antunit/taskdefs/delete-and-symlinks-test.xml
index 6d652cb..ac78994 100644
--- a/src/tests/antunit/taskdefs/delete-and-symlinks-test.xml
+++ b/src/tests/antunit/taskdefs/delete-and-symlinks-test.xml
@@ -18,11 +18,11 @@
 
 
-
-  
+  
+  
 
   
-
+
   
 
   

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/tests/antunit/taskdefs/delete-test.xml
--
diff --git a/src/tests/antunit/taskdefs/delete-test.xml 
b/src/tests/antunit/taskdefs/delete-test.xml
index 73355cb..554f08f 100644
--- a/src/tests/antunit/taskdefs/delete-test.xml
+++ b/src/tests/antunit/taskdefs/delete-test.xml
@@ -18,8 +18,8 @@
 
 
-
-  
+  
+  
 
   
   
@@ -36,13 +36,13 @@

 
 
-
-
+
+  
 

 
 
-
+
 
 
 
@@ -53,7 +53,7 @@
 
 
 
-
+
 
 
 
@@ -63,13 +63,13 @@
 
 
 
-
+
 
   
 
   
 
-  
+  
 
   
 
@@ -79,7 +79,7 @@
  resource="${output}/foo"/>
 
 
-
+
   
 
   
@@ -92,11 +92,12 @@
 
 
-
+
   
 
   https://issues.apache.org/bugzilla/show_bug.cgi?id=43574";>
+  
description="https://issues.apache.org/bugzilla/show_bug.cgi?id=43574";
+ 

[03/11] ant git commit: Revert "Trailing whitespace (cherry-pick 2f64e0b)"

[jaikiran]

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/tests/antunit/taskdefs/local-test.xml
--
diff --git a/src/tests/antunit/taskdefs/local-test.xml 
b/src/tests/antunit/taskdefs/local-test.xml
index 2b07a8d..9c4e7b7 100644
--- a/src/tests/antunit/taskdefs/local-test.xml
+++ b/src/tests/antunit/taskdefs/local-test.xml
@@ -16,81 +16,81 @@
   limitations under the License.
 -->
 
-  
+  
 
-  
+  
 
-  
-  
-  
+  
+  
+  
 
   
 
-  
+  
 
   
 
   
-
+
   
 
   
-
-
-
-
+
+
+
+
   
 
   
 
-  
-  
+  
+  
   
-
-
-
+
+
+
   
-  
+  
 
-
+
   
 
   
 
-  
-  
+  
+  
   
-
-
-
-
+
+
+
+
   
 
 
-  
-  
-  
-  
-  
-  
+  
+  
+  
+  
+  
+  
 
-
+
   
 
   
 
   
-
-
-
+
+
+
   
 
-
-
-
-
-
-
+
+
+
+
+
+
   
 
 

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/tests/antunit/taskdefs/macrodef-test.xml
--
diff --git a/src/tests/antunit/taskdefs/macrodef-test.xml 
b/src/tests/antunit/taskdefs/macrodef-test.xml
index af6b87c..b12e6f7 100644
--- a/src/tests/antunit/taskdefs/macrodef-test.xml
+++ b/src/tests/antunit/taskdefs/macrodef-test.xml
@@ -18,7 +18,7 @@
 
 
-  
+  
 
   
 

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/tests/antunit/taskdefs/manifest-test.xml
--
diff --git a/src/tests/antunit/taskdefs/manifest-test.xml 
b/src/tests/antunit/taskdefs/manifest-test.xml
index 5b682f3..4247ef2 100644
--- a/src/tests/antunit/taskdefs/manifest-test.xml
+++ b/src/tests/antunit/taskdefs/manifest-test.xml
@@ -18,7 +18,7 @@
 
 
-  
+  
 
   
 
@@ -150,18 +150,18 @@ public class AntFail {
 }
 }
 ]]>
-
+
   
 
   https://issues.apache.org/bugzilla/show_bug.cgi?id=54762";>
 
-  
+  
 
-
+
 
+ basedir="${output}/bin" />
 
   
 
@@ -172,7 +172,7 @@ public class AntFail {
 
   
-
+
   
 
 

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/tests/antunit/taskdefs/manifestclasspath-test.xml
--
diff --git a/src/tests/antunit/taskdefs/manifestclasspath-test.xml 
b/src/tests/antunit/taskdefs/manifestclasspath-test.xml
index cbc06a9..612990b 100644
--- a/src/tests/antunit/taskdefs/manifestclasspath-test.xml
+++ b/src/tests/antunit/taskdefs/manifestclasspath-test.xml
@@ -18,7 +18,7 @@
 
 
-  
+  
 
   
 http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/tests/antunit/taskdefs/move-test.xml
--
diff --git a/src/tests/antunit/taskdefs/move-test.xml 
b/src/tests/antunit/taskdefs/move-test.xml
index d1475ec..9acac74 100644
--- a/src/tests/antunit/taskdefs/move-test.xml
+++ b/src/tests/antunit/taskdefs/move-test.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 
-  
+  
 
   
 
@@ -60,7 +60,8 @@
   
 
   https://issues.apache.org/bugzilla/show_bug.cgi?id=43574";>
+  
description="https://issues.apache.org/bugzilla/show_bug.cgi?id=43574";
+  >
 
 
 
@@ -81,8 +82,8 @@
 
 
   
-
-
+
+
   
 
 
@@ -90,8 +91,8 @@
 
 
   
-
-
+
+
   
 
 

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/tests/antunit/taskdefs/optional/cab.xml
--
diff --git a/src/tests/antunit/taskdefs/optional/cab.xml 
b/src/tests/antunit/taskdefs/optional/cab.xml
index a5a2ac2..4909107 100644
--- a/src/tests/antunit/taskdefs/optional/cab.xml
+++ b/src/tests/antunit/taskdefs/optional/cab.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 
-  
+  
 
   
 http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/tests/antunit/taskdefs/optional/depend/depend-test.xml
--
diff --git a/src/tests/antunit/taskdefs/optional/depend/depend-test.xml 
b/src/tests/antunit/taskdefs/optional/depend/depend-test.xml
index 3abbca5..48f94aa 100644
--- a/src/tests/antunit/taskdefs/optional/depend/depend-test.xml
+++ b/src/tests/antunit/taskdefs/optional/depend/depend-test.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 
-  
+  
 
   
   
@@ -59,8 +59,8 @@ public class Main {
 
 
-
-
+
+
 
 
 
@@ -93,8 +93,8 @@ public class Main 

[09/11] ant git commit: Revert "Trailing whitespace (cherry-pick 2f64e0b)"

[jaikiran]

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/fail.xml
--
diff --git a/src/etc/testcases/taskdefs/fail.xml 
b/src/etc/testcases/taskdefs/fail.xml
index a5d88d1..0a6561e 100644
--- a/src/etc/testcases/taskdefs/fail.xml
+++ b/src/etc/testcases/taskdefs/fail.xml
@@ -29,23 +29,23 @@
   
 testText
   
-
+  
   
-
+
   
 
   
-
+
   
 
   
 
   
-
+  
   
 
   
-  
+  
   
 
   
@@ -53,7 +53,7 @@
   
 
   
-  
+  
   
 
   
@@ -61,7 +61,7 @@
   
 
   
-  
+  
   
 
   
@@ -69,7 +69,7 @@
   
 
   
-  
+  
   
 
   
@@ -77,7 +77,7 @@
   
 
   
-  
+  
   
 
   
@@ -85,7 +85,7 @@
   
 
   
-  
+  
   
 
   
@@ -93,10 +93,10 @@
   
 
   
-  
+  
   
   
-  
+  
   
 
   
@@ -104,7 +104,7 @@
   
 
   
-  
+  
   
 testNested6
 testNested6
@@ -114,15 +114,15 @@ testNested6
 
   
 
-  
+  
 
   
 
   
 
   
-  
-  
+  
+  
   
 
   

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/filter.xml
--
diff --git a/src/etc/testcases/taskdefs/filter.xml 
b/src/etc/testcases/taskdefs/filter.xml
index d4a7525..303efa7 100644
--- a/src/etc/testcases/taskdefs/filter.xml
+++ b/src/etc/testcases/taskdefs/filter.xml
@@ -35,38 +35,38 @@
   
 
   
-
-
+
+
   
 
   
-
+
 
-  
+  
 
   
 
   
-
-
+
+
   
 
   
-
+
 
   
 
   
 
   
-
+
 
   
 
   
 
   
-
+
   
 
 

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/fixcrlf/build.xml
--
diff --git a/src/etc/testcases/taskdefs/fixcrlf/build.xml 
b/src/etc/testcases/taskdefs/fixcrlf/build.xml
index e36ea00..e2fecac 100644
--- a/src/etc/testcases/taskdefs/fixcrlf/build.xml
+++ b/src/etc/testcases/taskdefs/fixcrlf/build.xml
@@ -19,23 +19,23 @@
   
 
   
-
+
 
 
-
+
   
 
 
   
-
-
-
-
+
+
+
+
 
   
 
   
-
+
   
 
   
@@ -45,82 +45,82 @@
   
 
-
+ javafiles="true" tab="add" eol="crlf" eof="asis" />
+
   
 
   
 
-
+ javafiles="true" tab="add" cr="add" eol="crlf" eof="asis" />
+
   
 
   
 
-
+ javafiles="true" tab="remove" eol="lf" eof="asis" />
+
   
 
   
 
-
+ javafiles="true" tab="remove" eol="lf" eof="asis" />
+
   
 
   
 
-
+ tab="remove" eol="lf" eof="asis" />
+
   
 
   
 
-
+ tab="add" cr="remove" eol="crlf" eof="asis" />
+
   
 
   
 
-
+ tab="add" cr="add" eof="asis" />
+
   
 
   
 
-
+ javafiles="true" tab="add" cr="add" eof="add" />
+
   
 
   
 
-
+ javafiles="true" tab="remove" cr="remove" eof="remove" />
+
   
 
   
 
-
+ includes="Mac2Unix" eol="lf" />
+
   
 
   
-
+
 
+ javafiles="true" tab="add" eol="crlf" eof="asis" />
 Q
   
 
   
-
+
   
 
   
@@ -130,74 +130,74 @@
   
 
+ javafiles="false" cr="remove" encoding="UnicodeBig" />
 
+ file2="${input}/expected/input.lf.utf16" />
   
 
   
 
+ outputencoding="ascii" />
 
+ file2="${input}/expected/input.lf.ascii" />
   
 
   
 
+ javafiles="false" cr="remove" />
 
+ file2="${input}/expected/longlines.lf" />
   
 
   
 
+ includes="crcrlf" eol="lf" />
 
+ file2="${input}/expected/crcrlf.unix" />
   
 
   
 
+ includes="crcrlf" eol="crlf" />
 
+ file2="${input}/expected/crcrlf.dos" />
   
 
   
 
+ includes="crcrlf" eol="cr" />
 
+ file2="${input}/expected/crcrlf.mac" />
   
 
   
 
+ includes="fixlastfalse.lf" eol="crlf" />
 
+ file2="${input}/expected/fixlast.dos" />
   
 
   
 
+ includes="fixlastfalse.lf" eol="cr" fixlast="false" />
 
+ file2="${input}/expected/fixlastfalse.mac" />
   
 
   
   
-
+
   
 
   
-
+
 
   
 
-  
+  
 
   
 
@@ -209,123 +209,123 @@
 
   
 
+ preservelastmodified="true" />
 
   
 
   
+ 

[10/11] ant git commit: Revert "Trailing whitespace (cherry-pick 2f64e0b)"

[jaikiran]

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/core/topleveltasks/notarget.xml
--
diff --git a/src/etc/testcases/core/topleveltasks/notarget.xml 
b/src/etc/testcases/core/topleveltasks/notarget.xml
index 9ce0239..2543751 100644
--- a/src/etc/testcases/core/topleveltasks/notarget.xml
+++ b/src/etc/testcases/core/topleveltasks/notarget.xml
@@ -16,6 +16,6 @@
limitations under the License.
 -->
 
-  
-  
+  
+  
 

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/core/topleveltasks/targetlevelant.xml
--
diff --git a/src/etc/testcases/core/topleveltasks/targetlevelant.xml 
b/src/etc/testcases/core/topleveltasks/targetlevelant.xml
index 61229f9..9b1bb1d 100644
--- a/src/etc/testcases/core/topleveltasks/targetlevelant.xml
+++ b/src/etc/testcases/core/topleveltasks/targetlevelant.xml
@@ -17,6 +17,6 @@
 -->
 
   
-
+
   
 

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/core/topleveltasks/toplevelant.xml
--
diff --git a/src/etc/testcases/core/topleveltasks/toplevelant.xml 
b/src/etc/testcases/core/topleveltasks/toplevelant.xml
index 67a5cae..968ad6c 100644
--- a/src/etc/testcases/core/topleveltasks/toplevelant.xml
+++ b/src/etc/testcases/core/topleveltasks/toplevelant.xml
@@ -16,6 +16,6 @@
limitations under the License.
 -->
 
-  
-  
+  
+  
 

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/core/unknownelement.xml
--
diff --git a/src/etc/testcases/core/unknownelement.xml 
b/src/etc/testcases/core/unknownelement.xml
index fec8f18..b6d8939 100644
--- a/src/etc/testcases/core/unknownelement.xml
+++ b/src/etc/testcases/core/unknownelement.xml
@@ -17,7 +17,7 @@
 -->
 
   
-
   

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/filters/build.xml
--
diff --git a/src/etc/testcases/filters/build.xml 
b/src/etc/testcases/filters/build.xml
index c03443a..b70b778 100644
--- a/src/etc/testcases/filters/build.xml
+++ b/src/etc/testcases/filters/build.xml
@@ -18,7 +18,7 @@
 
   
   
-
+
   
 
 
@@ -34,7 +34,7 @@
   
 
   
-
+  
   
 
@@ -49,12 +49,12 @@
   
 
   
+  file2="expected/negatelinecontains.test" />
 
   
 
   
-
+  
   
 
   
@@ -71,16 +71,16 @@
 
   
 
-  
+  
   
-
+
   
 
   
 
   
 
-  
+  
   
 
   
@@ -91,18 +91,18 @@
 
   
 
-  
+  
   
-
+   
   
-  
+ 
   
 
   
 
   
 
-  
+  
   
 
   
@@ -113,7 +113,7 @@
 
   
 
-  
+  
   
 
   
@@ -124,7 +124,7 @@
 
   
 
-  
+  
   
 
   

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/filters/concat.xml
--
diff --git a/src/etc/testcases/filters/concat.xml 
b/src/etc/testcases/filters/concat.xml
index 7aca7bd..262dd16 100644
--- a/src/etc/testcases/filters/concat.xml
+++ b/src/etc/testcases/filters/concat.xml
@@ -20,7 +20,7 @@
   
 
   
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/filters/dynamicfilter.xml
--
diff --git a/src/etc/testcases/filters/dynamicfilter.xml 
b/src/etc/testcases/filters/dynamicfilter.xml
index ef9ffc3..cb52d21 100644
--- a/src/etc/testcases/filters/dynamicfilter.xml
+++ b/src/etc/testcases/filters/dynamicfilter.xml
@@ -20,20 +20,20 @@
   
 
   
-
+
   
 
   
 
-  
-  
+  
+  
 
-
   
 
-
+
 
   hello world
 

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/filters/head-tail.xml
--
diff --git a/src/etc/testcases/filters/head-tail.xml 
b/src/etc/testcases/filters/head-tail.xml
index 9bff110..e0ffed7 100644
--- a/src/etc/testcases/filters/head-tail.xml
+++ b/src/etc/testcases/filters/head-tail.xml
@@ -20,7 +20,7 @@
   
 
   
-
+
   
 
 
@@ -59,7 +59,7 @@
   
 
   
-
   
 
@@ -113,7 +113,7 @@
   
 
   
-
   
 

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/filters/tokenfilter.xml
--
diff --git a/src/etc/testcases/filters/tokenfilter.xml 
b/src/etc/testcases/filters/tokenfilter.xml
index de468c1..b1b5aef 100644
--- a/src/etc/testcases/filters/token

[04/11] ant git commit: Revert "Trailing whitespace (cherry-pick 2f64e0b)"

[jaikiran]

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/tests/antunit/taskdefs/exec/exec-test.xml
--
diff --git a/src/tests/antunit/taskdefs/exec/exec-test.xml 
b/src/tests/antunit/taskdefs/exec/exec-test.xml
index b4e7f52..25b0088 100644
--- a/src/tests/antunit/taskdefs/exec/exec-test.xml
+++ b/src/tests/antunit/taskdefs/exec/exec-test.xml
@@ -16,20 +16,20 @@
   limitations under the License.
 -->
 
-
+
 
 
-
-
-
+
+
+
 
 
 
-
+
 
-
+
 
-
+
 
 
 
@@ -38,78 +38,78 @@
 
 
 
-
-
-
+
+
+
 
-
+
 
-
+
 
 
-
-
+
+
 
 
 
-
+
 
-
+
 
 
-
-
+
+
 
 
 
-
+
 
-
+
 
 
-
-
+
+
 
 
 
 
 
 
-
-
+
+
 
-
-
+
+
 
 
 
 
-
-
+
+
 
 
 
 ${ant.file} out${line.separator}${ant.file} 
err
-
+
 
 
 
 
 
 
-
-
+
+
 
 
 
 ${ant.file} out
-
+
 
 
 
 
 ${ant.file} err
-
+
 
 
 
@@ -117,17 +117,17 @@
 
 
-
-
+
+
 
 
 
 ${ant.file} out
-
-
+
+
 
 
-
+
 
 
 
-
-
+
+
 
 
 
 ${ant.file} out
-
-
+
+
 
 
 
 
 ${ant.file} err
-
-
+
+
 
 
 
@@ -159,19 +159,19 @@
 
-
+
 
 
 
-
-
+
+
 
 
 
-
+
 
 
-
+
 
 
 
@@ -181,19 +181,19 @@
 
-
+
 
 
 
-
-
+
+
 
 
 
-
+
 
 
-
+
 
 
 
@@ -202,22 +202,22 @@
 
-
+
 
 
 
-
+
 
 
 
-
-
+
+
 
 
-
+
 
 
-
+
 
 
 
@@ -225,85 +225,85 @@
 depends="setUp" if="test.can.run">
 
 
-
-
-
-
+
+
+
+
 
 
 
 
 
 
-
-
-
+
+
+
 
 
 
 ${ant.file} out${line.separator}${ant.file} 
err
-
+
 
 
 
 
 
 
-
-
-
+
+
+
 
 
 
 ${ant.file} out
-
+
 
 
 
 
 ${ant.file} err
-
+
 
 
 
 
 
 
-
-
+
+
 
+outputproperty="redirector.out" />
 
 
 
 ${ant.file} out
-
-
+
+
 
 
- 

[01/11] ant git commit: Revert "Trailing whitespace (cherry-pick 2f64e0b)"

[jaikiran]

Repository: ant
Updated Branches:
  refs/heads/1.9.x 7df9120eb -> 9b1b8dbbc


http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/tests/antunit/types/resources/selectors/test-componentdef.xml
--
diff --git a/src/tests/antunit/types/resources/selectors/test-componentdef.xml 
b/src/tests/antunit/types/resources/selectors/test-componentdef.xml
index 71de167..187412e 100644
--- a/src/tests/antunit/types/resources/selectors/test-componentdef.xml
+++ b/src/tests/antunit/types/resources/selectors/test-componentdef.xml
@@ -17,27 +17,27 @@
 -->
 
 
-  
+
   
 
   
   
   
 
-  
-
+  
+
   
 
   
 
   
-
-
-
-
-
+
+
+
+
+
   
-  
+  
 
   
 
@@ -48,28 +48,28 @@
   
 
   
-
-
-
+
+
+
   
-  
+  
 
   
 
   
 
-  
+  
 
   
 
   
 
   
-
-
-
+
+
+
   
-  
+  
 
   
 
@@ -80,13 +80,13 @@
   
 
   
-
-http://ant.apache.org/index.html"/>
-
-
-
+
+http://ant.apache.org/index.html"; />
+
+
+
   
-  
+  
 
   
 
@@ -94,15 +94,15 @@
 
   
 
+ classname="org.apache.tools.ant.types.resources.FileResource" />
 
   
 
   
-
-
+
+
   
-  
+  
 
   
 
@@ -110,49 +110,49 @@
 
   
 
+ classname="org.apache.tools.ant.types.resources.FileResource" />
 
   
 
   
-
-
+
+
   
-  
+  
 
   
 
   
 
   
+depends="testinstanceoftype1,testinstanceoftype2,testinstanceoftype3" />
 
   
 
   
 
   
-
+
   
-  
+  
 
   
 
   
 
-  
+  
 
   
 
   
 
   
- 
- 
- 
- 
+ 
+ 
+ 
+ 
   
-  
+  
 
   
 
@@ -163,13 +163,13 @@
   
 
   
- 
- 
- 
- 
- 
+ 
+ 
+ 
+ 
+ 
   
-  
+  
 
   
 
@@ -180,13 +180,13 @@
   
 
   
- 
- 
- 
- 
- 
+ 
+ 
+ 
+ 
+ 
   
-  
+  
 
   
 
@@ -197,14 +197,14 @@
   
 
   
-
-
-
-
+
+
+
+
   
   
-
-
+
+
   
 
   
@@ -216,14 +216,14 @@
   
 
   
-
-
-
-
+
+
+
+
   
   
-
-
+
+
   
 
   
@@ -235,13 +235,13 @@
   
 
   
-
-
-
-
+
+
+
+
   
   
-
+
   
 
   
@@ -253,14 +253,14 @@
   
 
   
-
-
-
-
+
+
+
+
   
   
-
-
+
+
   
 
   
@@ -272,15 +272,15 @@
   
 
   
-
-
-
-
+
+
+
+
   
   
-
-
-
+
+
+
   
 
   
@@ -292,15 +292,15 @@
   
 
   
-
-
-
-
+
+
+
+
   
   
-
-
-
+
+
+
   
 
   
@@ -312,16 +312,16 @@
   
 
   
-
-
-
-
+
+
+
+

[06/11] ant git commit: Revert "Trailing whitespace (cherry-pick 2f64e0b)"

[jaikiran]

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/types/xmlcatalog.xml
--
diff --git a/src/etc/testcases/types/xmlcatalog.xml 
b/src/etc/testcases/types/xmlcatalog.xml
index 0c53666..63269f7 100644
--- a/src/etc/testcases/types/xmlcatalog.xml
+++ b/src/etc/testcases/types/xmlcatalog.xml
@@ -26,120 +26,125 @@
 buildfile is called by
 org.apache.tools.ant.types.XMLCatalogBuildFileTest.java
 Alternatively, you may try it out by hand by first removing the
-comment symbols around the echo statements and then calling
+comment symbols around the echo statements and then calling 
 ant -buildfile xmlcatalog.xml
   
 
-  
+  
 
-  
+  
 
-  
+  
 
+  quiet = "yes"
+  file  = "result.out"/>
 
+  basedir   = "${basedir}"
+  destdir   = "${basedir}"
+  extension = ".text"
+  style = "${transformer}"
+  in= "xmlcatalog1.xml"
+  out   = "result.out">
   
+name   = "outprop"
+expression = "val1"/>
 
-
-
+
+
 
+  quiet = "yes"
+  file  = "result.out"/>
   
 
-  
+  
 
+  quiet = "yes"
+  file  = "result.out"/>
 
+  basedir   = "${basedir}"
+  destdir   = "${basedir}"
+  extension = ".text"
+  style = "${transformer}"
+  in= "xmlcatalog1.xml"
+  out   = "result.out">
   
+name   = "outprop"
+expression = "val2"/>
   
-
+
   
 
-
-
+
+
 
+  quiet = "yes"
+  file  = "result.out"/>
   
 
-  
+  
 
+  quiet = "yes"
+  file  = "result.out"/>
 
+  basedir   = "${basedir}"
+  destdir   = "${basedir}"
+  extension = ".text"
+  style = "${transformer}"
+  in= "xmlcatalog2.xml"
+  out   = "result.out">
   
+name   = "outprop"
+expression = "val3"/>
 
-
-
+
+
 
+  quiet = "yes"
+  file  = "result.out"/>
   
 
-  
+  
 
+  quiet = "yes"
+  file  = "result.out"/>
 
+  basedir   = "${basedir}"
+  destdir   = "${basedir}"
+  extension = ".text"
+  style = "${transformer}"
+  in= "xmlcatalog2.xml"
+  out   = "result.out">
   
+name   = "outprop"
+expression = "val4"/>
   
-
+
   
 
-
-
+
+
 
+  quiet = "yes"
+  file  = "result.out"/>
   
 
 

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/types/xmlcatalog.xsl
--
diff --git a/src/etc/testcases/types/xmlcatalog.xsl 
b/src/etc/testcases/types/xmlcatalog.xsl
index 62621eb..a2c839c 100644
--- a/src/etc/testcases/types/xmlcatalog.xsl
+++ b/src/etc/testcases/types/xmlcatalog.xsl
@@ -15,12 +15,12 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-http://www.w3.org/1999/XSL/Transform";
   version="1.0">
 
   
 
   

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/types/xmlcatalog1.xml
--
diff --git a/src/etc/testcases/types/xmlcatalog1.xml 
b/src/etc/testcases/types/xmlcatalog1.xml
index e4d66e9..d4b5461 100644
--- a/src/etc/testcases/types/xmlcatalog1.xml
+++ b/src/etc/testcases/types/xmlcatalog1.xml
@@ -20,7 +20,7 @@
 ]>
 
   
 
 

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/types/xmlcatalog2.xml
--
diff --git a/src/etc/testcases/types/xmlcatalog2.xml 
b/src/etc/testcases/types/xmlcatalog2.xml
index edf5d2d..9d2bed0 100644
--- a/src/etc/testcases/types/xmlcatalog2.xml
+++ b/src/etc/testcases/types/xmlcatalog2.xml
@@ -17,7 +17,7 @@
 -->
 
   
 
 

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/main/org/apache/tools/ant/antlib.xml
--
diff --git a/src/main/org/apache/tools/ant/antlib.xml 
b/src/main/org/apache/tools/ant/antlib.xml
index f9f219b..8ec6714 100644
--- a/src/main/org/apache/tools/ant/antlib.xml
+++ b/src/main/org/apache/tools/ant/antlib.xml
@@ -90,52 +90,52 @@
 
   
   
+classname="org.apache.tools.ant.types.resources.selectors.And" />
   
+classname="org.apache.tools.ant.types.resources.selectors.Compare" />
   
+classname="org.apache.tools.ant.types.selectors.ContainsSelector" />
   
+classname="org.apache.tools.ant.types.selectors.ContainsRegexpSelector" />
   
+classname="org.apache.tools.ant.types.resources.selectors.Date" />
   
+classname="org.apache.tools.ant.types.resources.selectors.Exists" />
   
+classname="org.apache.tools.ant.types.resources.selectors.InstanceOf" />
   
+classname="org.apache.tools.ant.types.resour

[13/23] ant git commit: Revert "Trailing whitespace"

[jaikiran]

http://git-wip-us.apache.org/repos/asf/ant/blob/84fe46d6/src/tests/antunit/taskdefs/tstamp-test.xml
--
diff --git a/src/tests/antunit/taskdefs/tstamp-test.xml 
b/src/tests/antunit/taskdefs/tstamp-test.xml
index da3b383..c358262 100644
--- a/src/tests/antunit/taskdefs/tstamp-test.xml
+++ b/src/tests/antunit/taskdefs/tstamp-test.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 
-  
+  
 
   
 

http://git-wip-us.apache.org/repos/asf/ant/blob/84fe46d6/src/tests/antunit/taskdefs/untar-test.xml
--
diff --git a/src/tests/antunit/taskdefs/untar-test.xml 
b/src/tests/antunit/taskdefs/untar-test.xml
index 8b3d441..4c04bfe 100644
--- a/src/tests/antunit/taskdefs/untar-test.xml
+++ b/src/tests/antunit/taskdefs/untar-test.xml
@@ -18,12 +18,12 @@
 
 
-  
+  
 
   
 
-
-
+
+
 
   
 

http://git-wip-us.apache.org/repos/asf/ant/blob/84fe46d6/src/tests/antunit/taskdefs/unzip-test.xml
--
diff --git a/src/tests/antunit/taskdefs/unzip-test.xml 
b/src/tests/antunit/taskdefs/unzip-test.xml
index fcb16a9..bdf5f61 100644
--- a/src/tests/antunit/taskdefs/unzip-test.xml
+++ b/src/tests/antunit/taskdefs/unzip-test.xml
@@ -18,10 +18,10 @@
 
 
-  
+  
 
   
-
+
   
 
   
@@ -49,7 +49,8 @@
   
 
   https://issues.apache.org/bugzilla/show_bug.cgi?id=42940";>
+  
description="https://issues.apache.org/bugzilla/show_bug.cgi?id=42940";
+  >
 
 
 
@@ -58,7 +59,8 @@
   
 
   https://issues.apache.org/bugzilla/show_bug.cgi?id=46559";>
+  
description="https://issues.apache.org/bugzilla/show_bug.cgi?id=46559";
+  >
 
 
 

http://git-wip-us.apache.org/repos/asf/ant/blob/84fe46d6/src/tests/antunit/taskdefs/uptodate-test.xml
--
diff --git a/src/tests/antunit/taskdefs/uptodate-test.xml 
b/src/tests/antunit/taskdefs/uptodate-test.xml
index 3851f69..e477803 100644
--- a/src/tests/antunit/taskdefs/uptodate-test.xml
+++ b/src/tests/antunit/taskdefs/uptodate-test.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 
-  
+  
 
   https://issues.apache.org/bugzilla/show_bug.cgi?id=39122

http://git-wip-us.apache.org/repos/asf/ant/blob/84fe46d6/src/tests/antunit/taskdefs/war-test.xml
--
diff --git a/src/tests/antunit/taskdefs/war-test.xml 
b/src/tests/antunit/taskdefs/war-test.xml
index 6c2437f..e264ebd 100644
--- a/src/tests/antunit/taskdefs/war-test.xml
+++ b/src/tests/antunit/taskdefs/war-test.xml
@@ -19,7 +19,7 @@
 
 
-  
+  
 
   
 
@@ -43,10 +43,10 @@
   
 
 
-
+
   
 
-  
@@ -55,62 +55,62 @@
   
 
 
-
+
   
 
   
-
+
 
 
   
 
 
-
+
   
 
   
-
+
 
-
+
   
 
 
-
+
   
 
   
-
+
 
-
+
   
 
 
-
+
   
 
 
   
-
+
   
   
   
 
 
-
+
   
 
   
-
-
+
+
   
   
   
 
 
-
+
 
   
 
@@ -124,15 +124,15 @@
   
 
 
-
+
 
-  
+  
 
   
 
   
 
-  
+  
 
   
 
@@ -151,7 +151,7 @@
   
 
 
-
+
   
 
   
@@ -159,7 +159,7 @@
   
 
 
-
+
   
 
   

http://git-wip-us.apache.org/repos/asf/ant/blob/84fe46d6/src/tests/antunit/taskdefs/whichresource-test.xml
--
diff --git a/src/tests/antunit/taskdefs/whichresource-test.xml 
b/src/tests/antunit/taskdefs/whichresource-test.xml
index c78d405..6bf5a88 100644
--- a/src/tests/antunit/taskdefs/whichresource-test.xml
+++ b/src/tests/antunit/taskdefs/whichresource-test.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 
-  
+  
 
   
 
@@ -24,7 +24,7 @@
 
 
   
-
+  
   
 
 
   
-
+
 

http://git-wip-us.apache.org/repos/asf/ant/blob/84fe46d6/src/tests/antunit/taskdefs/xmlproperty-test.xml
--
diff --git a/src/tests/antunit/taskdefs/xmlproperty-test.xml 
b/src/tests/antunit/taskdefs/xmlproperty-test.xml
index 1afd0ba..5be0420 100644
--- a/src/tests/antunit/taskdefs/xmlproperty-test.xml
+++ b/src/tests/antunit/taskdefs/xmlproperty-test.xml
@@ -18,7 +18,7 @@
 
   
 
-  
+  
 
   
 
@@ -141,3 +141,4 @@
  
value="${b.c.loc}${path.separator}${glob.dot.jar}"/>
   
 
+

http://git-wip-us.apache.org/repos/asf/ant/blob/84fe46d6/src/tests/antunit/taskdefs/xmlproperty.multi.xml
--
diff --git a/src/tests/antunit/taskdefs/xmlproperty.multi.xml 
b/src/tests/antunit/taskdefs/xmlproperty.multi.

[21/23] ant git commit: Revert "Trailing whitespace"

[jaikiran]

http://git-wip-us.apache.org/repos/asf/ant/blob/84fe46d6/src/etc/testcases/core/extended-taskdef.xml
--
diff --git a/src/etc/testcases/core/extended-taskdef.xml 
b/src/etc/testcases/core/extended-taskdef.xml
index 0d63ea8..58ca979 100644
--- a/src/etc/testcases/core/extended-taskdef.xml
+++ b/src/etc/testcases/core/extended-taskdef.xml
@@ -24,7 +24,7 @@
   
   
 
-  
+  
 
   import org.apache.tools.ant.BuildException;
 
@@ -67,7 +67,7 @@
   
 
-
+
   
 
 

http://git-wip-us.apache.org/repos/asf/ant/blob/84fe46d6/src/etc/testcases/core/immutable.xml
--
diff --git a/src/etc/testcases/core/immutable.xml 
b/src/etc/testcases/core/immutable.xml
index 64cda00..26fda08 100644
--- a/src/etc/testcases/core/immutable.xml
+++ b/src/etc/testcases/core/immutable.xml
@@ -56,19 +56,19 @@
 
   
 
-
+
   
-
-
-
-
+
+
+
+
   
 
   
 
   
 
-  
+  
 
   
 

http://git-wip-us.apache.org/repos/asf/ant/blob/84fe46d6/src/etc/testcases/core/loaderref/loaderref.xml
--
diff --git a/src/etc/testcases/core/loaderref/loaderref.xml 
b/src/etc/testcases/core/loaderref/loaderref.xml
index ed95beb..8397497 100644
--- a/src/etc/testcases/core/loaderref/loaderref.xml
+++ b/src/etc/testcases/core/loaderref/loaderref.xml
@@ -36,7 +36,7 @@ This build file is intended to be used for testing Ant
 
   
 
-  
+  
 http://git-wip-us.apache.org/repos/asf/ant/blob/84fe46d6/src/etc/testcases/core/location.xml
--
diff --git a/src/etc/testcases/core/location.xml 
b/src/etc/testcases/core/location.xml
index 324d442..7e8f639 100644
--- a/src/etc/testcases/core/location.xml
+++ b/src/etc/testcases/core/location.xml
@@ -37,11 +37,11 @@
 
   
 
+  location="../../../../build/testcases" />
 
   
-
+
 
   
 
@@ -71,4 +71,4 @@
 
   
 
-
+
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ant/blob/84fe46d6/src/etc/testcases/core/taskcontainer.xml
--
diff --git a/src/etc/testcases/core/taskcontainer.xml 
b/src/etc/testcases/core/taskcontainer.xml
index c3f3054..4a21373 100644
--- a/src/etc/testcases/core/taskcontainer.xml
+++ b/src/etc/testcases/core/taskcontainer.xml
@@ -18,11 +18,11 @@
 
 
   
-
+  
   
 This build file is supposed to be run by a Unit test
   
-
+ 
 
   
 
@@ -36,7 +36,7 @@
 
 
 
-
+
   
   
 
@@ -49,14 +49,14 @@
   
 
   
-
-
-hello
-
-   world
-
-  
-
-
+  
+  
+hello  
+  
+   world  
+  
+
+
+  
 

http://git-wip-us.apache.org/repos/asf/ant/blob/84fe46d6/src/etc/testcases/core/topleveltasks/notarget.xml
--
diff --git a/src/etc/testcases/core/topleveltasks/notarget.xml 
b/src/etc/testcases/core/topleveltasks/notarget.xml
index 9ce0239..2543751 100644
--- a/src/etc/testcases/core/topleveltasks/notarget.xml
+++ b/src/etc/testcases/core/topleveltasks/notarget.xml
@@ -16,6 +16,6 @@
limitations under the License.
 -->
 
-  
-  
+  
+  
 

http://git-wip-us.apache.org/repos/asf/ant/blob/84fe46d6/src/etc/testcases/core/topleveltasks/targetlevelant.xml
--
diff --git a/src/etc/testcases/core/topleveltasks/targetlevelant.xml 
b/src/etc/testcases/core/topleveltasks/targetlevelant.xml
index 61229f9..9b1bb1d 100644
--- a/src/etc/testcases/core/topleveltasks/targetlevelant.xml
+++ b/src/etc/testcases/core/topleveltasks/targetlevelant.xml
@@ -17,6 +17,6 @@
 -->
 
   
-
+
   
 

http://git-wip-us.apache.org/repos/asf/ant/blob/84fe46d6/src/etc/testcases/core/topleveltasks/toplevelant.xml
--
diff --git a/src/etc/testcases/core/topleveltasks/toplevelant.xml 
b/src/etc/testcases/core/topleveltasks/toplevelant.xml
index 67a5cae..968ad6c 100644
--- a/src/etc/testcases/core/topleveltasks/toplevelant.xml
+++ b/src/etc/testcases/core/topleveltasks/toplevelant.xml
@@ -16,6 +16,6 @@
limitations under the License.
 -->
 
-  
-  
+  
+  
 

http://git-wip-us.apache.org/repos/asf/ant/blob/84fe46d6/src/etc/testcases/core/unknownelement.xml
--
diff --git a/src/etc/testcases/core/unknownelement.xml 
b/src/etc/testcases/core/unknownelement.xml
index fec8f18..b6d8939 100644
--- a/src/etc/testcases/core/unknownelement.xml
+++ b/src/etc/testcases/core/unknownelement.xml
@@ -17,7 +17,7 @@
 -->
 
   
-
   

http://git-wip-us.apache.org/repos/asf/ant/blob/84fe

[20/23] ant git commit: Revert "Trailing whitespace"

[jaikiran]

http://git-wip-us.apache.org/repos/asf/ant/blob/84fe46d6/src/etc/testcases/taskdefs/fail.xml
--
diff --git a/src/etc/testcases/taskdefs/fail.xml 
b/src/etc/testcases/taskdefs/fail.xml
index a5d88d1..0a6561e 100644
--- a/src/etc/testcases/taskdefs/fail.xml
+++ b/src/etc/testcases/taskdefs/fail.xml
@@ -29,23 +29,23 @@
   
 testText
   
-
+  
   
-
+
   
 
   
-
+
   
 
   
 
   
-
+  
   
 
   
-  
+  
   
 
   
@@ -53,7 +53,7 @@
   
 
   
-  
+  
   
 
   
@@ -61,7 +61,7 @@
   
 
   
-  
+  
   
 
   
@@ -69,7 +69,7 @@
   
 
   
-  
+  
   
 
   
@@ -77,7 +77,7 @@
   
 
   
-  
+  
   
 
   
@@ -85,7 +85,7 @@
   
 
   
-  
+  
   
 
   
@@ -93,10 +93,10 @@
   
 
   
-  
+  
   
   
-  
+  
   
 
   
@@ -104,7 +104,7 @@
   
 
   
-  
+  
   
 testNested6
 testNested6
@@ -114,15 +114,15 @@ testNested6
 
   
 
-  
+  
 
   
 
   
 
   
-  
-  
+  
+  
   
 
   

http://git-wip-us.apache.org/repos/asf/ant/blob/84fe46d6/src/etc/testcases/taskdefs/filter.xml
--
diff --git a/src/etc/testcases/taskdefs/filter.xml 
b/src/etc/testcases/taskdefs/filter.xml
index d4a7525..303efa7 100644
--- a/src/etc/testcases/taskdefs/filter.xml
+++ b/src/etc/testcases/taskdefs/filter.xml
@@ -35,38 +35,38 @@
   
 
   
-
-
+
+
   
 
   
-
+
 
-  
+  
 
   
 
   
-
-
+
+
   
 
   
-
+
 
   
 
   
 
   
-
+
 
   
 
   
 
   
-
+
   
 
 

http://git-wip-us.apache.org/repos/asf/ant/blob/84fe46d6/src/etc/testcases/taskdefs/fixcrlf/build.xml
--
diff --git a/src/etc/testcases/taskdefs/fixcrlf/build.xml 
b/src/etc/testcases/taskdefs/fixcrlf/build.xml
index e36ea00..e2fecac 100644
--- a/src/etc/testcases/taskdefs/fixcrlf/build.xml
+++ b/src/etc/testcases/taskdefs/fixcrlf/build.xml
@@ -19,23 +19,23 @@
   
 
   
-
+
 
 
-
+
   
 
 
   
-
-
-
-
+
+
+
+
 
   
 
   
-
+
   
 
   
@@ -45,82 +45,82 @@
   
 
-
+ javafiles="true" tab="add" eol="crlf" eof="asis" />
+
   
 
   
 
-
+ javafiles="true" tab="add" cr="add" eol="crlf" eof="asis" />
+
   
 
   
 
-
+ javafiles="true" tab="remove" eol="lf" eof="asis" />
+
   
 
   
 
-
+ javafiles="true" tab="remove" eol="lf" eof="asis" />
+
   
 
   
 
-
+ tab="remove" eol="lf" eof="asis" />
+
   
 
   
 
-
+ tab="add" cr="remove" eol="crlf" eof="asis" />
+
   
 
   
 
-
+ tab="add" cr="add" eof="asis" />
+
   
 
   
 
-
+ javafiles="true" tab="add" cr="add" eof="add" />
+
   
 
   
 
-
+ javafiles="true" tab="remove" cr="remove" eof="remove" />
+
   
 
   
 
-
+ includes="Mac2Unix" eol="lf" />
+
   
 
   
-
+
 
+ javafiles="true" tab="add" eol="crlf" eof="asis" />
 Q
   
 
   
-
+
   
 
   
@@ -130,74 +130,74 @@
   
 
+ javafiles="false" cr="remove" encoding="UnicodeBig" />
 
+ file2="${input}/expected/input.lf.utf16" />
   
 
   
 
+ outputencoding="ascii" />
 
+ file2="${input}/expected/input.lf.ascii" />
   
 
   
 
+ javafiles="false" cr="remove" />
 
+ file2="${input}/expected/longlines.lf" />
   
 
   
 
+ includes="crcrlf" eol="lf" />
 
+ file2="${input}/expected/crcrlf.unix" />
   
 
   
 
+ includes="crcrlf" eol="crlf" />
 
+ file2="${input}/expected/crcrlf.dos" />
   
 
   
 
+ includes="crcrlf" eol="cr" />
 
+ file2="${input}/expected/crcrlf.mac" />
   
 
   
 
+ includes="fixlastfalse.lf" eol="crlf" />
 
+ file2="${input}/expected/fixlast.dos" />
   
 
   
 
+ includes="fixlastfalse.lf" eol="cr" fixlast="false" />
 
+ file2="${input}/expected/fixlastfalse.mac" />
   
 
   
   
-
+
   
 
   
-
+
 
   
 
-  
+  
 
   
 
@@ -209,123 +209,123 @@
 
   
 
+ preservelastmodified="true" />
 
   
 
   
+ 

[05/23] ant git commit: Revert "Trailing whitespace (cherry-pick 2f64e0b)"

[jaikiran]

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/tests/antunit/taskdefs/condition/resourcecontains-test.xml
--
diff --git a/src/tests/antunit/taskdefs/condition/resourcecontains-test.xml 
b/src/tests/antunit/taskdefs/condition/resourcecontains-test.xml
index 0c946ea..11c6a9e 100644
--- a/src/tests/antunit/taskdefs/condition/resourcecontains-test.xml
+++ b/src/tests/antunit/taskdefs/condition/resourcecontains-test.xml
@@ -48,15 +48,15 @@
 
   
 
-  
+  
 
   
 
   
-
+
 
   
+substring="${testContainsEmptyProperty}" />
 
   
 
@@ -81,7 +81,7 @@
   
 
   
-
+
 
   
 
@@ -105,7 +105,7 @@
 
   
 
-  
+  
 
 
   
@@ -118,7 +118,7 @@
 HEADER
 FOOTER
 foo
-
+
 bar
   
 
@@ -129,7 +129,7 @@
 
   
 
-  
+  
 
 
   

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/tests/antunit/taskdefs/copy-test.xml
--
diff --git a/src/tests/antunit/taskdefs/copy-test.xml 
b/src/tests/antunit/taskdefs/copy-test.xml
index 45065ca..1fd4b59 100644
--- a/src/tests/antunit/taskdefs/copy-test.xml
+++ b/src/tests/antunit/taskdefs/copy-test.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 
-  
+  
 
   
 
@@ -194,7 +194,8 @@ public class NullByteStreamResource extends Resource {
   
 
   https://issues.apache.org/bugzilla/show_bug.cgi?id=43574";>
+  
description="https://issues.apache.org/bugzilla/show_bug.cgi?id=43574";
+  >
 
 
 
@@ -215,16 +216,16 @@ public class NullByteStreamResource extends Resource {
 
 
   
-
-
+
+
   
 
 
 
 
   
-
-
+
+
   
 
 
@@ -243,8 +244,8 @@ public class NullByteStreamResource extends Resource {
   
 
 
-
-
+
+   
   
 
   
@@ -410,7 +411,8 @@ public class NullByteStreamResource extends Resource {
   
 
   https://issues.apache.org/bugzilla/show_bug.cgi?id=49756";>
+  
description="https://issues.apache.org/bugzilla/show_bug.cgi?id=49756";
+  >
 
 
 
@@ -476,8 +478,8 @@ public class NullByteStreamResource extends Resource {
 
 
   
-
-
+   
+   
   
 
 

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/tests/antunit/taskdefs/cvs/cvs.xml
--
diff --git a/src/tests/antunit/taskdefs/cvs/cvs.xml 
b/src/tests/antunit/taskdefs/cvs/cvs.xml
index e1101ea..564e587 100644
--- a/src/tests/antunit/taskdefs/cvs/cvs.xml
+++ b/src/tests/antunit/taskdefs/cvs/cvs.xml
@@ -20,7 +20,7 @@
  requires a working CVS client. -->
 
 
-  
+  
 
   
   

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/tests/antunit/taskdefs/defaultexcludes-test.xml
--
diff --git a/src/tests/antunit/taskdefs/defaultexcludes-test.xml 
b/src/tests/antunit/taskdefs/defaultexcludes-test.xml
index 6e1c36c..cbea93c 100644
--- a/src/tests/antunit/taskdefs/defaultexcludes-test.xml
+++ b/src/tests/antunit/taskdefs/defaultexcludes-test.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 
-  
+  
 
   
 

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/tests/antunit/taskdefs/delete-and-symlinks-test.xml
--
diff --git a/src/tests/antunit/taskdefs/delete-and-symlinks-test.xml 
b/src/tests/antunit/taskdefs/delete-and-symlinks-test.xml
index 6d652cb..ac78994 100644
--- a/src/tests/antunit/taskdefs/delete-and-symlinks-test.xml
+++ b/src/tests/antunit/taskdefs/delete-and-symlinks-test.xml
@@ -18,11 +18,11 @@
 
 
-
-  
+  
+  
 
   
-
+
   
 
   

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/tests/antunit/taskdefs/delete-test.xml
--
diff --git a/src/tests/antunit/taskdefs/delete-test.xml 
b/src/tests/antunit/taskdefs/delete-test.xml
index 73355cb..554f08f 100644
--- a/src/tests/antunit/taskdefs/delete-test.xml
+++ b/src/tests/antunit/taskdefs/delete-test.xml
@@ -18,8 +18,8 @@
 
 
-
-  
+  
+  
 
   
   
@@ -36,13 +36,13 @@

 
 
-
-
+
+  
 

 
 
-
+
 
 
 
@@ -53,7 +53,7 @@
 
 
 
-
+
 
 
 
@@ -63,13 +63,13 @@
 
 
 
-
+
 
   
 
   
 
-  
+  
 
   
 
@@ -79,7 +79,7 @@
  resource="${output}/foo"/>
 
 
-
+
   
 
   
@@ -92,11 +92,12 @@
 
 
-
+
   
 
   https://issues.apache.org/bugzilla/show_bug.cgi?id=43574";>
+  
description="https://issues.apache.org/bugzilla/show_bug.cgi?id=43574";
+ 

[11/23] ant git commit: Revert "Trailing whitespace (cherry-pick 2f64e0b)"

[jaikiran]

Revert "Trailing whitespace (cherry-pick 2f64e0b)"

This reverts commit 7df9120ebc1f9bee97a6a1a47f0a5fda986e4ab0.
Discussion in ant dev mailing list 
https://www.mail-archive.com/dev@ant.apache.org/msg47356.html


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/9b1b8dbb
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/9b1b8dbb
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/9b1b8dbb

Branch: refs/heads/master
Commit: 9b1b8dbbc6e9aa98922da28683f3773f586811e5
Parents: 7df9120
Author: Jaikiran Pai 
Authored: Sat Jul 7 16:29:31 2018 +0530
Committer: Jaikiran Pai 
Committed: Sat Jul 7 16:30:03 2018 +0530

--
 src/etc/ant-update.xsl  |  20 +-
 src/etc/changelog.xsl   |  18 +-
 .../checkstyle-frames-sortby-check.xsl  | 188 +++
 src/etc/checkstyle/checkstyle-frames.xsl|   6 +-
 src/etc/checkstyle/checkstyle-text.xsl  |   1 +
 src/etc/checkstyle/checkstyle-xdoc.xsl  |   3 +-
 src/etc/common2master.xsl   |  11 +-
 src/etc/coverage-frames.xsl |   2 +-
 src/etc/jdepend-frames.xsl  |   2 +-
 src/etc/jdepend.xsl |  46 +-
 src/etc/junit-frames-xalan1.xsl |  28 +-
 src/etc/junit-frames.xsl|   8 +-
 src/etc/junit-noframes.xsl  |  18 +-
 src/etc/log.xsl |  20 +-
 src/etc/maudit-frames.xsl   |   2 +-
 src/etc/mmetrics-frames.xsl |   2 +-
 src/etc/performance/build.xml   |   4 +-
 src/etc/performance/dirscanner.xml  |   4 +-
 src/etc/poms/ant-apache-log4j/pom.xml   |   4 +-
 src/etc/poms/ant-apache-regexp/pom.xml  |   4 +-
 src/etc/poms/ant-apache-resolver/pom.xml|   2 +-
 src/etc/poms/ant-apache-xalan2/pom.xml  |   6 +-
 src/etc/poms/ant-commons-logging/pom.xml|   2 +-
 src/etc/poms/ant-commons-net/pom.xml|   2 +-
 src/etc/poms/ant-javamail/pom.xml   |   6 +-
 src/etc/poms/ant-jdepend/pom.xml|   2 +-
 src/etc/poms/ant-jmf/pom.xml|   4 +-
 src/etc/poms/ant-jsch/pom.xml   |   4 +-
 src/etc/poms/ant-junit/pom.xml  |   6 +-
 src/etc/poms/ant-netrexx/pom.xml|   4 +-
 src/etc/poms/ant-swing/pom.xml  |   4 +-
 src/etc/poms/ant-testutil/pom.xml   |   4 +-
 src/etc/tagdiff.xsl |  20 +-
 src/etc/testcases/buildfiletest-base.xml|   2 +-
 src/etc/testcases/core/directoryscanner.xml |   2 +-
 src/etc/testcases/core/dispatch/dispatch.xml|   6 +-
 src/etc/testcases/core/executor.xml |   2 +-
 src/etc/testcases/core/extended-taskdef.xml |   4 +-
 src/etc/testcases/core/immutable.xml|  12 +-
 src/etc/testcases/core/loaderref/loaderref.xml  |   2 +-
 src/etc/testcases/core/location.xml |   6 +-
 src/etc/testcases/core/taskcontainer.xml|  26 +-
 .../testcases/core/topleveltasks/notarget.xml   |   4 +-
 .../core/topleveltasks/targetlevelant.xml   |   2 +-
 .../core/topleveltasks/toplevelant.xml  |   4 +-
 src/etc/testcases/core/unknownelement.xml   |   2 +-
 src/etc/testcases/filters/build.xml |  26 +-
 src/etc/testcases/filters/concat.xml|   2 +-
 src/etc/testcases/filters/dynamicfilter.xml |  12 +-
 src/etc/testcases/filters/head-tail.xml |   6 +-
 src/etc/testcases/filters/tokenfilter.xml   |  20 +-
 src/etc/testcases/taskdefs/abstractcvstask.xml  |   6 +-
 src/etc/testcases/taskdefs/ant.xml  |  84 +--
 src/etc/testcases/taskdefs/ant/ant.xml  |   6 +-
 src/etc/testcases/taskdefs/ant/references.xml   |   4 +-
 src/etc/testcases/taskdefs/antlib.xml   |  12 +-
 src/etc/testcases/taskdefs/available.xml|  62 +--
 src/etc/testcases/taskdefs/basename.xml |   4 +-
 src/etc/testcases/taskdefs/bunzip2.xml  |   2 +-
 src/etc/testcases/taskdefs/bzip2.xml|   4 +-
 src/etc/testcases/taskdefs/checksum.xml | 108 ++--
 src/etc/testcases/taskdefs/classloader.xml  |  18 +-
 src/etc/testcases/taskdefs/concat.xml   |  14 +-
 src/etc/testcases/taskdefs/condition.xml| 232 -
 .../taskdefs/conditions/antversion.xml  |  12 +-
 .../testcases/taskdefs/conditions/isfailure.xml |  36 +-
 .../testcases/taskdefs/conditions/issigned.xml  |   2 +-
 .../taskdefs/conditions/parsersupports.xml  |  17 +-
 .../testcases/taskdefs/conditions/typefound.xml |   4 +-
 src/etc/testcases/taskdefs/conditions/xor.xml   |  48 +-
 src/etc/testcases/taskdefs/copy.xml |  38 +-
 src/etc/testcases/taskdefs/copydir.xml  |  10 +-
 src/etc/testcases/taskdefs/co

[02/23] ant git commit: Revert "Trailing whitespace (cherry-pick 2f64e0b)"

[jaikiran]

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/tests/antunit/taskdefs/truncate/truncate-test.xml
--
diff --git a/src/tests/antunit/taskdefs/truncate/truncate-test.xml 
b/src/tests/antunit/taskdefs/truncate/truncate-test.xml
index 717df99..86f896c 100644
--- a/src/tests/antunit/taskdefs/truncate/truncate-test.xml
+++ b/src/tests/antunit/taskdefs/truncate/truncate-test.xml
@@ -20,98 +20,98 @@
 
   
 
-  
+  
 
   
 
   
-
-
-
+
+
+
   
 
   
-
+
 
-  
+  
 
   
 
   
-
+
 
-  
+  
 
   
 
   
-
+
 
-  
+  
 
-
+
 
-  
+  
 
   
 
   
-
+
 
-  
+  
 
-
+
 
-  
+  
 
   
 
   
-
+
 
   
-
-
+
+
   
 
   
 
   
-
+
 
-  
+  
 
-
+
 
-  
+  
 
   
 
   
-
-
-
+
+
+
   
 
   
-
-
+
+
 
-  
+  
 
   
 
   
 
   
-
-
+
+
   
 
 
   
-
-
+
+
   
 
   
@@ -119,26 +119,26 @@
   
 
   
-
+
   
 
   
 
   
 
-  
+  
 
   
 
   
 
-  
+  
 
   
 
   
 
-  
+  
 
   
 

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/tests/antunit/taskdefs/tstamp-test.xml
--
diff --git a/src/tests/antunit/taskdefs/tstamp-test.xml 
b/src/tests/antunit/taskdefs/tstamp-test.xml
index 67dc4ae..c9bebf8 100644
--- a/src/tests/antunit/taskdefs/tstamp-test.xml
+++ b/src/tests/antunit/taskdefs/tstamp-test.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 
-  
+  
 
   
 

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/tests/antunit/taskdefs/unzip-test.xml
--
diff --git a/src/tests/antunit/taskdefs/unzip-test.xml 
b/src/tests/antunit/taskdefs/unzip-test.xml
index fcb16a9..bdf5f61 100644
--- a/src/tests/antunit/taskdefs/unzip-test.xml
+++ b/src/tests/antunit/taskdefs/unzip-test.xml
@@ -18,10 +18,10 @@
 
 
-  
+  
 
   
-
+
   
 
   
@@ -49,7 +49,8 @@
   
 
   https://issues.apache.org/bugzilla/show_bug.cgi?id=42940";>
+  
description="https://issues.apache.org/bugzilla/show_bug.cgi?id=42940";
+  >
 
 
 
@@ -58,7 +59,8 @@
   
 
   https://issues.apache.org/bugzilla/show_bug.cgi?id=46559";>
+  
description="https://issues.apache.org/bugzilla/show_bug.cgi?id=46559";
+  >
 
 
 

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/tests/antunit/taskdefs/uptodate-test.xml
--
diff --git a/src/tests/antunit/taskdefs/uptodate-test.xml 
b/src/tests/antunit/taskdefs/uptodate-test.xml
index 3851f69..e477803 100644
--- a/src/tests/antunit/taskdefs/uptodate-test.xml
+++ b/src/tests/antunit/taskdefs/uptodate-test.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 
-  
+  
 
   https://issues.apache.org/bugzilla/show_bug.cgi?id=39122

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/tests/antunit/taskdefs/war-test.xml
--
diff --git a/src/tests/antunit/taskdefs/war-test.xml 
b/src/tests/antunit/taskdefs/war-test.xml
index 6c2437f..e264ebd 100644
--- a/src/tests/antunit/taskdefs/war-test.xml
+++ b/src/tests/antunit/taskdefs/war-test.xml
@@ -19,7 +19,7 @@
 
 
-  
+  
 
   
 
@@ -43,10 +43,10 @@
   
 
 
-
+
   
 
-  
@@ -55,62 +55,62 @@
   
 
 
-
+
   
 
   
-
+
 
 
   
 
 
-
+
   
 
   
-
+
 
-
+
   
 
 
-
+
   
 
   
-
+
 
-
+
   
 
 
-
+
   
 
 
   
-
+
   
   
   
 
 
-
+
   
 
   
-
-
+
+
   
   
   
 
 
-
+
 
   
 
@@ -124,15 +124,15 @@
   
 
 
-
+
 
-  
+  
 
   
 
   
 
-  
+  
 
   
 
@@ -151,7 +151,7 @@
   
 
 
-
+
   
 
   
@@ -159,7 +159,7 @@
   
 
 
-
+
   
 
   

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/tests/antunit/taskdefs/whichresource-test.xml
--
diff --git a/src/tests/antunit/taskdefs/whichresource-test.xml 
b/src/tests/antunit/taskdefs/whichresource-test.xml
index c78d405..6bf5a88 100644
--- a/src/tests/antunit/taskdefs/whichresource-test.xml
+++ b/src/tests/antunit/taskdefs/whichresource-test.xml
@@ -16,7 +16,7 @@
   limitatio

[22/23] ant git commit: Revert "Trailing whitespace"

[jaikiran]

Revert "Trailing whitespace"

This reverts commit 2f64e0b51c295960cb15aa77c7c1f447b2518e14.
Discussion in ant dev mailing list 
https://www.mail-archive.com/dev@ant.apache.org/msg47356.html


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/84fe46d6
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/84fe46d6
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/84fe46d6

Branch: refs/heads/master
Commit: 84fe46d669ce0a723802fb6a634a8d1ee20181dc
Parents: 4ce54bf
Author: Jaikiran Pai 
Authored: Sat Jul 7 16:41:01 2018 +0530
Committer: Jaikiran Pai 
Committed: Sat Jul 7 16:41:01 2018 +0530

--
 WHATSNEW|   2 +-
 src/etc/ant-update.xsl  |  18 +-
 src/etc/changelog.xsl   |  18 +-
 .../checkstyle-frames-sortby-check.xsl  | 188 +++
 src/etc/checkstyle/checkstyle-frames.xsl|   6 +-
 src/etc/checkstyle/checkstyle-text.xsl  |   1 +
 src/etc/checkstyle/checkstyle-xdoc.xsl  |   3 +-
 src/etc/common2master.xsl   |  11 +-
 src/etc/coverage-frames.xsl |   2 +-
 src/etc/jdepend-frames.xsl  |   2 +-
 src/etc/jdepend.xsl |  44 +-
 src/etc/junit-frames-saxon.xsl  |   6 +-
 src/etc/junit-frames-xalan1.xsl |   6 +-
 src/etc/junit-frames.xsl|   8 +-
 src/etc/junit-noframes-saxon.xsl|  14 +-
 src/etc/junit-noframes.xsl  |  14 +-
 src/etc/log.xsl |  20 +-
 src/etc/maudit-frames.xsl   |   2 +-
 src/etc/mmetrics-frames.xsl |   2 +-
 src/etc/performance/build.xml   |   4 +-
 src/etc/performance/dirscanner.xml  |   4 +-
 src/etc/poms/ant-apache-log4j/pom.xml   |   4 +-
 src/etc/poms/ant-apache-regexp/pom.xml  |   4 +-
 src/etc/poms/ant-apache-resolver/pom.xml|   2 +-
 src/etc/poms/ant-apache-xalan2/pom.xml  |   6 +-
 src/etc/poms/ant-commons-logging/pom.xml|   2 +-
 src/etc/poms/ant-commons-net/pom.xml|   2 +-
 src/etc/poms/ant-javamail/pom.xml   |   6 +-
 src/etc/poms/ant-jdepend/pom.xml|   2 +-
 src/etc/poms/ant-jmf/pom.xml|   4 +-
 src/etc/poms/ant-jsch/pom.xml   |   4 +-
 src/etc/poms/ant-junit/pom.xml  |   6 +-
 src/etc/poms/ant-netrexx/pom.xml|   4 +-
 src/etc/poms/ant-swing/pom.xml  |   2 +-
 src/etc/poms/ant-testutil/pom.xml   |   2 +-
 src/etc/poms/ant-xz/pom.xml |   2 +-
 src/etc/tagdiff.xsl |  20 +-
 src/etc/testcases/buildfiletest-base.xml|   2 +-
 src/etc/testcases/core/directoryscanner.xml |   2 +-
 src/etc/testcases/core/dispatch/dispatch.xml|   6 +-
 src/etc/testcases/core/executor.xml |   2 +-
 src/etc/testcases/core/extended-taskdef.xml |   4 +-
 src/etc/testcases/core/immutable.xml|  12 +-
 src/etc/testcases/core/loaderref/loaderref.xml  |   2 +-
 src/etc/testcases/core/location.xml |   6 +-
 src/etc/testcases/core/taskcontainer.xml|  26 +-
 .../testcases/core/topleveltasks/notarget.xml   |   4 +-
 .../core/topleveltasks/targetlevelant.xml   |   2 +-
 .../core/topleveltasks/toplevelant.xml  |   4 +-
 src/etc/testcases/core/unknownelement.xml   |   2 +-
 src/etc/testcases/filters/concat.xml|   2 +-
 src/etc/testcases/filters/dynamicfilter.xml |  12 +-
 src/etc/testcases/filters/tokenfilter.xml   |  16 +-
 src/etc/testcases/taskdefs/abstractcvstask.xml  |   6 +-
 src/etc/testcases/taskdefs/ant.xml  |  84 +--
 src/etc/testcases/taskdefs/ant/ant.xml  |   6 +-
 src/etc/testcases/taskdefs/ant/references.xml   |   4 +-
 src/etc/testcases/taskdefs/antlib.xml   |  12 +-
 src/etc/testcases/taskdefs/available.xml|  62 +--
 src/etc/testcases/taskdefs/basename.xml |   4 +-
 src/etc/testcases/taskdefs/bunzip2.xml  |   2 +-
 src/etc/testcases/taskdefs/bzip2.xml|   4 +-
 src/etc/testcases/taskdefs/checksum.xml | 108 ++--
 src/etc/testcases/taskdefs/classloader.xml  |  18 +-
 src/etc/testcases/taskdefs/concat.xml   |  14 +-
 src/etc/testcases/taskdefs/condition.xml| 232 -
 .../taskdefs/conditions/antversion.xml  |  12 +-
 .../testcases/taskdefs/conditions/isfailure.xml |  36 +-
 .../testcases/taskdefs/conditions/issigned.xml  |   2 +-
 .../taskdefs/conditions/parsersupports.xml  |  17 +-
 .../testcases/taskdefs/conditions/typefound.xml |   4 +-
 src/etc/testcases/taskdefs/conditions/xor.xml   |  48 +-
 src/etc/testcases/taskdefs/copy.xml |  38 +

[23/23] ant git commit: Merge branch '1.9.x' branch into master

[jaikiran]

Merge branch '1.9.x' branch into master


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/995b518a
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/995b518a
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/995b518a

Branch: refs/heads/master
Commit: 995b518abf60dd8cd52f9e94c4186bbf78513b96
Parents: 84fe46d 9b1b8db
Author: Jaikiran Pai 
Authored: Sat Jul 7 17:39:35 2018 +0530
Committer: Jaikiran Pai 
Committed: Sat Jul 7 17:39:35 2018 +0530

--
 src/etc/ant-update.xsl  |  2 +-
 src/etc/jdepend.xsl |  2 +-
 src/etc/junit-frames-xalan1.xsl | 22 ++--
 src/etc/junit-noframes.xsl  |  4 ++--
 src/etc/poms/ant-javamail/pom.xml   |  2 +-
 src/etc/testcases/filters/build.xml | 14 ++---
 src/etc/testcases/filters/head-tail.xml |  6 +++---
 src/etc/testcases/filters/tokenfilter.xml   |  4 ++--
 src/etc/testcases/taskdefs/delete.xml   |  4 +++-
 src/etc/testcases/taskdefs/jar.xml  | 21 ---
 src/etc/testcases/taskdefs/loadfile.xml |  6 +++---
 .../testcases/taskdefs/optional/javah/build.xml | 16 +++---
 src/etc/testcases/taskdefs/optional/pvcs.xml|  9 +++-
 src/etc/testcases/taskdefs/optional/script.xml  |  4 ++--
 .../taskdefs/optional/xalan-redirect-in.xsl | 10 -
 src/etc/testcases/taskdefs/typedef.xml  |  4 ++--
 src/tests/antunit/core/extension/module1.xml|  8 +++
 src/tests/antunit/taskdefs/concat-test.xml  | 10 -
 src/tests/antunit/taskdefs/get-test.xml |  2 +-
 .../antunit/taskdefs/optional/javah-test.xml|  4 ++--
 src/tests/antunit/taskdefs/rmic-test.xml|  2 +-
 21 files changed, 81 insertions(+), 75 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/995b518a/src/etc/poms/ant-javamail/pom.xml
--
diff --cc src/etc/poms/ant-javamail/pom.xml
index f35c8e8,328168b..c34fd5b
--- a/src/etc/poms/ant-javamail/pom.xml
+++ b/src/etc/poms/ant-javamail/pom.xml
@@@ -47,10 -47,16 +47,10 @@@ xsi:schemaLocation="http://maven.apache
  
javax.mail
javax.mail-api
 -  1.5.6
 +  1.6.1
compile
  
 -
 -  javax.activation
 -  activation
 -  1.1.1
 -  compile
 -
--   
++  

  


http://git-wip-us.apache.org/repos/asf/ant/blob/995b518a/src/etc/testcases/filters/build.xml
--
diff --cc src/etc/testcases/filters/build.xml
index 39d1bcf,b70b778..f908bb8
--- a/src/etc/testcases/filters/build.xml
+++ b/src/etc/testcases/filters/build.xml
@@@ -16,13 -16,12 +16,13 @@@
 limitations under the License.
  -->
  
 +

 +

- 
+ 

  
 -

  

@@@ -91,12 -90,12 +91,12 @@@

  

 -
 -  
 +
 +  

- 
+   

 -
 +

  


http://git-wip-us.apache.org/repos/asf/ant/blob/995b518a/src/etc/testcases/filters/head-tail.xml
--
diff --cc src/etc/testcases/filters/head-tail.xml
index 3a8bc91,e0ffed7..3775a1a
--- a/src/etc/testcases/filters/head-tail.xml
+++ b/src/etc/testcases/filters/head-tail.xml
@@@ -20,9 -20,10 +20,9 @@@

  

- 
+ 

  
 -

  


http://git-wip-us.apache.org/repos/asf/ant/blob/995b518a/src/etc/testcases/taskdefs/delete.xml
--

http://git-wip-us.apache.org/repos/asf/ant/blob/995b518a/src/etc/testcases/taskdefs/optional/pvcs.xml
--

http://git-wip-us.apache.org/repos/asf/ant/blob/995b518a/src/etc/testcases/taskdefs/optional/script.xml
--

http://git-wip-us.apache.org/repos/asf/ant/blob/995b518a/src/tests/antunit/taskdefs/get-test.xml
--
diff --cc src/tests/antunit/taskdefs/get-test.xml
index e7289e3,44d5af9..2f0245c
--- a/src/tests/antunit/taskdefs/get-test.xml
+++ b/src/tests/antunit/taskdefs/get-test.xml
@@@ -20,8 -20,12 +20,8 @@@

  
http://ant.apache.org/webtest/gettest"; />
- 
 -  
 -  
 -  
+ 
 -
 -
 +  
  

  

[07/23] ant git commit: Revert "Trailing whitespace (cherry-pick 2f64e0b)"

[jaikiran]

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/rename.xml
--
diff --git a/src/etc/testcases/taskdefs/rename.xml 
b/src/etc/testcases/taskdefs/rename.xml
index 49b776c..a23a81e 100644
--- a/src/etc/testcases/taskdefs/rename.xml
+++ b/src/etc/testcases/taskdefs/rename.xml
@@ -31,19 +31,19 @@
   
 
   
-
   
 
   
-
   
 
   
-
-
   
 

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/replace.xml
--
diff --git a/src/etc/testcases/taskdefs/replace.xml 
b/src/etc/testcases/taskdefs/replace.xml
index b4ba9ae..a4039e5 100644
--- a/src/etc/testcases/taskdefs/replace.xml
+++ b/src/etc/testcases/taskdefs/replace.xml
@@ -42,25 +42,25 @@
   
 
   
-
   
 
   
 
-  
+  
 
   
 
   
 
-  
+  
 
   
 
   
 
-  
+  
 
   
 
@@ -70,8 +70,8 @@
 
 
 
-
-
+
+
 
   
   

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/rmic/rmic.xml
--
diff --git a/src/etc/testcases/taskdefs/rmic/rmic.xml 
b/src/etc/testcases/taskdefs/rmic/rmic.xml
index a4f3b8e..4670f43 100644
--- a/src/etc/testcases/taskdefs/rmic/rmic.xml
+++ b/src/etc/testcases/taskdefs/rmic/rmic.xml
@@ -17,13 +17,13 @@
 -->
 
 
-  
+  
   
 
   
 
   
-
+
 
 
   
@@ -52,7 +52,8 @@
   
+classname="unimplemented.class"
+/>
 
 
 
@@ -64,7 +65,7 @@
 
 
 
-  
+  
   
 Not found : ${build.dir}/@{file}
   
@@ -75,7 +76,7 @@
 
 
 
-  
+  
   
 Not found : ${dest.dir}/@{file}
   
@@ -86,7 +87,7 @@
 
 
 
-  
+  
   
 Expected to be missing : ${build.dir}/@{file}
   
@@ -97,7 +98,7 @@
 
 
 
-  
+  
   
 Expected to be missing : ${dest.dir}/@{file}
   
@@ -106,69 +107,69 @@
 
   
 
-
+
 
   
-
+
   
 
 
 
   
-
+
   
 
 
 
   
-
+
   
 
 
 
   
-
+
   
 
 
 
   
-
+
   
 
-
+
 
   
-
+
   
 
 
 
   
-
-
+
+
   
 
 
 
   
-
-
+
+
   
 
-
+
 
   
 
   
 
-
+
 
   
 
   
 
-
+
 
   
 
@@ -183,20 +184,20 @@
 
 
   
-
-
+
+
   
 
 
 
   
-
-
+
+
   
 
 
   
-
+  
   
 
 
@@ -240,37 +241,37 @@
   
 
   
-
+
 
   
 
   
-
+
 
   
 
   
-
+
 
 
   
-
+  
   
-
+
 
 
   
-
+  
   
-
+
 
   
-
+  
   
-
+
 
   
-
+  
   
 
 
@@ -283,63 +284,71 @@
 
   
 
-  
+  
 
 
   
 
   
 
-  
+  
 
 
   
 
   
 
+  compiler="kaffe"
+  />
 
   
 
   
 
+  compiler="kaffe"
+  />
 
   
-
+   
 
   
 
+  compiler="forking"
+  />
 
   
 
   
 
+  compiler="no-such-compiler"
+  />
   
 
   
 
+compiler="org.apache.tools.ant.taskdefs.rmic.ForkingSunRmic"
+/>
 
   
-
+  
   
 
+  compiler="org.apache.tools.ant.BuildException"
+  />
   
 
   
@@ -364,9 +373,10 @@
 
   
 
+  
compiler="org.apache.tools.ant.taskdefs.rmic.RmicAdvancedTest$FailingRmicAdapter"
+  />
   
-
+  
   
 
 
+  compiler="default"
+  />
 
   
 
   
 
+  compiler="default"
+  />
 
   
 
   
 
-
+  compiler="forking"
+  />
+
   
 
   
 
-
+  compiler="forking"
+  />
+
   
 
   
@@ -405,17 +419,19 @@
 
   
 
-
+
   
 
   
 
-
+
   
 
   
 
-
+
 
   
 

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/signjar.xml
--
diff --git a/src/etc/testcases/taskdefs/signjar.xml 
b/src/etc/testcases/taskdefs/signjar.xml
index 7c55e58..38a1359 100644
--- a/src/etc/testcases/taskdefs/signjar.xml
+++ b/src/etc/testcases/taskdefs/signjar.xml
@@ -20,21 +20,21 @@
   
 
   
-
-
+
+
 
-
-
+
+
 
   
 
 
   
-
+
 
-  
+  
 
-  
+  
 
   
 
@@ -51,7 +51,7 @@
   
 
   
-
+
   
 
   
@@ -63,7 +63,7 @@
   
 
   
-
+
 
   
 
@@ -85,12 +85,13 @@
 
   
 http://ant.apache.org/webtest/testkeystore"/>
+  keystore="http://ant.apache.org/we

[04/23] ant git commit: Revert "Trailing whitespace (cherry-pick 2f64e0b)"

[jaikiran]

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/tests/antunit/taskdefs/exec/exec-test.xml
--
diff --git a/src/tests/antunit/taskdefs/exec/exec-test.xml 
b/src/tests/antunit/taskdefs/exec/exec-test.xml
index b4e7f52..25b0088 100644
--- a/src/tests/antunit/taskdefs/exec/exec-test.xml
+++ b/src/tests/antunit/taskdefs/exec/exec-test.xml
@@ -16,20 +16,20 @@
   limitations under the License.
 -->
 
-
+
 
 
-
-
-
+
+
+
 
 
 
-
+
 
-
+
 
-
+
 
 
 
@@ -38,78 +38,78 @@
 
 
 
-
-
-
+
+
+
 
-
+
 
-
+
 
 
-
-
+
+
 
 
 
-
+
 
-
+
 
 
-
-
+
+
 
 
 
-
+
 
-
+
 
 
-
-
+
+
 
 
 
 
 
 
-
-
+
+
 
-
-
+
+
 
 
 
 
-
-
+
+
 
 
 
 ${ant.file} out${line.separator}${ant.file} 
err
-
+
 
 
 
 
 
 
-
-
+
+
 
 
 
 ${ant.file} out
-
+
 
 
 
 
 ${ant.file} err
-
+
 
 
 
@@ -117,17 +117,17 @@
 
 
-
-
+
+
 
 
 
 ${ant.file} out
-
-
+
+
 
 
-
+
 
 
 
-
-
+
+
 
 
 
 ${ant.file} out
-
-
+
+
 
 
 
 
 ${ant.file} err
-
-
+
+
 
 
 
@@ -159,19 +159,19 @@
 
-
+
 
 
 
-
-
+
+
 
 
 
-
+
 
 
-
+
 
 
 
@@ -181,19 +181,19 @@
 
-
+
 
 
 
-
-
+
+
 
 
 
-
+
 
 
-
+
 
 
 
@@ -202,22 +202,22 @@
 
-
+
 
 
 
-
+
 
 
 
-
-
+
+
 
 
-
+
 
 
-
+
 
 
 
@@ -225,85 +225,85 @@
 depends="setUp" if="test.can.run">
 
 
-
-
-
-
+
+
+
+
 
 
 
 
 
 
-
-
-
+
+
+
 
 
 
 ${ant.file} out${line.separator}${ant.file} 
err
-
+
 
 
 
 
 
 
-
-
-
+
+
+
 
 
 
 ${ant.file} out
-
+
 
 
 
 
 ${ant.file} err
-
+
 
 
 
 
 
 
-
-
+
+
 
+outputproperty="redirector.out" />
 
 
 
 ${ant.file} out
-
-
+
+
 
 
- 

[09/23] ant git commit: Revert "Trailing whitespace (cherry-pick 2f64e0b)"

[jaikiran]

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/fail.xml
--
diff --git a/src/etc/testcases/taskdefs/fail.xml 
b/src/etc/testcases/taskdefs/fail.xml
index a5d88d1..0a6561e 100644
--- a/src/etc/testcases/taskdefs/fail.xml
+++ b/src/etc/testcases/taskdefs/fail.xml
@@ -29,23 +29,23 @@
   
 testText
   
-
+  
   
-
+
   
 
   
-
+
   
 
   
 
   
-
+  
   
 
   
-  
+  
   
 
   
@@ -53,7 +53,7 @@
   
 
   
-  
+  
   
 
   
@@ -61,7 +61,7 @@
   
 
   
-  
+  
   
 
   
@@ -69,7 +69,7 @@
   
 
   
-  
+  
   
 
   
@@ -77,7 +77,7 @@
   
 
   
-  
+  
   
 
   
@@ -85,7 +85,7 @@
   
 
   
-  
+  
   
 
   
@@ -93,10 +93,10 @@
   
 
   
-  
+  
   
   
-  
+  
   
 
   
@@ -104,7 +104,7 @@
   
 
   
-  
+  
   
 testNested6
 testNested6
@@ -114,15 +114,15 @@ testNested6
 
   
 
-  
+  
 
   
 
   
 
   
-  
-  
+  
+  
   
 
   

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/filter.xml
--
diff --git a/src/etc/testcases/taskdefs/filter.xml 
b/src/etc/testcases/taskdefs/filter.xml
index d4a7525..303efa7 100644
--- a/src/etc/testcases/taskdefs/filter.xml
+++ b/src/etc/testcases/taskdefs/filter.xml
@@ -35,38 +35,38 @@
   
 
   
-
-
+
+
   
 
   
-
+
 
-  
+  
 
   
 
   
-
-
+
+
   
 
   
-
+
 
   
 
   
 
   
-
+
 
   
 
   
 
   
-
+
   
 
 

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/fixcrlf/build.xml
--
diff --git a/src/etc/testcases/taskdefs/fixcrlf/build.xml 
b/src/etc/testcases/taskdefs/fixcrlf/build.xml
index e36ea00..e2fecac 100644
--- a/src/etc/testcases/taskdefs/fixcrlf/build.xml
+++ b/src/etc/testcases/taskdefs/fixcrlf/build.xml
@@ -19,23 +19,23 @@
   
 
   
-
+
 
 
-
+
   
 
 
   
-
-
-
-
+
+
+
+
 
   
 
   
-
+
   
 
   
@@ -45,82 +45,82 @@
   
 
-
+ javafiles="true" tab="add" eol="crlf" eof="asis" />
+
   
 
   
 
-
+ javafiles="true" tab="add" cr="add" eol="crlf" eof="asis" />
+
   
 
   
 
-
+ javafiles="true" tab="remove" eol="lf" eof="asis" />
+
   
 
   
 
-
+ javafiles="true" tab="remove" eol="lf" eof="asis" />
+
   
 
   
 
-
+ tab="remove" eol="lf" eof="asis" />
+
   
 
   
 
-
+ tab="add" cr="remove" eol="crlf" eof="asis" />
+
   
 
   
 
-
+ tab="add" cr="add" eof="asis" />
+
   
 
   
 
-
+ javafiles="true" tab="add" cr="add" eof="add" />
+
   
 
   
 
-
+ javafiles="true" tab="remove" cr="remove" eof="remove" />
+
   
 
   
 
-
+ includes="Mac2Unix" eol="lf" />
+
   
 
   
-
+
 
+ javafiles="true" tab="add" eol="crlf" eof="asis" />
 Q
   
 
   
-
+
   
 
   
@@ -130,74 +130,74 @@
   
 
+ javafiles="false" cr="remove" encoding="UnicodeBig" />
 
+ file2="${input}/expected/input.lf.utf16" />
   
 
   
 
+ outputencoding="ascii" />
 
+ file2="${input}/expected/input.lf.ascii" />
   
 
   
 
+ javafiles="false" cr="remove" />
 
+ file2="${input}/expected/longlines.lf" />
   
 
   
 
+ includes="crcrlf" eol="lf" />
 
+ file2="${input}/expected/crcrlf.unix" />
   
 
   
 
+ includes="crcrlf" eol="crlf" />
 
+ file2="${input}/expected/crcrlf.dos" />
   
 
   
 
+ includes="crcrlf" eol="cr" />
 
+ file2="${input}/expected/crcrlf.mac" />
   
 
   
 
+ includes="fixlastfalse.lf" eol="crlf" />
 
+ file2="${input}/expected/fixlast.dos" />
   
 
   
 
+ includes="fixlastfalse.lf" eol="cr" fixlast="false" />
 
+ file2="${input}/expected/fixlastfalse.mac" />
   
 
   
   
-
+
   
 
   
-
+
 
   
 
-  
+  
 
   
 
@@ -209,123 +209,123 @@
 
   
 
+ preservelastmodified="true" />
 
   
 
   
+ 

[03/23] ant git commit: Revert "Trailing whitespace (cherry-pick 2f64e0b)"

[jaikiran]

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/tests/antunit/taskdefs/local-test.xml
--
diff --git a/src/tests/antunit/taskdefs/local-test.xml 
b/src/tests/antunit/taskdefs/local-test.xml
index 2b07a8d..9c4e7b7 100644
--- a/src/tests/antunit/taskdefs/local-test.xml
+++ b/src/tests/antunit/taskdefs/local-test.xml
@@ -16,81 +16,81 @@
   limitations under the License.
 -->
 
-  
+  
 
-  
+  
 
-  
-  
-  
+  
+  
+  
 
   
 
-  
+  
 
   
 
   
-
+
   
 
   
-
-
-
-
+
+
+
+
   
 
   
 
-  
-  
+  
+  
   
-
-
-
+
+
+
   
-  
+  
 
-
+
   
 
   
 
-  
-  
+  
+  
   
-
-
-
-
+
+
+
+
   
 
 
-  
-  
-  
-  
-  
-  
+  
+  
+  
+  
+  
+  
 
-
+
   
 
   
 
   
-
-
-
+
+
+
   
 
-
-
-
-
-
-
+
+
+
+
+
+
   
 
 

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/tests/antunit/taskdefs/macrodef-test.xml
--
diff --git a/src/tests/antunit/taskdefs/macrodef-test.xml 
b/src/tests/antunit/taskdefs/macrodef-test.xml
index af6b87c..b12e6f7 100644
--- a/src/tests/antunit/taskdefs/macrodef-test.xml
+++ b/src/tests/antunit/taskdefs/macrodef-test.xml
@@ -18,7 +18,7 @@
 
 
-  
+  
 
   
 

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/tests/antunit/taskdefs/manifest-test.xml
--
diff --git a/src/tests/antunit/taskdefs/manifest-test.xml 
b/src/tests/antunit/taskdefs/manifest-test.xml
index 5b682f3..4247ef2 100644
--- a/src/tests/antunit/taskdefs/manifest-test.xml
+++ b/src/tests/antunit/taskdefs/manifest-test.xml
@@ -18,7 +18,7 @@
 
 
-  
+  
 
   
 
@@ -150,18 +150,18 @@ public class AntFail {
 }
 }
 ]]>
-
+
   
 
   https://issues.apache.org/bugzilla/show_bug.cgi?id=54762";>
 
-  
+  
 
-
+
 
+ basedir="${output}/bin" />
 
   
 
@@ -172,7 +172,7 @@ public class AntFail {
 
   
-
+
   
 
 

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/tests/antunit/taskdefs/manifestclasspath-test.xml
--
diff --git a/src/tests/antunit/taskdefs/manifestclasspath-test.xml 
b/src/tests/antunit/taskdefs/manifestclasspath-test.xml
index cbc06a9..612990b 100644
--- a/src/tests/antunit/taskdefs/manifestclasspath-test.xml
+++ b/src/tests/antunit/taskdefs/manifestclasspath-test.xml
@@ -18,7 +18,7 @@
 
 
-  
+  
 
   
 http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/tests/antunit/taskdefs/move-test.xml
--
diff --git a/src/tests/antunit/taskdefs/move-test.xml 
b/src/tests/antunit/taskdefs/move-test.xml
index d1475ec..9acac74 100644
--- a/src/tests/antunit/taskdefs/move-test.xml
+++ b/src/tests/antunit/taskdefs/move-test.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 
-  
+  
 
   
 
@@ -60,7 +60,8 @@
   
 
   https://issues.apache.org/bugzilla/show_bug.cgi?id=43574";>
+  
description="https://issues.apache.org/bugzilla/show_bug.cgi?id=43574";
+  >
 
 
 
@@ -81,8 +82,8 @@
 
 
   
-
-
+
+
   
 
 
@@ -90,8 +91,8 @@
 
 
   
-
-
+
+
   
 
 

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/tests/antunit/taskdefs/optional/cab.xml
--
diff --git a/src/tests/antunit/taskdefs/optional/cab.xml 
b/src/tests/antunit/taskdefs/optional/cab.xml
index a5a2ac2..4909107 100644
--- a/src/tests/antunit/taskdefs/optional/cab.xml
+++ b/src/tests/antunit/taskdefs/optional/cab.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 
-  
+  
 
   
 http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/tests/antunit/taskdefs/optional/depend/depend-test.xml
--
diff --git a/src/tests/antunit/taskdefs/optional/depend/depend-test.xml 
b/src/tests/antunit/taskdefs/optional/depend/depend-test.xml
index 3abbca5..48f94aa 100644
--- a/src/tests/antunit/taskdefs/optional/depend/depend-test.xml
+++ b/src/tests/antunit/taskdefs/optional/depend/depend-test.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 
-  
+  
 
   
   
@@ -59,8 +59,8 @@ public class Main {
 
 
-
-
+
+
 
 
 
@@ -93,8 +93,8 @@ public class Main 

[06/23] ant git commit: Revert "Trailing whitespace (cherry-pick 2f64e0b)"

[jaikiran]

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/types/xmlcatalog.xml
--
diff --git a/src/etc/testcases/types/xmlcatalog.xml 
b/src/etc/testcases/types/xmlcatalog.xml
index 0c53666..63269f7 100644
--- a/src/etc/testcases/types/xmlcatalog.xml
+++ b/src/etc/testcases/types/xmlcatalog.xml
@@ -26,120 +26,125 @@
 buildfile is called by
 org.apache.tools.ant.types.XMLCatalogBuildFileTest.java
 Alternatively, you may try it out by hand by first removing the
-comment symbols around the echo statements and then calling
+comment symbols around the echo statements and then calling 
 ant -buildfile xmlcatalog.xml
   
 
-  
+  
 
-  
+  
 
-  
+  
 
+  quiet = "yes"
+  file  = "result.out"/>
 
+  basedir   = "${basedir}"
+  destdir   = "${basedir}"
+  extension = ".text"
+  style = "${transformer}"
+  in= "xmlcatalog1.xml"
+  out   = "result.out">
   
+name   = "outprop"
+expression = "val1"/>
 
-
-
+
+
 
+  quiet = "yes"
+  file  = "result.out"/>
   
 
-  
+  
 
+  quiet = "yes"
+  file  = "result.out"/>
 
+  basedir   = "${basedir}"
+  destdir   = "${basedir}"
+  extension = ".text"
+  style = "${transformer}"
+  in= "xmlcatalog1.xml"
+  out   = "result.out">
   
+name   = "outprop"
+expression = "val2"/>
   
-
+
   
 
-
-
+
+
 
+  quiet = "yes"
+  file  = "result.out"/>
   
 
-  
+  
 
+  quiet = "yes"
+  file  = "result.out"/>
 
+  basedir   = "${basedir}"
+  destdir   = "${basedir}"
+  extension = ".text"
+  style = "${transformer}"
+  in= "xmlcatalog2.xml"
+  out   = "result.out">
   
+name   = "outprop"
+expression = "val3"/>
 
-
-
+
+
 
+  quiet = "yes"
+  file  = "result.out"/>
   
 
-  
+  
 
+  quiet = "yes"
+  file  = "result.out"/>
 
+  basedir   = "${basedir}"
+  destdir   = "${basedir}"
+  extension = ".text"
+  style = "${transformer}"
+  in= "xmlcatalog2.xml"
+  out   = "result.out">
   
+name   = "outprop"
+expression = "val4"/>
   
-
+
   
 
-
-
+
+
 
+  quiet = "yes"
+  file  = "result.out"/>
   
 
 

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/types/xmlcatalog.xsl
--
diff --git a/src/etc/testcases/types/xmlcatalog.xsl 
b/src/etc/testcases/types/xmlcatalog.xsl
index 62621eb..a2c839c 100644
--- a/src/etc/testcases/types/xmlcatalog.xsl
+++ b/src/etc/testcases/types/xmlcatalog.xsl
@@ -15,12 +15,12 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-http://www.w3.org/1999/XSL/Transform";
   version="1.0">
 
   
 
   

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/types/xmlcatalog1.xml
--
diff --git a/src/etc/testcases/types/xmlcatalog1.xml 
b/src/etc/testcases/types/xmlcatalog1.xml
index e4d66e9..d4b5461 100644
--- a/src/etc/testcases/types/xmlcatalog1.xml
+++ b/src/etc/testcases/types/xmlcatalog1.xml
@@ -20,7 +20,7 @@
 ]>
 
   
 
 

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/types/xmlcatalog2.xml
--
diff --git a/src/etc/testcases/types/xmlcatalog2.xml 
b/src/etc/testcases/types/xmlcatalog2.xml
index edf5d2d..9d2bed0 100644
--- a/src/etc/testcases/types/xmlcatalog2.xml
+++ b/src/etc/testcases/types/xmlcatalog2.xml
@@ -17,7 +17,7 @@
 -->
 
   
 
 

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/main/org/apache/tools/ant/antlib.xml
--
diff --git a/src/main/org/apache/tools/ant/antlib.xml 
b/src/main/org/apache/tools/ant/antlib.xml
index f9f219b..8ec6714 100644
--- a/src/main/org/apache/tools/ant/antlib.xml
+++ b/src/main/org/apache/tools/ant/antlib.xml
@@ -90,52 +90,52 @@
 
   
   
+classname="org.apache.tools.ant.types.resources.selectors.And" />
   
+classname="org.apache.tools.ant.types.resources.selectors.Compare" />
   
+classname="org.apache.tools.ant.types.selectors.ContainsSelector" />
   
+classname="org.apache.tools.ant.types.selectors.ContainsRegexpSelector" />
   
+classname="org.apache.tools.ant.types.resources.selectors.Date" />
   
+classname="org.apache.tools.ant.types.resources.selectors.Exists" />
   
+classname="org.apache.tools.ant.types.resources.selectors.InstanceOf" />
   
+classname="org.apache.tools.ant.types.resour

[01/23] ant git commit: Revert "Trailing whitespace (cherry-pick 2f64e0b)"

[jaikiran]

Repository: ant
Updated Branches:
  refs/heads/master 4ce54bf3b -> 995b518ab


http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/tests/antunit/types/resources/selectors/test-componentdef.xml
--
diff --git a/src/tests/antunit/types/resources/selectors/test-componentdef.xml 
b/src/tests/antunit/types/resources/selectors/test-componentdef.xml
index 71de167..187412e 100644
--- a/src/tests/antunit/types/resources/selectors/test-componentdef.xml
+++ b/src/tests/antunit/types/resources/selectors/test-componentdef.xml
@@ -17,27 +17,27 @@
 -->
 
 
-  
+
   
 
   
   
   
 
-  
-
+  
+
   
 
   
 
   
-
-
-
-
-
+
+
+
+
+
   
-  
+  
 
   
 
@@ -48,28 +48,28 @@
   
 
   
-
-
-
+
+
+
   
-  
+  
 
   
 
   
 
-  
+  
 
   
 
   
 
   
-
-
-
+
+
+
   
-  
+  
 
   
 
@@ -80,13 +80,13 @@
   
 
   
-
-http://ant.apache.org/index.html"/>
-
-
-
+
+http://ant.apache.org/index.html"; />
+
+
+
   
-  
+  
 
   
 
@@ -94,15 +94,15 @@
 
   
 
+ classname="org.apache.tools.ant.types.resources.FileResource" />
 
   
 
   
-
-
+
+
   
-  
+  
 
   
 
@@ -110,49 +110,49 @@
 
   
 
+ classname="org.apache.tools.ant.types.resources.FileResource" />
 
   
 
   
-
-
+
+
   
-  
+  
 
   
 
   
 
   
+depends="testinstanceoftype1,testinstanceoftype2,testinstanceoftype3" />
 
   
 
   
 
   
-
+
   
-  
+  
 
   
 
   
 
-  
+  
 
   
 
   
 
   
- 
- 
- 
- 
+ 
+ 
+ 
+ 
   
-  
+  
 
   
 
@@ -163,13 +163,13 @@
   
 
   
- 
- 
- 
- 
- 
+ 
+ 
+ 
+ 
+ 
   
-  
+  
 
   
 
@@ -180,13 +180,13 @@
   
 
   
- 
- 
- 
- 
- 
+ 
+ 
+ 
+ 
+ 
   
-  
+  
 
   
 
@@ -197,14 +197,14 @@
   
 
   
-
-
-
-
+
+
+
+
   
   
-
-
+
+
   
 
   
@@ -216,14 +216,14 @@
   
 
   
-
-
-
-
+
+
+
+
   
   
-
-
+
+
   
 
   
@@ -235,13 +235,13 @@
   
 
   
-
-
-
-
+
+
+
+
   
   
-
+
   
 
   
@@ -253,14 +253,14 @@
   
 
   
-
-
-
-
+
+
+
+
   
   
-
-
+
+
   
 
   
@@ -272,15 +272,15 @@
   
 
   
-
-
-
-
+
+
+
+
   
   
-
-
-
+
+
+
   
 
   
@@ -292,15 +292,15 @@
   
 
   
-
-
-
-
+
+
+
+
   
   
-
-
-
+
+
+
   
 
   
@@ -312,16 +312,16 @@
   
 
   
-
-
-
-
+
+
+
+
   

[18/23] ant git commit: Revert "Trailing whitespace"

[jaikiran]

http://git-wip-us.apache.org/repos/asf/ant/blob/84fe46d6/src/etc/testcases/taskdefs/presetdef.xml
--
diff --git a/src/etc/testcases/taskdefs/presetdef.xml 
b/src/etc/testcases/taskdefs/presetdef.xml
index 9fd1341..695747e 100644
--- a/src/etc/testcases/taskdefs/presetdef.xml
+++ b/src/etc/testcases/taskdefs/presetdef.xml
@@ -17,10 +17,10 @@
 -->
 
   
-
-
+
+
   
-
+  
   
 
   
@@ -75,7 +75,7 @@
 
   
 
-
+
 
   
   

http://git-wip-us.apache.org/repos/asf/ant/blob/84fe46d6/src/etc/testcases/taskdefs/property.xml
--
diff --git a/src/etc/testcases/taskdefs/property.xml 
b/src/etc/testcases/taskdefs/property.xml
index 19c5b57..2e0c835 100644
--- a/src/etc/testcases/taskdefs/property.xml
+++ b/src/etc/testcases/taskdefs/property.xml
@@ -21,7 +21,7 @@
   
 
   
-
+
   
 
   
@@ -41,13 +41,13 @@
   
 
   
-
+
 
 
   
 
   
-
+
 
 
   
@@ -81,13 +81,13 @@
 ONE
 TWO
 
-
-  
+  
+
 
   
   
-  
-  
+  
+
 
   
 

http://git-wip-us.apache.org/repos/asf/ant/blob/84fe46d6/src/etc/testcases/taskdefs/recorder2.xml
--
diff --git a/src/etc/testcases/taskdefs/recorder2.xml 
b/src/etc/testcases/taskdefs/recorder2.xml
index 094782a..e093cf5 100644
--- a/src/etc/testcases/taskdefs/recorder2.xml
+++ b/src/etc/testcases/taskdefs/recorder2.xml
@@ -18,12 +18,12 @@
 
 
 
-
+
 
-
+
 
-
+
 
-
+
 
 

http://git-wip-us.apache.org/repos/asf/ant/blob/84fe46d6/src/etc/testcases/taskdefs/rename.xml
--
diff --git a/src/etc/testcases/taskdefs/rename.xml 
b/src/etc/testcases/taskdefs/rename.xml
index 49b776c..a23a81e 100644
--- a/src/etc/testcases/taskdefs/rename.xml
+++ b/src/etc/testcases/taskdefs/rename.xml
@@ -31,19 +31,19 @@
   
 
   
-
   
 
   
-
   
 
   
-
-
   
 

http://git-wip-us.apache.org/repos/asf/ant/blob/84fe46d6/src/etc/testcases/taskdefs/replace.xml
--
diff --git a/src/etc/testcases/taskdefs/replace.xml 
b/src/etc/testcases/taskdefs/replace.xml
index b4ba9ae..a4039e5 100644
--- a/src/etc/testcases/taskdefs/replace.xml
+++ b/src/etc/testcases/taskdefs/replace.xml
@@ -42,25 +42,25 @@
   
 
   
-
   
 
   
 
-  
+  
 
   
 
   
 
-  
+  
 
   
 
   
 
-  
+  
 
   
 
@@ -70,8 +70,8 @@
 
 
 
-
-
+
+
 
   
   

http://git-wip-us.apache.org/repos/asf/ant/blob/84fe46d6/src/etc/testcases/taskdefs/rmic/rmic.xml
--
diff --git a/src/etc/testcases/taskdefs/rmic/rmic.xml 
b/src/etc/testcases/taskdefs/rmic/rmic.xml
index badae32..1ef900d 100644
--- a/src/etc/testcases/taskdefs/rmic/rmic.xml
+++ b/src/etc/testcases/taskdefs/rmic/rmic.xml
@@ -17,13 +17,13 @@
 -->
 
 
-  
+  
   
 
   
 
   
-
+
 
 
   
@@ -52,7 +52,8 @@
   
+classname="unimplemented.class"
+/>
 
 
 
@@ -64,7 +65,7 @@
 
 
 
-  
+  
   
 Not found : ${build.dir}/@{file}
   
@@ -75,7 +76,7 @@
 
 
 
-  
+  
   
 Not found : ${dest.dir}/@{file}
   
@@ -86,7 +87,7 @@
 
 
 
-  
+  
   
 Expected to be missing : ${build.dir}/@{file}
   
@@ -97,7 +98,7 @@
 
 
 
-  
+  
   
 Expected to be missing : ${dest.dir}/@{file}
   
@@ -106,69 +107,69 @@
 
   
 
-
+
 
   
-
+
   
 
 
 
   
-
+
   
 
 
 
   
-
+
   
 
 
 
   
-
+
   
 
 
 
   
-
+
   
 
-
+
 
   
-
+
   
 
 
 
   
-
-
+
+
   
 
 
 
   
-
-
+
+
   
 
-
+
 
   
 
   
 
-
+
 
   
 
   
 
-
+
 
   
 
@@ -183,20 +184,20 @@
 
 
   
-
-
+
+
   
 
 
 
   
-
-
+
+
   
 
 
   
-
+  
   
 
 
@@ -234,37 +235,37 @@
   
 
   
-
+
 
   
 
   
-
+
 
   
 
   
-
+
 
 
   
-
+  
   
-
+
 
 
   
-
+  
   
-
+
 
   
-
+  
   
-
+
 
   
-
+  
   
 
 
@@ -277,63 +278,71 @@
 
   
 
-  
+   

[14/23] ant git commit: Revert "Trailing whitespace"

[jaikiran]

http://git-wip-us.apache.org/repos/asf/ant/blob/84fe46d6/src/tests/antunit/taskdefs/macrodef-test.xml
--
diff --git a/src/tests/antunit/taskdefs/macrodef-test.xml 
b/src/tests/antunit/taskdefs/macrodef-test.xml
index af6b87c..b12e6f7 100644
--- a/src/tests/antunit/taskdefs/macrodef-test.xml
+++ b/src/tests/antunit/taskdefs/macrodef-test.xml
@@ -18,7 +18,7 @@
 
 
-  
+  
 
   
 

http://git-wip-us.apache.org/repos/asf/ant/blob/84fe46d6/src/tests/antunit/taskdefs/manifest-test.xml
--
diff --git a/src/tests/antunit/taskdefs/manifest-test.xml 
b/src/tests/antunit/taskdefs/manifest-test.xml
index 5b682f3..4247ef2 100644
--- a/src/tests/antunit/taskdefs/manifest-test.xml
+++ b/src/tests/antunit/taskdefs/manifest-test.xml
@@ -18,7 +18,7 @@
 
 
-  
+  
 
   
 
@@ -150,18 +150,18 @@ public class AntFail {
 }
 }
 ]]>
-
+
   
 
   https://issues.apache.org/bugzilla/show_bug.cgi?id=54762";>
 
-  
+  
 
-
+
 
+ basedir="${output}/bin" />
 
   
 
@@ -172,7 +172,7 @@ public class AntFail {
 
   
-
+
   
 
 

http://git-wip-us.apache.org/repos/asf/ant/blob/84fe46d6/src/tests/antunit/taskdefs/manifestclasspath-test.xml
--
diff --git a/src/tests/antunit/taskdefs/manifestclasspath-test.xml 
b/src/tests/antunit/taskdefs/manifestclasspath-test.xml
index cbc06a9..612990b 100644
--- a/src/tests/antunit/taskdefs/manifestclasspath-test.xml
+++ b/src/tests/antunit/taskdefs/manifestclasspath-test.xml
@@ -18,7 +18,7 @@
 
 
-  
+  
 
   
 http://git-wip-us.apache.org/repos/asf/ant/blob/84fe46d6/src/tests/antunit/taskdefs/move-test.xml
--
diff --git a/src/tests/antunit/taskdefs/move-test.xml 
b/src/tests/antunit/taskdefs/move-test.xml
index 4dcf362..3584f9b 100644
--- a/src/tests/antunit/taskdefs/move-test.xml
+++ b/src/tests/antunit/taskdefs/move-test.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 
-  
+  
 
   
 
@@ -60,7 +60,8 @@
   
 
   https://issues.apache.org/bugzilla/show_bug.cgi?id=43574";>
+  
description="https://issues.apache.org/bugzilla/show_bug.cgi?id=43574";
+  >
 
 
 
@@ -81,8 +82,8 @@
 
 
   
-
-
+
+
   
 
 
@@ -90,8 +91,8 @@
 
 
   
-
-
+
+
   
 
 

http://git-wip-us.apache.org/repos/asf/ant/blob/84fe46d6/src/tests/antunit/taskdefs/optional/cab.xml
--
diff --git a/src/tests/antunit/taskdefs/optional/cab.xml 
b/src/tests/antunit/taskdefs/optional/cab.xml
index a5a2ac2..4909107 100644
--- a/src/tests/antunit/taskdefs/optional/cab.xml
+++ b/src/tests/antunit/taskdefs/optional/cab.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 
-  
+  
 
   
 http://git-wip-us.apache.org/repos/asf/ant/blob/84fe46d6/src/tests/antunit/taskdefs/optional/depend/depend-test.xml
--
diff --git a/src/tests/antunit/taskdefs/optional/depend/depend-test.xml 
b/src/tests/antunit/taskdefs/optional/depend/depend-test.xml
index 3abbca5..48f94aa 100644
--- a/src/tests/antunit/taskdefs/optional/depend/depend-test.xml
+++ b/src/tests/antunit/taskdefs/optional/depend/depend-test.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 
-  
+  
 
   
   
@@ -59,8 +59,8 @@ public class Main {
 
 
-
-
+
+
 
 
 
@@ -93,8 +93,8 @@ public class Main {
 
 
 
-
-
+
+
 
 
   
@@ -109,7 +109,8 @@ public class Main {
 
 
+classpathref="resources-id"
+/>
 
 
   
@@ -122,7 +123,8 @@ public class Main {
 
 
+classpathref="resources-id"
+/>
 
 
   

http://git-wip-us.apache.org/repos/asf/ant/blob/84fe46d6/src/tests/antunit/taskdefs/optional/funtest-test.xml
--
diff --git a/src/tests/antunit/taskdefs/optional/funtest-test.xml 
b/src/tests/antunit/taskdefs/optional/funtest-test.xml
index 6656e44..6baa4f7 100644
--- a/src/tests/antunit/taskdefs/optional/funtest-test.xml
+++ b/src/tests/antunit/taskdefs/optional/funtest-test.xml
@@ -100,7 +100,7 @@
   
 
   
-
+
   
  
   

http://git-wip-us.apache.org/repos/asf/ant/blob/84fe46d6/src/tests/antunit/taskdefs/optional/javah-test.xml
--
diff --git a/src/tests/antunit/taskdefs/optional/javah-test.xml 
b/src/tests/antunit/taskdefs/optional/javah-test.xml
index 0038d84..9306883 100644
--- a/src/tests/antunit/taskdefs/optional/javah-test.xml
+++ b/src/tests/antunit/ta

[08/23] ant git commit: Revert "Trailing whitespace (cherry-pick 2f64e0b)"

[jaikiran]

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/optional/depend/depend.xml
--
diff --git a/src/etc/testcases/taskdefs/optional/depend/depend.xml 
b/src/etc/testcases/taskdefs/optional/depend/depend.xml
index de87e44..8465bb0 100644
--- a/src/etc/testcases/taskdefs/optional/depend/depend.xml
+++ b/src/etc/testcases/taskdefs/optional/depend/depend.xml
@@ -24,7 +24,7 @@
 
 
   
-
+
 
   
 
@@ -100,17 +100,17 @@
   
 
   
-
+
 
   
-
-
+
+
   
 
 
   
-
-
+
+
   
 
   
@@ -154,7 +154,7 @@
 
   
 
-  
+
 
   
 
@@ -171,7 +171,7 @@
 
 
 
+   classpathref="path.compile" fork="false" />
 

 
   
-
-
   
 

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/optional/depend/src1/A.java
--
diff --git a/src/etc/testcases/taskdefs/optional/depend/src1/A.java 
b/src/etc/testcases/taskdefs/optional/depend/src1/A.java
index b7452c7..dc6df23 100644
--- a/src/etc/testcases/taskdefs/optional/depend/src1/A.java
+++ b/src/etc/testcases/taskdefs/optional/depend/src1/A.java
@@ -17,3 +17,4 @@ limitations under the License.
 public class A extends B {
 private D d = new D();
 }
+

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/optional/depend/src1/B.java
--
diff --git a/src/etc/testcases/taskdefs/optional/depend/src1/B.java 
b/src/etc/testcases/taskdefs/optional/depend/src1/B.java
index 86abefd..4be51f7 100644
--- a/src/etc/testcases/taskdefs/optional/depend/src1/B.java
+++ b/src/etc/testcases/taskdefs/optional/depend/src1/B.java
@@ -16,3 +16,4 @@ limitations under the License.
 */
 public class B extends C {
 }
+

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/optional/depend/src1/C.java
--
diff --git a/src/etc/testcases/taskdefs/optional/depend/src1/C.java 
b/src/etc/testcases/taskdefs/optional/depend/src1/C.java
index 766c9bb..d2bfca9 100644
--- a/src/etc/testcases/taskdefs/optional/depend/src1/C.java
+++ b/src/etc/testcases/taskdefs/optional/depend/src1/C.java
@@ -16,3 +16,4 @@ limitations under the License.
 */
 public class C {
 }
+

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/optional/depend/src1/D.java
--
diff --git a/src/etc/testcases/taskdefs/optional/depend/src1/D.java 
b/src/etc/testcases/taskdefs/optional/depend/src1/D.java
index 81f4545..127de57 100644
--- a/src/etc/testcases/taskdefs/optional/depend/src1/D.java
+++ b/src/etc/testcases/taskdefs/optional/depend/src1/D.java
@@ -16,3 +16,4 @@ limitations under the License.
 */
 public class D {
 }
+

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/optional/depend/src1/E.java
--
diff --git a/src/etc/testcases/taskdefs/optional/depend/src1/E.java 
b/src/etc/testcases/taskdefs/optional/depend/src1/E.java
index 4f4834f..0efd613 100644
--- a/src/etc/testcases/taskdefs/optional/depend/src1/E.java
+++ b/src/etc/testcases/taskdefs/optional/depend/src1/E.java
@@ -19,3 +19,4 @@ public class E {
 System.out.println(A.class);
 }
 }
+

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/optional/depend/src2/A.java
--
diff --git a/src/etc/testcases/taskdefs/optional/depend/src2/A.java 
b/src/etc/testcases/taskdefs/optional/depend/src2/A.java
index a9a07fa..02b35be 100644
--- a/src/etc/testcases/taskdefs/optional/depend/src2/A.java
+++ b/src/etc/testcases/taskdefs/optional/depend/src2/A.java
@@ -18,3 +18,4 @@ public class A {
 static private class Inner extends B {
 }
 }
+

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/optional/depend/src2/B.java
--
diff --git a/src/etc/testcases/taskdefs/optional/depend/src2/B.java 
b/src/etc/testcases/taskdefs/optional/depend/src2/B.java
index 0811180..bc7b7d2 100644
--- a/src/etc/testcases/taskdefs/optional/depend/src2/B.java
+++ b/src/etc/testcases/taskdefs/optional/depend/src2/B.java
@@ -16,3 +16,4 @@ limitations under the License.
 */
 public class B {
 }
+

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/optional/depend/src3/A.java
---

[10/23] ant git commit: Revert "Trailing whitespace (cherry-pick 2f64e0b)"

[jaikiran]

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/core/topleveltasks/notarget.xml
--
diff --git a/src/etc/testcases/core/topleveltasks/notarget.xml 
b/src/etc/testcases/core/topleveltasks/notarget.xml
index 9ce0239..2543751 100644
--- a/src/etc/testcases/core/topleveltasks/notarget.xml
+++ b/src/etc/testcases/core/topleveltasks/notarget.xml
@@ -16,6 +16,6 @@
limitations under the License.
 -->
 
-  
-  
+  
+  
 

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/core/topleveltasks/targetlevelant.xml
--
diff --git a/src/etc/testcases/core/topleveltasks/targetlevelant.xml 
b/src/etc/testcases/core/topleveltasks/targetlevelant.xml
index 61229f9..9b1bb1d 100644
--- a/src/etc/testcases/core/topleveltasks/targetlevelant.xml
+++ b/src/etc/testcases/core/topleveltasks/targetlevelant.xml
@@ -17,6 +17,6 @@
 -->
 
   
-
+
   
 

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/core/topleveltasks/toplevelant.xml
--
diff --git a/src/etc/testcases/core/topleveltasks/toplevelant.xml 
b/src/etc/testcases/core/topleveltasks/toplevelant.xml
index 67a5cae..968ad6c 100644
--- a/src/etc/testcases/core/topleveltasks/toplevelant.xml
+++ b/src/etc/testcases/core/topleveltasks/toplevelant.xml
@@ -16,6 +16,6 @@
limitations under the License.
 -->
 
-  
-  
+  
+  
 

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/core/unknownelement.xml
--
diff --git a/src/etc/testcases/core/unknownelement.xml 
b/src/etc/testcases/core/unknownelement.xml
index fec8f18..b6d8939 100644
--- a/src/etc/testcases/core/unknownelement.xml
+++ b/src/etc/testcases/core/unknownelement.xml
@@ -17,7 +17,7 @@
 -->
 
   
-
   

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/filters/build.xml
--
diff --git a/src/etc/testcases/filters/build.xml 
b/src/etc/testcases/filters/build.xml
index c03443a..b70b778 100644
--- a/src/etc/testcases/filters/build.xml
+++ b/src/etc/testcases/filters/build.xml
@@ -18,7 +18,7 @@
 
   
   
-
+
   
 
 
@@ -34,7 +34,7 @@
   
 
   
-
+  
   
 
@@ -49,12 +49,12 @@
   
 
   
+  file2="expected/negatelinecontains.test" />
 
   
 
   
-
+  
   
 
   
@@ -71,16 +71,16 @@
 
   
 
-  
+  
   
-
+
   
 
   
 
   
 
-  
+  
   
 
   
@@ -91,18 +91,18 @@
 
   
 
-  
+  
   
-
+   
   
-  
+ 
   
 
   
 
   
 
-  
+  
   
 
   
@@ -113,7 +113,7 @@
 
   
 
-  
+  
   
 
   
@@ -124,7 +124,7 @@
 
   
 
-  
+  
   
 
   

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/filters/concat.xml
--
diff --git a/src/etc/testcases/filters/concat.xml 
b/src/etc/testcases/filters/concat.xml
index 7aca7bd..262dd16 100644
--- a/src/etc/testcases/filters/concat.xml
+++ b/src/etc/testcases/filters/concat.xml
@@ -20,7 +20,7 @@
   
 
   
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/filters/dynamicfilter.xml
--
diff --git a/src/etc/testcases/filters/dynamicfilter.xml 
b/src/etc/testcases/filters/dynamicfilter.xml
index ef9ffc3..cb52d21 100644
--- a/src/etc/testcases/filters/dynamicfilter.xml
+++ b/src/etc/testcases/filters/dynamicfilter.xml
@@ -20,20 +20,20 @@
   
 
   
-
+
   
 
   
 
-  
-  
+  
+  
 
-
   
 
-
+
 
   hello world
 

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/filters/head-tail.xml
--
diff --git a/src/etc/testcases/filters/head-tail.xml 
b/src/etc/testcases/filters/head-tail.xml
index 9bff110..e0ffed7 100644
--- a/src/etc/testcases/filters/head-tail.xml
+++ b/src/etc/testcases/filters/head-tail.xml
@@ -20,7 +20,7 @@
   
 
   
-
+
   
 
 
@@ -59,7 +59,7 @@
   
 
   
-
   
 
@@ -113,7 +113,7 @@
   
 
   
-
   
 

http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/filters/tokenfilter.xml
--
diff --git a/src/etc/testcases/filters/tokenfilter.xml 
b/src/etc/testcases/filters/tokenfilter.xml
index de468c1..b1b5aef 100644
--- a/src/etc/testcases/filters/token

[17/23] ant git commit: Revert "Trailing whitespace"

[jaikiran]

http://git-wip-us.apache.org/repos/asf/ant/blob/84fe46d6/src/etc/testcases/types/selectors/scriptselector.xml
--
diff --git a/src/etc/testcases/types/selectors/scriptselector.xml 
b/src/etc/testcases/types/selectors/scriptselector.xml
index 2405e33..80afe30 100644
--- a/src/etc/testcases/types/selectors/scriptselector.xml
+++ b/src/etc/testcases/types/selectors/scriptselector.xml
@@ -17,8 +17,8 @@
 -->
 
 
-  
-
+  
+  
   
 
 
@@ -33,8 +33,8 @@
 
   
 
-  
-
+
+  
   
 
 
@@ -47,18 +47,18 @@
 
   
 
-  
+  
 
   
   
-
+
 
   
 
   
-
+
   
-
+
   self.setSelected(true);
 
   
@@ -66,7 +66,7 @@
   
 
   
-
+
   
 
 
@@ -76,7 +76,7 @@
 
 
   
-
+
   
 
   self.setSelected(false);
@@ -95,29 +95,29 @@
   
 
   
-
+  
   
-
+
   
 
   self.setSelected(file.equals(self.getFile()));
 
   
 
-  
+
 
   
-
+
   
 
   self.setSelected(filename.equals(self.getFilename()));
 
   
 
-  
-
+  
+  
   
-
+
   
 
   self.setSelected(basedir.equals(self.getBasedir()));
@@ -125,14 +125,14 @@
   
 
   
-
+  
   
-
+
   
 
   self.setSelected((filename.length%2)==0);
 
   
 
-  
+  
 

http://git-wip-us.apache.org/repos/asf/ant/blob/84fe46d6/src/etc/testcases/types/selectors/signedselector.xml
--
diff --git a/src/etc/testcases/types/selectors/signedselector.xml 
b/src/etc/testcases/types/selectors/signedselector.xml
index ea611e8..60fe940 100644
--- a/src/etc/testcases/types/selectors/signedselector.xml
+++ b/src/etc/testcases/types/selectors/signedselector.xml
@@ -31,7 +31,7 @@
   
 
   
-
+  
   
 
   

http://git-wip-us.apache.org/repos/asf/ant/blob/84fe46d6/src/etc/testcases/types/xmlcatalog.xml
--
diff --git a/src/etc/testcases/types/xmlcatalog.xml 
b/src/etc/testcases/types/xmlcatalog.xml
index 0c53666..63269f7 100644
--- a/src/etc/testcases/types/xmlcatalog.xml
+++ b/src/etc/testcases/types/xmlcatalog.xml
@@ -26,120 +26,125 @@
 buildfile is called by
 org.apache.tools.ant.types.XMLCatalogBuildFileTest.java
 Alternatively, you may try it out by hand by first removing the
-comment symbols around the echo statements and then calling
+comment symbols around the echo statements and then calling 
 ant -buildfile xmlcatalog.xml
   
 
-  
+  
 
-  
+  
 
-  
+  
 
+  quiet = "yes"
+  file  = "result.out"/>
 
+  basedir   = "${basedir}"
+  destdir   = "${basedir}"
+  extension = ".text"
+  style = "${transformer}"
+  in= "xmlcatalog1.xml"
+  out   = "result.out">
   
+name   = "outprop"
+expression = "val1"/>
 
-
-
+
+
 
+  quiet = "yes"
+  file  = "result.out"/>
   
 
-  
+  
 
+  quiet = "yes"
+  file  = "result.out"/>
 
+  basedir   = "${basedir}"
+  destdir   = "${basedir}"
+  extension = ".text"
+  style = "${transformer}"
+  in= "xmlcatalog1.xml"
+  out   = "result.out">
   
+name   = "outprop"
+expression = "val2"/>
   
-
+
   
 
-
-
+
+
 
+  quiet = "yes"
+  file  = "result.out"/>
   
 
-  
+  
 
+  quiet = "yes"
+  file  = "result.out"/>
 
+  basedir   = "${basedir}"
+  destdir   = "${basedir}"
+  extension = ".text"
+  style = "${transformer}"
+  in= "xmlcatalog2.xml"
+  out   = "result.out">
   
+name   = "outprop"
+expression = "val3"/>
 
-
-
+
+
 
+  quiet = "yes"
+  file  = "result.out"/>
   
 
-  
+  
 
+  quiet = "yes"
+  file  = "result.out"/>
 
+  basedir   = "${basedir}"
+  destdir   = "${basedir}"
+  extension = ".text"
+  style = "${transformer}"
+  in= "xmlcatalog2.xml"
+  out   = "result.out">
   
+name   = "outprop"
+expression = "val4"/>
   
-
+
   
 
-
-
+
+
 
+  quiet = "yes"
+  file  = "result.out"/>
   
 
 

http://git-wip-us.apache.org/repos/asf/ant/blob/84fe46d6/src/etc/testcases/types/xmlcatalog.xsl
--
diff --git a/src/etc/testcases/types/xmlcatalog.xsl 
b/src/etc/testcases/types/xmlcatalog.xsl
index 62621eb..a2c839c 100644
--- a/src/etc/testcases/types/xmlcatalog.xsl
+++ b/src/etc/testcases/types/xmlcatalog.xsl
@@ -15,12 +15,12 @@
   See the License for th

[16/23] ant git commit: Revert "Trailing whitespace"

[jaikiran]

http://git-wip-us.apache.org/repos/asf/ant/blob/84fe46d6/src/tests/antunit/taskdefs/copy-test.xml
--
diff --git a/src/tests/antunit/taskdefs/copy-test.xml 
b/src/tests/antunit/taskdefs/copy-test.xml
index b18b05d..d0fb49d 100644
--- a/src/tests/antunit/taskdefs/copy-test.xml
+++ b/src/tests/antunit/taskdefs/copy-test.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 
-  
+  
 
   
 
@@ -194,7 +194,8 @@ public class NullByteStreamResource extends Resource {
   
 
   https://issues.apache.org/bugzilla/show_bug.cgi?id=43574";>
+  
description="https://issues.apache.org/bugzilla/show_bug.cgi?id=43574";
+  >
 
 
 
@@ -215,16 +216,16 @@ public class NullByteStreamResource extends Resource {
 
 
   
-
-
+
+
   
 
 
 
 
   
-
-
+
+
   
 
 
@@ -243,8 +244,8 @@ public class NullByteStreamResource extends Resource {
   
 
 
-
-
+
+   
   
 
   
@@ -407,7 +408,8 @@ public class NullByteStreamResource extends Resource {
   
 
   https://issues.apache.org/bugzilla/show_bug.cgi?id=49756";>
+  
description="https://issues.apache.org/bugzilla/show_bug.cgi?id=49756";
+  >
 
 
 
@@ -468,8 +470,8 @@ public class NullByteStreamResource extends Resource {
 
 
   
-
-
+   
+   
   
 
 

http://git-wip-us.apache.org/repos/asf/ant/blob/84fe46d6/src/tests/antunit/taskdefs/cvs/cvs.xml
--
diff --git a/src/tests/antunit/taskdefs/cvs/cvs.xml 
b/src/tests/antunit/taskdefs/cvs/cvs.xml
index e1101ea..564e587 100644
--- a/src/tests/antunit/taskdefs/cvs/cvs.xml
+++ b/src/tests/antunit/taskdefs/cvs/cvs.xml
@@ -20,7 +20,7 @@
  requires a working CVS client. -->
 
 
-  
+  
 
   
   

http://git-wip-us.apache.org/repos/asf/ant/blob/84fe46d6/src/tests/antunit/taskdefs/defaultexcludes-test.xml
--
diff --git a/src/tests/antunit/taskdefs/defaultexcludes-test.xml 
b/src/tests/antunit/taskdefs/defaultexcludes-test.xml
index 6e1c36c..cbea93c 100644
--- a/src/tests/antunit/taskdefs/defaultexcludes-test.xml
+++ b/src/tests/antunit/taskdefs/defaultexcludes-test.xml
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 
-  
+  
 
   
 

http://git-wip-us.apache.org/repos/asf/ant/blob/84fe46d6/src/tests/antunit/taskdefs/delete-and-symlinks-test.xml
--
diff --git a/src/tests/antunit/taskdefs/delete-and-symlinks-test.xml 
b/src/tests/antunit/taskdefs/delete-and-symlinks-test.xml
index 6d652cb..ac78994 100644
--- a/src/tests/antunit/taskdefs/delete-and-symlinks-test.xml
+++ b/src/tests/antunit/taskdefs/delete-and-symlinks-test.xml
@@ -18,11 +18,11 @@
 
 
-
-  
+  
+  
 
   
-
+
   
 
   

http://git-wip-us.apache.org/repos/asf/ant/blob/84fe46d6/src/tests/antunit/taskdefs/delete-test.xml
--
diff --git a/src/tests/antunit/taskdefs/delete-test.xml 
b/src/tests/antunit/taskdefs/delete-test.xml
index 73355cb..554f08f 100644
--- a/src/tests/antunit/taskdefs/delete-test.xml
+++ b/src/tests/antunit/taskdefs/delete-test.xml
@@ -18,8 +18,8 @@
 
 
-
-  
+  
+  
 
   
   
@@ -36,13 +36,13 @@

 
 
-
-
+
+  
 

 
 
-
+
 
 
 
@@ -53,7 +53,7 @@
 
 
 
-
+
 
 
 
@@ -63,13 +63,13 @@
 
 
 
-
+
 
   
 
   
 
-  
+  
 
   
 
@@ -79,7 +79,7 @@
  resource="${output}/foo"/>
 
 
-
+
   
 
   
@@ -92,11 +92,12 @@
 
 
-
+
   
 
   https://issues.apache.org/bugzilla/show_bug.cgi?id=43574";>
+  
description="https://issues.apache.org/bugzilla/show_bug.cgi?id=43574";
+  >
 
 
 
@@ -116,16 +117,16 @@
 
 
   
-
-
+
+
   
 
 
 
 
   
-
-
+
+
   
 
 

http://git-wip-us.apache.org/repos/asf/ant/blob/84fe46d6/src/tests/antunit/taskdefs/dependset-test.xml
--
diff --git a/src/tests/antunit/taskdefs/dependset-test.xml 
b/src/tests/antunit/taskdefs/dependset-test.xml
index 83df403..5525259 100644
--- a/src/tests/antunit/taskdefs/dependset-test.xml
+++ b/src/tests/antunit/taskdefs/dependset-test.xml
@@ -18,23 +18,23 @@
 
 
 
-  
+  
 
   
-
-
+
+
   
 
   
 
-  
+  
 
   
 
   
 
   
-
+
   
 
   
@@ -42,155 +42,155 @@
   
 
   
-
+
   
 
   
 
   
-
+
 
-  
-  
+  
+  
 
-
+
   
 
   
-
-
-
+
+
+

[19/23] ant git commit: Revert "Trailing whitespace"

[jaikiran]

http://git-wip-us.apache.org/repos/asf/ant/blob/84fe46d6/src/etc/testcases/taskdefs/optional/depend/depend.xml
--
diff --git a/src/etc/testcases/taskdefs/optional/depend/depend.xml 
b/src/etc/testcases/taskdefs/optional/depend/depend.xml
index 2eb39c5..26260a7 100644
--- a/src/etc/testcases/taskdefs/optional/depend/depend.xml
+++ b/src/etc/testcases/taskdefs/optional/depend/depend.xml
@@ -24,7 +24,7 @@
 
 
   
-
+
 
   
 
@@ -105,17 +105,17 @@
   
 
   
-
+
 
   
-
-
+
+
   
 
 
   
-
-
+
+
   
 
   
@@ -159,7 +159,7 @@
 
   
 
-  
+
 
   
 
@@ -176,7 +176,7 @@
 
 
 
+   classpathref="path.compile" fork="false" />
 

 
   
-
-
   
 

http://git-wip-us.apache.org/repos/asf/ant/blob/84fe46d6/src/etc/testcases/taskdefs/optional/depend/src1/A.java
--
diff --git a/src/etc/testcases/taskdefs/optional/depend/src1/A.java 
b/src/etc/testcases/taskdefs/optional/depend/src1/A.java
index b7452c7..dc6df23 100644
--- a/src/etc/testcases/taskdefs/optional/depend/src1/A.java
+++ b/src/etc/testcases/taskdefs/optional/depend/src1/A.java
@@ -17,3 +17,4 @@ limitations under the License.
 public class A extends B {
 private D d = new D();
 }
+

http://git-wip-us.apache.org/repos/asf/ant/blob/84fe46d6/src/etc/testcases/taskdefs/optional/depend/src1/B.java
--
diff --git a/src/etc/testcases/taskdefs/optional/depend/src1/B.java 
b/src/etc/testcases/taskdefs/optional/depend/src1/B.java
index 86abefd..4be51f7 100644
--- a/src/etc/testcases/taskdefs/optional/depend/src1/B.java
+++ b/src/etc/testcases/taskdefs/optional/depend/src1/B.java
@@ -16,3 +16,4 @@ limitations under the License.
 */
 public class B extends C {
 }
+

http://git-wip-us.apache.org/repos/asf/ant/blob/84fe46d6/src/etc/testcases/taskdefs/optional/depend/src1/C.java
--
diff --git a/src/etc/testcases/taskdefs/optional/depend/src1/C.java 
b/src/etc/testcases/taskdefs/optional/depend/src1/C.java
index 766c9bb..d2bfca9 100644
--- a/src/etc/testcases/taskdefs/optional/depend/src1/C.java
+++ b/src/etc/testcases/taskdefs/optional/depend/src1/C.java
@@ -16,3 +16,4 @@ limitations under the License.
 */
 public class C {
 }
+

http://git-wip-us.apache.org/repos/asf/ant/blob/84fe46d6/src/etc/testcases/taskdefs/optional/depend/src1/D.java
--
diff --git a/src/etc/testcases/taskdefs/optional/depend/src1/D.java 
b/src/etc/testcases/taskdefs/optional/depend/src1/D.java
index 81f4545..127de57 100644
--- a/src/etc/testcases/taskdefs/optional/depend/src1/D.java
+++ b/src/etc/testcases/taskdefs/optional/depend/src1/D.java
@@ -16,3 +16,4 @@ limitations under the License.
 */
 public class D {
 }
+

http://git-wip-us.apache.org/repos/asf/ant/blob/84fe46d6/src/etc/testcases/taskdefs/optional/depend/src1/E.java
--
diff --git a/src/etc/testcases/taskdefs/optional/depend/src1/E.java 
b/src/etc/testcases/taskdefs/optional/depend/src1/E.java
index 4f4834f..0efd613 100644
--- a/src/etc/testcases/taskdefs/optional/depend/src1/E.java
+++ b/src/etc/testcases/taskdefs/optional/depend/src1/E.java
@@ -19,3 +19,4 @@ public class E {
 System.out.println(A.class);
 }
 }
+

http://git-wip-us.apache.org/repos/asf/ant/blob/84fe46d6/src/etc/testcases/taskdefs/optional/depend/src2/A.java
--
diff --git a/src/etc/testcases/taskdefs/optional/depend/src2/A.java 
b/src/etc/testcases/taskdefs/optional/depend/src2/A.java
index a9a07fa..02b35be 100644
--- a/src/etc/testcases/taskdefs/optional/depend/src2/A.java
+++ b/src/etc/testcases/taskdefs/optional/depend/src2/A.java
@@ -18,3 +18,4 @@ public class A {
 static private class Inner extends B {
 }
 }
+

http://git-wip-us.apache.org/repos/asf/ant/blob/84fe46d6/src/etc/testcases/taskdefs/optional/depend/src2/B.java
--
diff --git a/src/etc/testcases/taskdefs/optional/depend/src2/B.java 
b/src/etc/testcases/taskdefs/optional/depend/src2/B.java
index 0811180..bc7b7d2 100644
--- a/src/etc/testcases/taskdefs/optional/depend/src2/B.java
+++ b/src/etc/testcases/taskdefs/optional/depend/src2/B.java
@@ -16,3 +16,4 @@ limitations under the License.
 */
 public class B {
 }
+

http://git-wip-us.apache.org/repos/asf/ant/blob/84fe46d6/src/etc/testcases/taskdefs/optional/depend/src3/A.java
---

[15/23] ant git commit: Revert "Trailing whitespace"

[jaikiran]

http://git-wip-us.apache.org/repos/asf/ant/blob/84fe46d6/src/tests/antunit/taskdefs/exec/exec-test.xml
--
diff --git a/src/tests/antunit/taskdefs/exec/exec-test.xml 
b/src/tests/antunit/taskdefs/exec/exec-test.xml
index b4e7f52..25b0088 100644
--- a/src/tests/antunit/taskdefs/exec/exec-test.xml
+++ b/src/tests/antunit/taskdefs/exec/exec-test.xml
@@ -16,20 +16,20 @@
   limitations under the License.
 -->
 
-
+
 
 
-
-
-
+
+
+
 
 
 
-
+
 
-
+
 
-
+
 
 
 
@@ -38,78 +38,78 @@
 
 
 
-
-
-
+
+
+
 
-
+
 
-
+
 
 
-
-
+
+
 
 
 
-
+
 
-
+
 
 
-
-
+
+
 
 
 
-
+
 
-
+
 
 
-
-
+
+
 
 
 
 
 
 
-
-
+
+
 
-
-
+
+
 
 
 
 
-
-
+
+
 
 
 
 ${ant.file} out${line.separator}${ant.file} 
err
-
+
 
 
 
 
 
 
-
-
+
+
 
 
 
 ${ant.file} out
-
+
 
 
 
 
 ${ant.file} err
-
+
 
 
 
@@ -117,17 +117,17 @@
 
 
-
-
+
+
 
 
 
 ${ant.file} out
-
-
+
+
 
 
-
+
 
 
 
-
-
+
+
 
 
 
 ${ant.file} out
-
-
+
+
 
 
 
 
 ${ant.file} err
-
-
+
+
 
 
 
@@ -159,19 +159,19 @@
 
-
+
 
 
 
-
-
+
+
 
 
 
-
+
 
 
-
+
 
 
 
@@ -181,19 +181,19 @@
 
-
+
 
 
 
-
-
+
+
 
 
 
-
+
 
 
-
+
 
 
 
@@ -202,22 +202,22 @@
 
-
+
 
 
 
-
+
 
 
 
-
-
+
+
 
 
-
+
 
 
-
+
 
 
 
@@ -225,85 +225,85 @@
 depends="setUp" if="test.can.run">
 
 
-
-
-
-
+
+
+
+
 
 
 
 
 
 
-
-
-
+
+
+
 
 
 
 ${ant.file} out${line.separator}${ant.file} 
err
-
+
 
 
 
 
 
 
-
-
-
+
+
+
 
 
 
 ${ant.file} out
-
+
 
 
 
 
 ${ant.file} err
-
+
 
 
 
 
 
 
-
-
+
+
 
+outputproperty="redirector.out" />
 
 
 
 ${ant.file} out
-
-
+
+
 
 
- 

[12/23] ant git commit: Revert "Trailing whitespace"

[jaikiran]

http://git-wip-us.apache.org/repos/asf/ant/blob/84fe46d6/src/tests/antunit/types/resources/selectors/test.xml
--
diff --git a/src/tests/antunit/types/resources/selectors/test.xml 
b/src/tests/antunit/types/resources/selectors/test.xml
index fb022ba..24b804a 100644
--- a/src/tests/antunit/types/resources/selectors/test.xml
+++ b/src/tests/antunit/types/resources/selectors/test.xml
@@ -19,29 +19,29 @@
  xmlns:rsel="antlib:org.apache.tools.ant.types.resources.selectors"
  xmlns:rcmp="antlib:org.apache.tools.ant.types.resources.comparators">
 
-  
+  
 
-  
+
   
 
   
   
   
 
-  
-
+  
+
   
 
   
 
   
-
-
-
-
-
+
+
+
+
+
   
-  
+  
 
   
 
@@ -52,28 +52,28 @@
   
 
   
-
-
-
+
+
+
   
-  
+  
 
   
 
   
 
-  
+  
 
   
 
   
 
   
-
-
-
+
+
+
   
-  
+  
 
   
 
@@ -84,13 +84,13 @@
   
 
   
-
-http://ant.apache.org/index.html"/>
-
-
-
+
+http://ant.apache.org/index.html"; />
+
+
+
   
-  
+  
 
   
 
@@ -98,15 +98,15 @@
 
   
 
+ classname="org.apache.tools.ant.types.resources.FileResource" />
 
   
 
   
-
-
+
+
   
-  
+  
 
   
 
@@ -114,66 +114,66 @@
 
   
 
+ classname="org.apache.tools.ant.types.resources.FileResource" />
 
   
 
   
-
-
+
+
   
-  
+  
 
   
 
   
 
   
+depends="testinstanceoftype1,testinstanceoftype2,testinstanceoftype3" />
 
   
 
   
 
   
-
+
   
-  
+  
 
   
 
   
 
-  
+  
 
   
 
-   
-   
-   
-   
+   
+   
+   
+   
 
 
   
 
-  
-  
+  
+  
 
   
 
 
   
 
-  
-  
+  
+  
 
   
 
 
   
 
-  
-  
+  
+  
 
   
 
@@ -184,13 +184,13 @@
   
 
   
- 
- 
- 
- 
- 
+ 
+ 
+ 
+ 
+ 
   
-  
+  
 
   
 
@@ -201,13 +201,13 @@
   
 
   
- 
- 
- 
- 
- 
+ 
+ 
+ 
+ 
+ 
   
-  
+  
 
   
 
@@ -218,14 +218,14 @@
   
 
   
-
-
-
-
+
+
+
+
   
   
-
-
+
+
   
 
   
@@ -237,14 +237,14 @@
   
 
   
-
-
-
-
+
+
+
+
   
   
-
-
+
+
   
 
   
@@ -256,13 +256,13 @@
   
 
   
-
-
-
-
+
+
+
+
   
   
-
+
   
 
   
@@ -274,14 +274,14 @@
   
 
   
-
-
-
-
+
+
+
+
   
   
-
-
+
+
   
 
   
@@ -293,15 +293,15 @@
   
 
   
-
-
-
-
+
+
+
+
   
   
-
-
-
+
+
+
   
 
   
@@ -313,15 +313,15 @@
   
 
   
-
-
-
-
+
+
+
+
   
   
-
-
-
+
+
+
   
 
   

[2/2] ant git commit: Mention the support for SubjectAlternativeName in generatekey task

[jaikiran]

Mention the support for SubjectAlternativeName in generatekey task

This closes #64 PR at github/apache/ant


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/a5fe8b61
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/a5fe8b61
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/a5fe8b61

Branch: refs/heads/1.9.x
Commit: a5fe8b61f1b0f0b07ebf096a91e9ae7b4b0524ae
Parents: 05d05a0
Author: Jaikiran Pai 
Authored: Mon Jul 16 10:47:04 2018 +0530
Committer: Jaikiran Pai 
Committed: Mon Jul 16 10:47:04 2018 +0530

--
 CONTRIBUTORS| 1 +
 WHATSNEW| 6 ++
 src/main/org/apache/tools/ant/taskdefs/GenerateKey.java | 1 +
 3 files changed, 8 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/a5fe8b61/CONTRIBUTORS
--
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index bb1705b..33cf2d4 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -206,6 +206,7 @@ Josh Lucas
 Juerg Wanner
 Julian Simpson
 Justin Vallon
+Karl Jansen
 Keiron Liddle
 Keith Visco
 Kevin Connor Arpe

http://git-wip-us.apache.org/repos/asf/ant/blob/a5fe8b61/WHATSNEW
--
diff --git a/WHATSNEW b/WHATSNEW
index e887ad5..357168a 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -1,6 +1,12 @@
 Changes from Ant 1.9.13 TO Ant 1.9.14
 =
 
+Other changes:
+--
+ * generatekey task now supports SubjectAlternativeName during key
+   generation.
+
+
 Changes from Ant 1.9.12 TO Ant 1.9.13
 =
 

http://git-wip-us.apache.org/repos/asf/ant/blob/a5fe8b61/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java
--
diff --git a/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java 
b/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java
index d9f8f72..14709a4 100644
--- a/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java
+++ b/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java
@@ -226,6 +226,7 @@ public class GenerateKey extends Task {
  * The subject alternative name for entity.
  *
  * @param saname subject alternative name
+ * @since Ant 1.9.14
  */
 public void setSaname(final String saname) {
 if (JavaEnvUtils.isAtLeastJavaVersion(JavaEnvUtils.JAVA_1_7)) {

[1/2] ant git commit: Add support for SAN extension in GenerateKey task

[jaikiran]

Repository: ant
Updated Branches:
  refs/heads/1.9.x cd458baf4 -> a5fe8b61f


Add support for SAN extension in GenerateKey task


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/05d05a0b
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/05d05a0b
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/05d05a0b

Branch: refs/heads/1.9.x
Commit: 05d05a0bd6636f86ffebe165817b1e5cd508bc31
Parents: cd458ba
Author: Karl Jansen 
Authored: Wed Jul 11 14:19:29 2018 -0700
Committer: Jaikiran Pai 
Committed: Mon Jul 16 10:41:22 2018 +0530

--
 .../apache/tools/ant/taskdefs/GenerateKey.java  | 24 ++--
 1 file changed, 22 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/05d05a0b/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java
--
diff --git a/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java 
b/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java
index c26ac36..d9f8f72 100644
--- a/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java
+++ b/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java
@@ -181,6 +181,7 @@ public class GenerateKey extends Task {
 
 protected String sigalg;
 protected String keyalg;
+protected String saname;
 protected String dname;
 protected DistinguishedName expandedDname;
 protected int keysize;
@@ -222,6 +223,20 @@ public class GenerateKey extends Task {
 }
 
 /**
+ * The subject alternative name for entity.
+ *
+ * @param saname subject alternative name
+ */
+public void setSaname(final String saname) {
+if (JavaEnvUtils.isAtLeastJavaVersion(JavaEnvUtils.JAVA_1_7)) {
+this.saname = saname;
+} else {
+log("The SubjectAlternativeName extension is not available for "
+   +"the Java Version being used.");
+}
+}
+
+/**
  * The alias to add under.
  *
  * @param alias alias to add under
@@ -400,7 +415,6 @@ public class GenerateKey extends Task {
 sb.append("\" ");
 }
 
-
 if (0 < keysize) {
 sb.append("-keysize \"");
 sb.append(keysize);
@@ -413,6 +427,13 @@ public class GenerateKey extends Task {
 sb.append("\" ");
 }
 
+if (null != saname) {
+sb.append("-ext ");
+sb.append("\"san=");
+sb.append(saname);
+sb.append("\" ");
+}
+
 log("Generating Key for " + alias);
 final ExecTask cmd = new ExecTask(this);
 cmd.setExecutable(JavaEnvUtils.getJdkExecutable("keytool"));
@@ -423,4 +444,3 @@ public class GenerateKey extends Task {
 cmd.execute();
 }
 }
-

[2/3] ant git commit: Mention the support for SubjectAlternativeName in generatekey task

[jaikiran]

Mention the support for SubjectAlternativeName in generatekey task

This closes #64 PR at github/apache/ant


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/a5fe8b61
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/a5fe8b61
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/a5fe8b61

Branch: refs/heads/master
Commit: a5fe8b61f1b0f0b07ebf096a91e9ae7b4b0524ae
Parents: 05d05a0
Author: Jaikiran Pai 
Authored: Mon Jul 16 10:47:04 2018 +0530
Committer: Jaikiran Pai 
Committed: Mon Jul 16 10:47:04 2018 +0530

--
 CONTRIBUTORS| 1 +
 WHATSNEW| 6 ++
 src/main/org/apache/tools/ant/taskdefs/GenerateKey.java | 1 +
 3 files changed, 8 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/a5fe8b61/CONTRIBUTORS
--
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index bb1705b..33cf2d4 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -206,6 +206,7 @@ Josh Lucas
 Juerg Wanner
 Julian Simpson
 Justin Vallon
+Karl Jansen
 Keiron Liddle
 Keith Visco
 Kevin Connor Arpe

http://git-wip-us.apache.org/repos/asf/ant/blob/a5fe8b61/WHATSNEW
--
diff --git a/WHATSNEW b/WHATSNEW
index e887ad5..357168a 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -1,6 +1,12 @@
 Changes from Ant 1.9.13 TO Ant 1.9.14
 =
 
+Other changes:
+--
+ * generatekey task now supports SubjectAlternativeName during key
+   generation.
+
+
 Changes from Ant 1.9.12 TO Ant 1.9.13
 =
 

http://git-wip-us.apache.org/repos/asf/ant/blob/a5fe8b61/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java
--
diff --git a/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java 
b/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java
index d9f8f72..14709a4 100644
--- a/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java
+++ b/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java
@@ -226,6 +226,7 @@ public class GenerateKey extends Task {
  * The subject alternative name for entity.
  *
  * @param saname subject alternative name
+ * @since Ant 1.9.14
  */
 public void setSaname(final String saname) {
 if (JavaEnvUtils.isAtLeastJavaVersion(JavaEnvUtils.JAVA_1_7)) {

[3/3] ant git commit: Merge 1.9.x branch

[jaikiran]

Merge 1.9.x branch


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/d5772785
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/d5772785
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/d5772785

Branch: refs/heads/master
Commit: d577278560ba5b8f6c7137e8db1c56c22f7cca04
Parents: f5b7d05 a5fe8b6
Author: Jaikiran Pai 
Authored: Mon Jul 16 10:52:17 2018 +0530
Committer: Jaikiran Pai 
Committed: Mon Jul 16 10:52:17 2018 +0530

--
 CONTRIBUTORS|  1 +
 WHATSNEW|  6 +
 .../apache/tools/ant/taskdefs/GenerateKey.java  | 24 +++-
 3 files changed, 30 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/d5772785/CONTRIBUTORS
--

http://git-wip-us.apache.org/repos/asf/ant/blob/d5772785/WHATSNEW
--
diff --cc WHATSNEW
index 462a041,357168a..f93d0af
--- a/WHATSNEW
+++ b/WHATSNEW
@@@ -1,7 -1,13 +1,13 @@@
 -Changes from Ant 1.9.13 TO Ant 1.9.14
 +Changes from Ant 1.10.5 TO Ant 1.10.6
  =
  
+ Other changes:
+ --
+  * generatekey task now supports SubjectAlternativeName during key
+generation.
+ 
+ 
 -Changes from Ant 1.9.12 TO Ant 1.9.13
 +Changes from Ant 1.10.4 TO Ant 1.10.5
  =
  
  Fixed bugs:

http://git-wip-us.apache.org/repos/asf/ant/blob/d5772785/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java
--

[1/3] ant git commit: Add support for SAN extension in GenerateKey task

[jaikiran]

Repository: ant
Updated Branches:
  refs/heads/master f5b7d05ef -> d57727856


Add support for SAN extension in GenerateKey task


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/05d05a0b
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/05d05a0b
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/05d05a0b

Branch: refs/heads/master
Commit: 05d05a0bd6636f86ffebe165817b1e5cd508bc31
Parents: cd458ba
Author: Karl Jansen 
Authored: Wed Jul 11 14:19:29 2018 -0700
Committer: Jaikiran Pai 
Committed: Mon Jul 16 10:41:22 2018 +0530

--
 .../apache/tools/ant/taskdefs/GenerateKey.java  | 24 ++--
 1 file changed, 22 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/05d05a0b/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java
--
diff --git a/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java 
b/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java
index c26ac36..d9f8f72 100644
--- a/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java
+++ b/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java
@@ -181,6 +181,7 @@ public class GenerateKey extends Task {
 
 protected String sigalg;
 protected String keyalg;
+protected String saname;
 protected String dname;
 protected DistinguishedName expandedDname;
 protected int keysize;
@@ -222,6 +223,20 @@ public class GenerateKey extends Task {
 }
 
 /**
+ * The subject alternative name for entity.
+ *
+ * @param saname subject alternative name
+ */
+public void setSaname(final String saname) {
+if (JavaEnvUtils.isAtLeastJavaVersion(JavaEnvUtils.JAVA_1_7)) {
+this.saname = saname;
+} else {
+log("The SubjectAlternativeName extension is not available for "
+   +"the Java Version being used.");
+}
+}
+
+/**
  * The alias to add under.
  *
  * @param alias alias to add under
@@ -400,7 +415,6 @@ public class GenerateKey extends Task {
 sb.append("\" ");
 }
 
-
 if (0 < keysize) {
 sb.append("-keysize \"");
 sb.append(keysize);
@@ -413,6 +427,13 @@ public class GenerateKey extends Task {
 sb.append("\" ");
 }
 
+if (null != saname) {
+sb.append("-ext ");
+sb.append("\"san=");
+sb.append(saname);
+sb.append("\" ");
+}
+
 log("Generating Key for " + alias);
 final ExecTask cmd = new ExecTask(this);
 cmd.setExecutable(JavaEnvUtils.getJdkExecutable("keytool"));
@@ -423,4 +444,3 @@ public class GenerateKey extends Task {
 cmd.execute();
 }
 }
-