Jenkins build became unstable: Ant-Build-Matrix-1.9.x-Windows » JDK 1.8.0_121 (unlimited security) 64-bit Windows only,Windows #118

2018-02-08 Thread Apache Jenkins Server
See 




Jenkins build became unstable: Ant-Build-Matrix-1.9.x-Windows » JDK 1.7 (unlimited security) 64-bit Windows only,Windows #118

2018-02-08 Thread Apache Jenkins Server
See 




Jenkins build became unstable: Ant-Build-Matrix-master-Windows » JDK 1.8.0_121 (unlimited security) 64-bit Windows only,Windows #177

2018-02-08 Thread Apache Jenkins Server
See 




Jenkins build became unstable: Ant-Build-Matrix-master-Linux » xenial,JDK 1.8 (latest) #1065

2018-02-08 Thread Apache Jenkins Server
See 




ant git commit: Fix previous commit - Java 5 doesn't allow @Override on implementation methods of an interface

2018-02-08 Thread jaikiran
Repository: ant
Updated Branches:
  refs/heads/1.9.x e3f525091 -> f3b8ace71


Fix previous commit - Java 5 doesn't allow @Override on implementation methods 
of an interface


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

Branch: refs/heads/1.9.x
Commit: f3b8ace71177558949ee009e5cc7565af0fe8738
Parents: e3f5250
Author: Jaikiran Pai 
Authored: Fri Feb 9 12:46:36 2018 +0530
Committer: Jaikiran Pai 
Committed: Fri Feb 9 12:46:36 2018 +0530

--
 src/main/org/apache/tools/ant/util/IdentityMapper.java | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/f3b8ace7/src/main/org/apache/tools/ant/util/IdentityMapper.java
--
diff --git a/src/main/org/apache/tools/ant/util/IdentityMapper.java 
b/src/main/org/apache/tools/ant/util/IdentityMapper.java
index 18a31e5..9bae6c2 100644
--- a/src/main/org/apache/tools/ant/util/IdentityMapper.java
+++ b/src/main/org/apache/tools/ant/util/IdentityMapper.java
@@ -46,7 +46,6 @@ public class IdentityMapper implements FileNameMapper {
  * @param sourceFileName the name to map.
  * @return the source filename in a one-element array.
  */
-@Override
 public String[] mapFileName(final String sourceFileName) {
 if (sourceFileName == null) {
 // The FileNameMapper#mapFileName contract states that:



[1/3] ant git commit: Fix broken link in junitreport manual

2018-02-08 Thread jaikiran
Repository: ant
Updated Branches:
  refs/heads/master c53eb2b91 -> 1899e40b2


Fix broken link in junitreport manual


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

Branch: refs/heads/master
Commit: a6429c6aa1a713c98528da55059afe9efc2ada59
Parents: 146df36
Author: Jaikiran Pai 
Authored: Wed Feb 7 13:01:54 2018 +0530
Committer: Jaikiran Pai 
Committed: Wed Feb 7 13:01:54 2018 +0530

--
 manual/Tasks/junitreport.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/a6429c6a/manual/Tasks/junitreport.html
--
diff --git a/manual/Tasks/junitreport.html b/manual/Tasks/junitreport.html
index fea85e5..9712014 100644
--- a/manual/Tasks/junitreport.html
+++ b/manual/Tasks/junitreport.html
@@ -171,12 +171,12 @@ These tags can pass XSL parameters to the stylesheet.
 
 classpath
 Since Ant 1.9.5.
-Like for the XSLT task,
+Like for the XSLT task,
 a nested classpath will be used to load the processor.
 
 factory
 Since Ant 1.9.5.
-Like for the XSLT task,
+Like for the XSLT task,
 a nested factory can be used to specify factory settings.
 
 



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

2018-02-08 Thread jaikiran
Merge 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/1899e40b
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/1899e40b
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/1899e40b

Branch: refs/heads/master
Commit: 1899e40b2e3e3297fcd0561b6ad52daffbebcba5
Parents: c53eb2b e3f5250
Author: Jaikiran Pai 
Authored: Fri Feb 9 12:44:37 2018 +0530
Committer: Jaikiran Pai 
Committed: Fri Feb 9 12:44:37 2018 +0530

--
 WHATSNEW  |  3 +++
 src/etc/testcases/taskdefs/pathconvert.xml| 18 ++
 .../org/apache/tools/ant/util/IdentityMapper.java | 10 +-
 .../tools/ant/taskdefs/PathConvertTest.java   | 11 +++
 4 files changed, 41 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/1899e40b/WHATSNEW
--
diff --cc WHATSNEW
index 457af52,2d4b6f1..75e48ff
--- a/WHATSNEW
+++ b/WHATSNEW
@@@ -4,34 -4,12 +4,37 @@@ Changes from Ant 1.10.2 TO Ant 1.10.
  Fixed bugs:
  ---
  
 + * Fixed NullPointerException in ChainedMapper
 +   Bugzilla Report 62086
 +
+  * Fixed NullPointerException when a mappedresource is used in pathconvert
+Bugzilla Report 62076
+ 
  
 -Changes from Ant 1.9.9 TO Ant 1.9.10
 -
 +Changes from Ant 1.10.1 TO Ant 1.10.2
 +=
 +
 +Changes that could break older environments:
 +---
 +
 + * updated the dependency of BCEL to 6.2.
 +   Bugzilla Report 61196
 +
 + * delete task previously would silently accept wildcard (*)
 +   value for the "file" attribute. That's no longer the case
 +   and an exception could get thrown by the underlying filesystem
 +   for such use. Usage like:
 +
 +   
 +
 +   should instead be changed to use resource collections like:
 +
 +   
 +   
 +   
 +
 + * Commons Net 3.6 is binary-code, but not source compatible;
 +   see change list of Commons Net 3.0 for details
  
   * The Log4jListener is marked as deprecated as the required log4j library
 (in version 1.x) is not maintained any more.

http://git-wip-us.apache.org/repos/asf/ant/blob/1899e40b/src/main/org/apache/tools/ant/util/IdentityMapper.java
--
diff --cc src/main/org/apache/tools/ant/util/IdentityMapper.java
index 548803d,18a31e5..dcfa023
--- a/src/main/org/apache/tools/ant/util/IdentityMapper.java
+++ b/src/main/org/apache/tools/ant/util/IdentityMapper.java
@@@ -49,7 -47,15 +49,15 @@@ public class IdentityMapper implements 
   * @return the source filename in a one-element array.
   */
  @Override
 -public String[] mapFileName(final String sourceFileName) {
 +public String[] mapFileName(String sourceFileName) {
- return new String[] { sourceFileName };
+ if (sourceFileName == null) {
+ // The FileNameMapper#mapFileName contract states that:
+ // "if the given rule doesn't apply to the source file,
+ //  implementation must return null"
+ // we consider a null source file name as non-matching and
+ // hence return null
+ return null;
+ }
+ return new String[] {sourceFileName};
  }
  }



[2/3] ant git commit: bz-62076 Make IdentityMapper follow the "mapFileName" API contract to avoid NPE when it deals with a non-matching source file name

2018-02-08 Thread jaikiran
bz-62076 Make IdentityMapper follow the "mapFileName" API contract to avoid NPE 
when it deals with a non-matching source file name


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

Branch: refs/heads/master
Commit: e3f5250916dc0d9493b45b2d8fc6efe3a0fd9fda
Parents: a6429c6
Author: Jaikiran Pai 
Authored: Fri Feb 9 12:36:54 2018 +0530
Committer: Jaikiran Pai 
Committed: Fri Feb 9 12:36:54 2018 +0530

--
 WHATSNEW  |  7 +++
 src/etc/testcases/taskdefs/pathconvert.xml| 18 ++
 .../org/apache/tools/ant/util/IdentityMapper.java | 11 ++-
 .../tools/ant/taskdefs/PathConvertTest.java   | 11 +++
 4 files changed, 46 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/e3f52509/WHATSNEW
--
diff --git a/WHATSNEW b/WHATSNEW
index 17e68ca..2d4b6f1 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -1,6 +1,13 @@
 Changes from Ant 1.9.10 TO Ant 1.9.11
 =
 
+Fixed bugs:
+---
+
+ * Fixed NullPointerException when a mappedresource is used in pathconvert
+   Bugzilla Report 62076
+
+
 Changes from Ant 1.9.9 TO Ant 1.9.10
 
 

http://git-wip-us.apache.org/repos/asf/ant/blob/e3f52509/src/etc/testcases/taskdefs/pathconvert.xml
--
diff --git a/src/etc/testcases/taskdefs/pathconvert.xml 
b/src/etc/testcases/taskdefs/pathconvert.xml
index 1cdcc8c..5a1cdf7 100644
--- a/src/etc/testcases/taskdefs/pathconvert.xml
+++ b/src/etc/testcases/taskdefs/pathconvert.xml
@@ -17,6 +17,8 @@
 -->
 
 
+
+
 
 
 
@@ -39,4 +41,20 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 

http://git-wip-us.apache.org/repos/asf/ant/blob/e3f52509/src/main/org/apache/tools/ant/util/IdentityMapper.java
--
diff --git a/src/main/org/apache/tools/ant/util/IdentityMapper.java 
b/src/main/org/apache/tools/ant/util/IdentityMapper.java
index 22c6c7e..18a31e5 100644
--- a/src/main/org/apache/tools/ant/util/IdentityMapper.java
+++ b/src/main/org/apache/tools/ant/util/IdentityMapper.java
@@ -46,7 +46,16 @@ public class IdentityMapper implements FileNameMapper {
  * @param sourceFileName the name to map.
  * @return the source filename in a one-element array.
  */
-public String[] mapFileName(String sourceFileName) {
+@Override
+public String[] mapFileName(final String sourceFileName) {
+if (sourceFileName == null) {
+// The FileNameMapper#mapFileName contract states that:
+// "if the given rule doesn't apply to the source file,
+//  implementation must return null"
+// we consider a null source file name as non-matching and
+// hence return null
+return null;
+}
 return new String[] {sourceFileName};
 }
 }

http://git-wip-us.apache.org/repos/asf/ant/blob/e3f52509/src/tests/junit/org/apache/tools/ant/taskdefs/PathConvertTest.java
--
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/PathConvertTest.java 
b/src/tests/junit/org/apache/tools/ant/taskdefs/PathConvertTest.java
index 41096b6..f29dc12 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/PathConvertTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/PathConvertTest.java
@@ -57,6 +57,17 @@ public class PathConvertTest {
 buildRule.executeTarget("testnotargetos");
 }
 
+/**
+ * Tests that if a {@code mappedresource}, that excludes certain 
resources, is used in a {@code pathconvert},
+ * then it doesn't lead to a {@link NullPointerException}.
+ *
+ * @see https://bz.apache.org/bugzilla/show_bug.cgi?id=62076;>bz-62076 for 
more details
+ */
+@Test
+public void testNonMatchingMapper() {
+buildRule.executeTarget("test-nonmatching-mapper");
+}
+
 private void test(String target) {
 buildRule.executeTarget(target);
 assertEquals("test#" + BUILD_FILENAME, 
buildRule.getProject().getProperty("result"));



Build failed in Jenkins: Ant-Build-Matrix-1.9.x-Windows » JDK 1.5 (Latest 64 bit on Windows only),Windows #117

2018-02-08 Thread Apache Jenkins Server
See 


Changes:

[jaikiran] bz-62076 Make IdentityMapper follow the "mapFileName" API contract to

--
Started by upstream project "Ant-Build-Matrix-1.9.x-Windows" build number 117
originally caused by:
 Started by an SCM change
[EnvInject] - Loading node environment variables.
Building remotely on windows-2012-1 (Windows) in workspace 

 > git rev-parse --is-inside-work-tree # timeout=10
Fetching changes from the remote Git repository
 > git config remote.origin.url https://git-wip-us.apache.org/repos/asf/ant.git 
 > # timeout=10
Cleaning workspace
 > git rev-parse --verify HEAD # timeout=10
Resetting working tree
 > git reset --hard # timeout=10
 > git clean -fdx # timeout=10
Fetching upstream changes from https://git-wip-us.apache.org/repos/asf/ant.git
 > git --version # timeout=10
 > git fetch --tags --progress https://git-wip-us.apache.org/repos/asf/ant.git 
 > +refs/heads/*:refs/remotes/origin/*
Checking out Revision e3f5250916dc0d9493b45b2d8fc6efe3a0fd9fda 
(refs/remotes/origin/1.9.x)
 > git config core.sparsecheckout # timeout=10
 > git checkout -f e3f5250916dc0d9493b45b2d8fc6efe3a0fd9fda
Commit message: "bz-62076 Make IdentityMapper follow the "mapFileName" API 
contract to avoid NPE when it deals with a non-matching source file name"
 > git rev-list a6429c6aa1a713c98528da55059afe9efc2ada59 # timeout=10
[EnvInject] - Executing scripts and injecting environment variables after the 
SCM step.
[EnvInject] - Injecting as environment variables the properties content 
LANG=en_US.utf8

[EnvInject] - Variables injected successfully.
[Windows] $ cmd.exe /C "F:\jenkins\tools\ant\apache-ant-1.9.9\bin\ant.bat -file 
launch-build.xml '"-Djdk=JDK 1.5 (Latest 64 bit on Windows only)"' 
-Dlabel_exp=Windows -Djenkins=t && exit %%ERRORLEVEL%%"
Buildfile: 


launch:
 [echo] Launching 

 allclean test -Dignore.tests.failed=true -Doptional.jars.whenmanifestonly=skip 
-Djenkins=t
 [exec] 
 [exec] ... Bootstrapping Ant Distribution
 [exec] JAVA_HOME=F:\\hudson\\tools\\java\\jdk1.5.0_22-64
 [exec] JAVA=F:\\hudson\\tools\\java\\jdk1.5.0_22-64\bin\java
 [exec] JAVAC=F:\\hudson\\tools\\java\\jdk1.5.0_22-64\bin\javac
 [exec] 
CLASSPATH=;lib\optional\ant-antunit-1.3.jar;lib\optional\hamcrest-core-1.3.jar;lib\optional\hamcrest-library-1.3.jar;lib\optional\junit-3.8.2.jar;lib\optional\junit-4.12.jar;F:\\hudson\\tools\\java\\jdk1.5.0_22-64\lib\tools.jar;build\classes;src\main;
 [exec] ANT_HOME=.
 [exec] 
 [exec] ... Compiling Ant Classes
 [exec] 
src\main\org\apache\tools\ant\filters\BaseParamFilterReader.java:61: warning: 
setParameters(org.apache.tools.ant.types.Parameter...) in 
org.apache.tools.ant.filters.BaseParamFilterReader cannot implement 
setParameters(org.apache.tools.ant.types.Parameter[]) in 
org.apache.tools.ant.types.Parameterizable; overridden method has no '...'
 [exec] public final void setParameters(final Parameter... parameters) {
 [exec]   ^
 [exec] src\main\org\apache\tools\ant\filters\HeadFilter.java:38: warning: 
setParameters(org.apache.tools.ant.types.Parameter...) in 
org.apache.tools.ant.filters.BaseParamFilterReader cannot implement 
setParameters(org.apache.tools.ant.types.Parameter[]) in 
org.apache.tools.ant.types.Parameterizable; overridden method has no '...'
 [exec] public final class HeadFilter extends BaseParamFilterReader
 [exec]  ^
 [exec] src\main\org\apache\tools\ant\filters\LineContains.java:49: 
warning: setParameters(org.apache.tools.ant.types.Parameter...) in 
org.apache.tools.ant.filters.BaseParamFilterReader cannot implement 
setParameters(org.apache.tools.ant.types.Parameter[]) in 
org.apache.tools.ant.types.Parameterizable; overridden method has no '...'
 [exec] public final class LineContains
 [exec]  ^
 [exec] src\main\org\apache\tools\ant\filters\LineContainsRegExp.java:48: 
warning: setParameters(org.apache.tools.ant.types.Parameter...) in 
org.apache.tools.ant.filters.BaseParamFilterReader cannot implement 
setParameters(org.apache.tools.ant.types.Parameter[]) in 
org.apache.tools.ant.types.Parameterizable; overridden method has no '...'
 [exec] public final class LineContainsRegExp
 [exec]  ^
 [exec] src\main\org\apache\tools\ant\filters\PrefixLines.java:38: warning: 

ant git commit: bz-62076 Make IdentityMapper follow the "mapFileName" API contract to avoid NPE when it deals with a non-matching source file name

2018-02-08 Thread jaikiran
Repository: ant
Updated Branches:
  refs/heads/1.9.x a6429c6aa -> e3f525091


bz-62076 Make IdentityMapper follow the "mapFileName" API contract to avoid NPE 
when it deals with a non-matching source file name


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

Branch: refs/heads/1.9.x
Commit: e3f5250916dc0d9493b45b2d8fc6efe3a0fd9fda
Parents: a6429c6
Author: Jaikiran Pai 
Authored: Fri Feb 9 12:36:54 2018 +0530
Committer: Jaikiran Pai 
Committed: Fri Feb 9 12:36:54 2018 +0530

--
 WHATSNEW  |  7 +++
 src/etc/testcases/taskdefs/pathconvert.xml| 18 ++
 .../org/apache/tools/ant/util/IdentityMapper.java | 11 ++-
 .../tools/ant/taskdefs/PathConvertTest.java   | 11 +++
 4 files changed, 46 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/e3f52509/WHATSNEW
--
diff --git a/WHATSNEW b/WHATSNEW
index 17e68ca..2d4b6f1 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -1,6 +1,13 @@
 Changes from Ant 1.9.10 TO Ant 1.9.11
 =
 
+Fixed bugs:
+---
+
+ * Fixed NullPointerException when a mappedresource is used in pathconvert
+   Bugzilla Report 62076
+
+
 Changes from Ant 1.9.9 TO Ant 1.9.10
 
 

http://git-wip-us.apache.org/repos/asf/ant/blob/e3f52509/src/etc/testcases/taskdefs/pathconvert.xml
--
diff --git a/src/etc/testcases/taskdefs/pathconvert.xml 
b/src/etc/testcases/taskdefs/pathconvert.xml
index 1cdcc8c..5a1cdf7 100644
--- a/src/etc/testcases/taskdefs/pathconvert.xml
+++ b/src/etc/testcases/taskdefs/pathconvert.xml
@@ -17,6 +17,8 @@
 -->
 
 
+
+
 
 
 
@@ -39,4 +41,20 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 

http://git-wip-us.apache.org/repos/asf/ant/blob/e3f52509/src/main/org/apache/tools/ant/util/IdentityMapper.java
--
diff --git a/src/main/org/apache/tools/ant/util/IdentityMapper.java 
b/src/main/org/apache/tools/ant/util/IdentityMapper.java
index 22c6c7e..18a31e5 100644
--- a/src/main/org/apache/tools/ant/util/IdentityMapper.java
+++ b/src/main/org/apache/tools/ant/util/IdentityMapper.java
@@ -46,7 +46,16 @@ public class IdentityMapper implements FileNameMapper {
  * @param sourceFileName the name to map.
  * @return the source filename in a one-element array.
  */
-public String[] mapFileName(String sourceFileName) {
+@Override
+public String[] mapFileName(final String sourceFileName) {
+if (sourceFileName == null) {
+// The FileNameMapper#mapFileName contract states that:
+// "if the given rule doesn't apply to the source file,
+//  implementation must return null"
+// we consider a null source file name as non-matching and
+// hence return null
+return null;
+}
 return new String[] {sourceFileName};
 }
 }

http://git-wip-us.apache.org/repos/asf/ant/blob/e3f52509/src/tests/junit/org/apache/tools/ant/taskdefs/PathConvertTest.java
--
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/PathConvertTest.java 
b/src/tests/junit/org/apache/tools/ant/taskdefs/PathConvertTest.java
index 41096b6..f29dc12 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/PathConvertTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/PathConvertTest.java
@@ -57,6 +57,17 @@ public class PathConvertTest {
 buildRule.executeTarget("testnotargetos");
 }
 
+/**
+ * Tests that if a {@code mappedresource}, that excludes certain 
resources, is used in a {@code pathconvert},
+ * then it doesn't lead to a {@link NullPointerException}.
+ *
+ * @see https://bz.apache.org/bugzilla/show_bug.cgi?id=62076;>bz-62076 for 
more details
+ */
+@Test
+public void testNonMatchingMapper() {
+buildRule.executeTarget("test-nonmatching-mapper");
+}
+
 private void test(String target) {
 buildRule.executeTarget(target);
 assertEquals("test#" + BUILD_FILENAME, 
buildRule.getProject().getProperty("result"));



[Bug 62086] NullPointerException in ChainedMapper.mapFileName when building Lucene with Ant 1.10.2

2018-02-08 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62086

--- Comment #4 from Stefan Bodewig  ---
we'll need to check whether 1.9.10 is affected as well - the Streams
refactoring didn't happen over there, so chances are it is not.

Looking at bug 62076 we probably ought to look at a few more places where the
results of mappers are used and check how they deal with null return values.

@Uwe we would have caught this earlier if Lucene still was built by Gump ;-)
Seriously, I agree a new release should be following soonish. Many thnk for the
quick report and patch, Adrien.

-- 
You are receiving this mail because:
You are the assignee for the bug.

Jenkins build is back to stable : Ant-Build-Matrix-master-Windows » JDK 1.8.0_121 (unlimited security) 64-bit Windows only,Windows #176

2018-02-08 Thread Apache Jenkins Server
See 




ant git commit: There is a var tag in HTML 5…

2018-02-08 Thread gintas
Repository: ant
Updated Branches:
  refs/heads/master 7eeb33d5e -> c53eb2b91


There is a var tag in HTML 5…

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

Branch: refs/heads/master
Commit: c53eb2b91c8a3e70a524d8556906faf3e626a8cc
Parents: 7eeb33d
Author: Gintas Grigelionis 
Authored: Fri Feb 9 07:12:06 2018 +0100
Committer: Gintas Grigelionis 
Committed: Fri Feb 9 07:12:06 2018 +0100

--
 manual/Types/tarfileset.html | 20 +++-
 manual/Types/zipfileset.html | 16 ++--
 2 files changed, 13 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/c53eb2b9/manual/Types/tarfileset.html
--
diff --git a/manual/Types/tarfileset.html b/manual/Types/tarfileset.html
index 3224e7c..0efe28e 100644
--- a/manual/Types/tarfileset.html
+++ b/manual/Types/tarfileset.html
@@ -23,22 +23,19 @@
 
 TarFileSet
 
-TarFileSet has been added as a stand-alone type in Apache Ant
-1.7.
+TarFileSet has been a stand-alone type since Apache Ant 
1.7.
 
 A tarfileset is a special form of a fileset which can behave in 2
 different ways : 
 
 
-  When the src attribute
+  When the src attribute
   is used - or a nested resource collection has been specified, the
-  tarfileset is populated with tar entries found in the file src.
+  tarfileset is populated with tar entries found in the file src.
   
-  When the dir attribute
-is used, the tarfileset is populated with filesystem files found under dir.
+  When the dir attribute
+is used, the tarfileset is populated with filesystem files found under 
dir.
   
 
 tarfileset supports all attributes of 
-A tarfileset can be defined with the id attribute and referred to with the refid attribute.  This is also true
-for tarfileset which has been added in Ant 1.7.
-
+Since Ant 1.7, a tarfileset can be defined with the id 
attribute and referred to with
+the refid attribute.
 Parameters
 
   

http://git-wip-us.apache.org/repos/asf/ant/blob/c53eb2b9/manual/Types/zipfileset.html
--
diff --git a/manual/Types/zipfileset.html b/manual/Types/zipfileset.html
index 45a421d..b82b6e8 100644
--- a/manual/Types/zipfileset.html
+++ b/manual/Types/zipfileset.html
@@ -28,15 +28,13 @@
 different ways : 
 
 
-  When the src attribute
+  When the src attribute
   is used - or a nested resource collection has been specified
   (since Apache Ant 1.7), the zipfileset is populated with
-  zip entries found in the file src.
+  zip entries found in the file src.
   
-  When the dir attribute
-is used, the zipfileset is populated with filesystem files found under dir.
+  When the dir attribute
+is used, the zipfileset is populated with filesystem files found under 
dir.
   
 
 zipfileset supports all attributes of 
 
-Since Ant 1.6, a zipfileset can be defined with the id attribute and referred to with
-the refid attribute.
-
+Since Ant 1.6, a zipfileset can be defined with the id  
attribute and referred to with
+the refid attribute.
 Parameters
 
   



Jenkins build became unstable: Ant-Build-Matrix-master-Windows » JDK 1.8.0_121 (unlimited security) 64-bit Windows only,Windows #175

2018-02-08 Thread Apache Jenkins Server
See 




[3/4] ant git commit: Chop off redundant blockquotes

2018-02-08 Thread gintas
http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/presetdef.html
--
diff --git a/manual/Tasks/presetdef.html b/manual/Tasks/presetdef.html
index d975bf9..8becea2 100644
--- a/manual/Tasks/presetdef.html
+++ b/manual/Tasks/presetdef.html
@@ -71,7 +71,6 @@
   srcdir and destdir
   attributes set. It also has a src element to source files from a 
generated
   directory.
-
 
 presetdef name="my.javac"
javac debug="${debug}" deprecation="${deprecation}"
@@ -80,24 +79,18 @@
/javac
 /presetdef
 
-
   This can be used as a normal javac task - example:
-
 
 my.javac/
 
-
   The attributes specified in the preset task may be overridden - i.e.
   they may be seen as optional attributes - example:
-
 
 my.javac srcdir="${test.src}" deprecation="no"/
 
-
   One may put a presetdef definition in an antlib.
   For example suppose the jar file antgoodies.jar has
   the antlib.xml as follows:
-
 
 antlib
taskdef resource="com/acme/antgoodies/tasks.properties"/
@@ -108,9 +101,7 @@
/presetdef
 /antlib
 
-
   One may then use this in a build file as follows:
-
 
 project default="example" xmlns:antgoodies="antlib:com.acme.antgoodies"
target name="example"
@@ -121,12 +112,10 @@
/target
 /project
 
-
 
   The following is an example of evaluation of properties when the
   definition is used:
 
- 
 
 target name="defineandcall"
presetdef name="showmessage"
@@ -143,11 +132,9 @@
showmessage/
 /target
 
- 
  
 The command ant defineandcall results in the output:
  
- 
 
 defineandcall:
 [showmessage] message is '${message}'
@@ -156,14 +143,13 @@ defineandcall:
 called:
 [showmessage] message is 'Message 2'
 
- 
 
 It is possible to use a trick to evaluate properties when the definition is
 made rather than used. This can be useful if you do not expect some
 properties to be available in child builds run with
 ant ... inheritall="false":
 
-
+
 macrodef name="showmessage-presetdef"
   attribute name="messageval"/
   presetdef name="showmessage"
@@ -171,7 +157,7 @@ properties to be available in child builds run with
   /presetdef
 /macrodef
 showmessage-presetdef messageval="${message}"/
-
+
 
   
 

http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/propertyfile.html
--
diff --git a/manual/Tasks/propertyfile.html b/manual/Tasks/propertyfile.html
index f698301..49444b7 100644
--- a/manual/Tasks/propertyfile.html
+++ b/manual/Tasks/propertyfile.html
@@ -191,7 +191,7 @@ The slashes conform to the expectations of the Properties 
class.  The file will
 The layout and comment of the original file is preserved. New properties are 
added at the end of the file. Existing properties are overwritten in place.
 
 
-propertyfile
+propertyfile
 file=my.properties
 comment=My properties
   entry  key=akey value=avalue/
@@ -200,10 +200,10 @@ The layout and comment of the original file is preserved. 
New properties are add
   entry  key=formated.int type=int 
default=0013 operation=+ pattern=/
   entry  key=formated.date type=date 
value=now pattern=DDD HH:mm/
 /propertyfile
-
+
 
 To produce dates relative from today :
-propertyfile
+propertyfile
 file=my.properties
 comment=My properties
   entry  key=formated.date-1
@@ -213,21 +213,21 @@ To produce dates relative from today :
   type=date default=now pattern=DDD
   operation=+ value=1/
 /propertyfile
-
+
 
 
 Concatenation of strings :
-propertyfile
+propertyfile
 file=my.properties
 comment=My properties
   entry  key=progress default= 
operation=+ value=./
 /propertyfile
-
+
 Each time called, a . will be appended to progress
 
 
 Pumps the project version to the next minor version (increase minor and set 
path=0):
-target name="nextMinorVersion"
+target name="nextMinorVersion"
property
  name="header"
  value="##Generated file - do not modify!"/
@@ -238,7 +238,7 @@ Concatenation of strings :
  entry key="product.build.date"type="date" value="now" /
   /propertyfile
 /target
-
+
 After running this target the version changed e.g. from 3.2.2 to 3.3.0.
 
 

http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Tasks/renameextensions.html
--
diff --git a/manual/Tasks/renameextensions.html 
b/manual/Tasks/renameextensions.html
index d54d1fa..664edfd 100644
--- a/manual/Tasks/renameextensions.html
+++ b/manual/Tasks/renameextensions.html
@@ -105,16 +105,14 @@ supports most attributes of fileset
   
 
 Examples
-
-  renameext srcDir=/source/project1
+
+  renameext srcDir=/source/project1
   includes=**
   excludes=**/samples/*
   fromExtension=.java.keep
   toExtension=.java
   

[1/4] ant git commit: Chop off redundant blockquotes

2018-02-08 Thread gintas
Repository: ant
Updated Branches:
  refs/heads/master 63dc4df7b -> 7eeb33d5e


http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/using.html
--
diff --git a/manual/using.html b/manual/using.html
index 898488a..c1b3300 100644
--- a/manual/using.html
+++ b/manual/using.html
@@ -99,9 +99,9 @@ executed if the dependent target(s) did not (need to) run.
 of an attribute might contain references to a property. These references will 
be
 resolved before the task is executed.
 Tasks have a common structure:
-
-  name attribute1=value1 
attribute2=value2 ... /
-
+
+name attribute1=value1 
attribute2=value2 ... /
+
 where name is the name of the task,
 attributeN is the attribute name, and
 valueN is the value for this attribute.
@@ -111,21 +111,21 @@ easy to write your 
own.
 this attribute will be used in the logging messages generated by
 Ant.
 Tasks can be assigned an id attribute:
-
+
 taskname id="taskID" ... /
-
+
 where taskname is the name of the task, and taskID is
 a unique identifier for this task.
 You can refer to the
 corresponding task object in scripts or other tasks via this name.
 For example, in scripts you could do:
-
+
 
 script ... 
   task1.setFoo("bar");
 /script
 
-
+
 to set the foo attribute of this particular task instance.
 In another task (written in Java), you can access the instance via
 project.getReference("task1").
@@ -356,18 +356,15 @@ via nested path elements:
 /path
 
 can be written as:
-
-path id=base.path path=${classpath}/
-
-
-  Path Shortcut
-  
+path id=base.path path=${classpath}/
+Path Shortcut
+
 In Ant 1.6 a shortcut for converting paths to OS specific strings
 in properties has been added. One can use the expression
 ${toString:pathreference} to convert a path element
 reference to a string that can be used for a path argument.
 For example:
-  
+
 
   path id="lib.path.ref"
 fileset dir="lib" includes="*.jar"/
@@ -438,18 +435,18 @@ similar to what a (Unix) shell would do, but may create 
something that
 is very different from what you expect under some circumstances.
 
 Examples
-
+
   arg value=-l -a/
-
+
 is a single command-line argument containing a space character,
 not separate commands "-l" and "-a".
-
+
   arg line=-l -a/
-
+
 This is a command line with two separate arguments, "-l" and "-a".
-
+
   arg path=/dir;/dir2:\dir3/
-
+
 is a single command-line argument with the value
 \dir;\dir2;\dir3 on DOS-based systems and
 /dir:/dir2:/dir3 on Unix-like systems.
@@ -463,7 +460,7 @@ element of the same type.  This can be useful if you are 
going to
 replicate the same snippet of XML over and over again--using a
 classpath structure more than once, for example.
 The following example:
-
+
 project ... 
   target ... 
 rmic ...
@@ -485,9 +482,9 @@ replicate the same snippet of XML over and over 
again--using a
 /javac
   /target
 /project
-
+
 could be rewritten as:
-
+
 project ... 
   path id=project.class.path
 pathelement location=lib//
@@ -507,7 +504,7 @@ replicate the same snippet of XML over and over 
again--using a
 /javac
   /target
 /project
-
+
 All tasks that use nested elements for
 PatternSets,
 FileSets,



[4/4] ant git commit: Chop off redundant blockquotes

2018-02-08 Thread gintas
Chop off redundant blockquotes

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

Branch: refs/heads/master
Commit: 7eeb33d5e8967edf6ba8523f354e4d7e45ab929b
Parents: 63dc4df
Author: Gintas Grigelionis 
Authored: Fri Feb 9 06:54:03 2018 +0100
Committer: Gintas Grigelionis 
Committed: Fri Feb 9 06:54:09 2018 +0100

--
 manual/Tasks/ant.html  |  32 ++--
 manual/Tasks/antcall.html  |   8 +-
 manual/Tasks/antlr.html|   4 +-
 manual/Tasks/antstructure.html |   4 +-
 manual/Tasks/antversion.html   |  17 +-
 manual/Tasks/apply.html|  24 +--
 manual/Tasks/attrib.html   |  14 +-
 manual/Tasks/available.html|  20 +-
 manual/Tasks/basename.html |  12 +-
 manual/Tasks/bindtargets.html  |  14 +-
 manual/Tasks/buildnumber.html  |   8 +-
 manual/Tasks/cab.html  |  16 +-
 manual/Tasks/ccm.html  |  40 ++--
 manual/Tasks/checksum.html |  22 +--
 manual/Tasks/chgrp.html|  15 +-
 manual/Tasks/chmod.html|  18 +-
 manual/Tasks/chown.html|  12 +-
 manual/Tasks/clearcase.html|  52 ++---
 manual/Tasks/conditions.html   |  84 -
 manual/Tasks/copyfile.html |   6 +-
 manual/Tasks/dependset.html|   3 +-
 manual/Tasks/echoproperties.html   |  28 +--
 manual/Tasks/exec.html |  33 +---
 manual/Tasks/genkey.html   |   8 +-
 manual/Tasks/image.html|  16 +-
 manual/Tasks/jar.html  |  46 +++--
 manual/Tasks/javac.html|   4 +-
 manual/Tasks/javacc.html   |   4 +-
 manual/Tasks/jdepend.html  |   7 +-
 manual/Tasks/jjdoc.html|  60 +++---
 manual/Tasks/jjtree.html   |   3 -
 manual/Tasks/junitreport.html  |  17 +-
 manual/Tasks/macrodef.html |  14 --
 manual/Tasks/mail.html |  12 +-
 manual/Tasks/manifestclasspath.html|   6 +-
 manual/Tasks/netrexxc.html |   8 +-
 manual/Tasks/pack.html |  16 +-
 manual/Tasks/presetdef.html|  18 +-
 manual/Tasks/propertyfile.html |  16 +-
 manual/Tasks/renameextensions.html |   8 +-
 manual/Tasks/replace.html  |  14 +-
 manual/Tasks/replaceregexp.html|  35 ++--
 manual/Tasks/rexec.html|   8 +-
 manual/Tasks/script.html   |  32 ++--
 manual/Tasks/scriptdef.html|   4 +-
 manual/Tasks/setpermissions.html   |   8 +-
 manual/Tasks/signjar.html  |  17 +-
 manual/Tasks/sound.html|   5 +-
 manual/Tasks/splash.html   |  14 +-
 manual/Tasks/sql.html  |  36 ++--
 manual/Tasks/sync.html |   8 +-
 manual/Tasks/telnet.html   |  16 +-
 manual/Tasks/unpack.html   |  26 +--
 manual/Tasks/verifyjar.html|   5 +-
 manual/Tasks/vss.html  |  52 +++--
 manual/Tasks/waitfor.html  |  12 +-
 manual/Tasks/whichresource.html|  12 +-
 manual/Types/antlib.html   |  61 ++
 manual/Types/classfileset.html |  12 +-
 manual/Types/custom-programming.html   |  80 +++-
 manual/Types/dirset.html   |  21 +--
 manual/Types/extension.html|  12 +-
 manual/Types/extensionset.html |   5 +-
 manual/Types/filelist.html |  16 +-
 manual/Types/fileset.html  |  24 +--
 manual/Types/filterchain.html  | 281 ++--
 manual/Types/filterset.html|  23 +--
 manual/Types/mapper.html   |  72 +++
 manual/Types/multirootfileset.html |   8 +-
 manual/Types/patternset.html   |  20 +-
 manual/Types/permissions.html  |  12 +-
 manual/Types/propertyset.html  |  11 +-
 manual/Types/regexp.html   |  20 +-
 manual/Types/resources.html|   2 -
 manual/Types/selectors.html| 100 +-
 manual/Types/tarfileset.html   |   4 +-
 manual/Types/xmlcatalog.html   |  16 +-
 manual/Types/zipfileset.html   |  12 +-
 manual/develop.html|  36 ++--
 manual/ifunless.html   |   6 +-
 manual/install.html|  22 +--
 manual/listeners.html  |  32 +---
 manual/running.html|  39 ++--
 manual/stylesheets/style.css   |   4 +-
 manual/targets.html|  34 ++--
 manual/tutorial-HelloWorldWithAnt.html |  10 +-
 manual/using.html  |  45 +++--
 87 files 

[2/4] ant git commit: Chop off redundant blockquotes

2018-02-08 Thread gintas
http://git-wip-us.apache.org/repos/asf/ant/blob/7eeb33d5/manual/Types/filterchain.html
--
diff --git a/manual/Types/filterchain.html b/manual/Types/filterchain.html
index ced1f30..649a3fd 100644
--- a/manual/Types/filterchain.html
+++ b/manual/Types/filterchain.html
@@ -56,7 +56,7 @@ FilterReaders can be easily plugged in as nested elements of
 filterchain by using filterreader 
elements.
 
 Example:
-
+
 copy file=${src.file} tofile=${dest.file}
   filterchain
 filterreader 
classname=your.extension.of.java.io.FilterReader
@@ -71,21 +71,21 @@ Example:
 /filterreader
   /filterchain
 /copy
-
+
 
 Ant provides some built-in filter readers.  These filter readers
 can also be declared using a syntax similar to the above syntax.
 However, they can be declared using some simpler syntax also.
 Example:
-
+
 loadfile srcfile=${src.file} 
property=src.file.head
   filterchain
 headfilter lines=15/
   /filterchain
 /loadfile
-
+
 is equivalent to:
-
+
 loadfile srcfile=${src.file} 
property=src.file.head
   filterchain
 filterreader 
classname=org.apache.tools.ant.filters.HeadFilter
@@ -93,7 +93,7 @@ is equivalent to:
 /filterreader
   /filterchain
 /loadfile
-
+
 
 The following built-in tasks support nested filterchain 
elements.
 Concat,
@@ -188,18 +188,18 @@ distribution.
 
 This loads the basic constants defined in a Java class as Ant properties.
 
-
+
 loadproperties srcfile="foo.class" encoding="ISO-8859-1"
   filterchain
 classconstants/
   /filterchain
 /loadproperties
-
+
 
 This loads the constants from a Java class file as Ant properties,
 prepending the names with a prefix.
 
-
+
 loadproperties srcfile="build/classes/org/acme/bar.class"
 encoding="ISO-8859-1"
   filterchain
@@ -207,7 +207,7 @@ prepending the names with a prefix.
 prefixlines prefix="ini."/
   /filterchain
 /loadproperties
-
+
 EscapeUnicode
 
 This filter converts its input by changing all non US-ASCII characters
@@ -218,34 +218,34 @@ into their equivalent unicode escape backslash u plus 4 
digits.
 Example:
 
 This loads the basic constants defined in a Java class as Ant properties.
-
+
 loadproperties srcfile=non_ascii_property.properties
   filterchain
 filterreader 
classname=org.apache.tools.ant.filters.EscapeUnicode/
   /filterchain
 /loadproperties
-
+
 
 Convenience method:
-
+
 loadproperties srcfile=non_ascii_property.properties
   filterchain
 escapeunicode/
   /filterchain
 /loadproperties
-
+
 
 ExpandProperties
 
 If the data contains data that represents Ant
 properties (of the form ${...}), that is substituted
 with the property's actual value.
-
+
 Example:
 
 This results in the property modifiedmessage holding the value
 All these moments will be lost in time, like teardrops in the rain
-
+
 echo
   message=All these moments will be lost in time, like teardrops in the 
${weather}
   file=loadfile1.tmp
@@ -256,10 +256,10 @@ This results in the property modifiedmessage holding the 
value
 filterreader 
classname=org.apache.tools.ant.filters.ExpandProperties/
   /filterchain
 /loadfile
-
+
 
 Convenience method:
-
+
 echo
   message=All these moments will be lost in time, like teardrops in the 
${weather}
   file=loadfile1.tmp
@@ -270,12 +270,12 @@ Convenience method:
 expandproperties/
   /filterchain
 /loadfile
-
+
 
 Since Ant 1.8.3, a nested
- PropertySet can be specified:
+  PropertySet can be specified:
 
-
+
 property name=weather value=rain/
 loadfile property=modifiedmessage 
srcFile=loadfile1.tmp
   filterchain
@@ -286,7 +286,7 @@ Convenience method:
 /expandproperties
   /filterchain
 /loadfile
-
+
 
 HeadFilter
 
@@ -316,7 +316,7 @@ This filter reads the first few lines from the data 
supplied to it.
 Example:
 
 This stores the first 15 lines of the supplied data in the property 
src.file.head
-
+
 loadfile srcfile=${src.file} 
property=src.file.head
   filterchain
 filterreader 
classname=org.apache.tools.ant.filters.HeadFilter
@@ -324,26 +324,26 @@ This stores the first 15 lines of the supplied data in 
the property src.file.hea
 /filterreader
   /filterchain
 /loadfile
-
+
 
 Convenience method:
-
+
 loadfile srcfile=${src.file} 
property=src.file.head
   filterchain
 headfilter lines=15/
   /filterchain
 /loadfile
-
+
 
 This stores the first 15 lines, skipping the first 2 lines, of the supplied 
data
 in the property src.file.head. (Means: lines 3-17)
-
+
 loadfile srcfile=${src.file} 
property=src.file.head
   filterchain
 headfilter lines=15 skip=2/
   /filterchain
 /loadfile
-
+
 
 See the testcases for more examples 
(src\etc\testcases\filters\head-tail.xml in the
 source distribution).
@@ -376,36 +376,36 @@ strings.
 
 This will include only those lines that contain foo and
 bar.
-
+
 filterreader 
classname=org.apache.tools.ant.filters.LineContains
   param type=contains value=foo/
   param type=contains value=bar/
 /filterreader
-
+
 
 

[jira] [Commented] (IVY-1572) Look for Thread interruption on potentially long-running operation org.apache.ivy.plugins.resolver.AbstractPatternsBasedResolver.findResourceUsingPatterns(ModuleRevisionI

2018-02-08 Thread ASF GitHub Bot (JIRA)

[ 
https://issues.apache.org/jira/browse/IVY-1572?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16357900#comment-16357900
 ] 

ASF GitHub Bot commented on IVY-1572:
-

Github user jaikiran commented on a diff in the pull request:

https://github.com/apache/ant-ivy/pull/62#discussion_r167136873
  
--- Diff: 
src/java/org/apache/ivy/plugins/resolver/AbstractPatternsBasedResolver.java ---
@@ -91,6 +91,9 @@ protected ResolvedResource 
findResourceUsingPatterns(ModuleRevisionId moduleRevi
 Set foundRevisions = new HashSet<>();
 boolean dynamic = 
getSettings().getVersionMatcher().isDynamic(moduleRevision);
 for (String pattern : patternList) {
+if (Thread.currentThread().isInterrupted()) {
+return null;
--- End diff --

@apupier I originally intended it to be `InterruptedException` but given 
that it's a checked exception you would end up changing the method signature of 
this method which then causes issues with callers of this API. Hence I 
suggested a runtime exception.  Returning null  could have other (side) effects 
than what you intend here - i.e. to abort the execution, so throwing the 
exception would be the right thing.

I might have some time tonight, I'll see if this check can be moved to a 
better location or handle in a better way. 


> Look for Thread interruption on potentially long-running operation 
> org.apache.ivy.plugins.resolver.AbstractPatternsBasedResolver.findResourceUsingPatterns(ModuleRevisionId,
>  List, Artifact, ResourceMDParser, Date)
> 
>
> Key: IVY-1572
> URL: https://issues.apache.org/jira/browse/IVY-1572
> Project: Ivy
>  Issue Type: Improvement
>Affects Versions: 2.4.0
>Reporter: Aurelien Pupier
>Priority: Major
>
> While searching for an unavailable artifact and a lot of repositories are 
> defined (and especially when some of them are not very responsive), the 
> search can take several minutes.
> For this reason, it would be nice to be able to look for interruption during 
> a search.
> example of stack
> {noformat}
> Thread [Camel Version Checker - 
> org.fusesource.ide.projecttemplates.util.CamelVersionChecker@576f3c03] 
> (Suspended)
>   owns: BufferedInputStream  (id=195) 
>   owns: CamelVersionChecker  (id=196) 
>   SocketInputStream.socketRead0(FileDescriptor, byte[], int, int, int) 
> line: not available [native method]
>   SocketInputStream.socketRead(FileDescriptor, byte[], int, int, int) 
> line: 116   
>   SocketInputStream.read(byte[], int, int, int) line: 170 
>   SocketInputStream.read(byte[], int, int) line: 141  
>   BufferedInputStream.fill() line: 246
>   BufferedInputStream.read() line: 265
>   HttpParser.readRawLine(InputStream) line: 78
>   HttpParser.readLine(InputStream, String) line: 106  
>   
> MultiThreadedHttpConnectionManager$HttpConnectionWithReference(HttpConnection).readLine(String)
>  line: 1116  
>   
> MultiThreadedHttpConnectionManager$HttpConnectionAdapter.readLine(String) 
> line: 1413
>   HeadMethod(HttpMethodBase).readStatusLine(HttpState, HttpConnection) 
> line: 1973 
>   HeadMethod(HttpMethodBase).readResponse(HttpState, HttpConnection) 
> line: 1735   
>   HeadMethod(HttpMethodBase).execute(HttpState, HttpConnection) line: 
> 1098
>   HttpMethodDirector.executeWithRetry(HttpMethod) line: 398   
>   HttpMethodDirector.executeMethod(HttpMethod) line: 171  
>   HttpClient.executeMethod(HostConfiguration, HttpMethod, HttpState) 
> line: 397
>   HttpClient.executeMethod(HttpMethod) line: 323  
>   TimeoutHttpClientHandler(HttpClientHandler).doHead(URL, int) line: 266  
>   TimeoutHttpClientHandler(HttpClientHandler).getURLInfo(URL, int) line: 
> 152  
>   TimeoutHttpClientHandler.getURLInfo(URL) line: 55   
>   URLResource.init() line: 68 
>   URLResource.exists() line: 84   
>   
> IBiblioResolver(RepositoryResolver).findResourceUsingPattern(ModuleRevisionId,
>  String, Artifact, ResourceMDParser, Date) line: 97   
>   
> IBiblioResolver(AbstractPatternsBasedResolver).findResourceUsingPatterns(ModuleRevisionId,
>  List, Artifact, ResourceMDParser, Date) line: 100
>   IBiblioResolver.findIvyFileRef(DependencyDescriptor, ResolveData) line: 
> 103 
>   IBiblioResolver(BasicResolver).getDependency(DependencyDescriptor, 
> ResolveData) line: 230   
>   IBiblioResolver.getDependency(DependencyDescriptor, ResolveData) line: 
> 506  
>   

[jira] [Updated] (IVY-1545) Cycle in parent POM ancestry yields StackOverflowError in PomModuleDescriptorParser

2018-02-08 Thread jaikiran pai (JIRA)

 [ 
https://issues.apache.org/jira/browse/IVY-1545?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

jaikiran pai updated IVY-1545:
--
Priority: Major  (was: Minor)

> Cycle in parent POM ancestry yields StackOverflowError in 
> PomModuleDescriptorParser
> ---
>
> Key: IVY-1545
> URL: https://issues.apache.org/jira/browse/IVY-1545
> Project: Ivy
>  Issue Type: Bug
>  Components: Maven Compatibility
>Affects Versions: 2.4.0, master
>Reporter: Brett Randall
>Assignee: jaikiran pai
>Priority: Major
> Fix For: master
>
>   Original Estimate: 4h
>  Remaining Estimate: 4h
>
> If the parent-hierarchy of a POM contains a cycle, or the artifact references 
> itself as its parent, a {{StackOverflowError}} as 
> {{PomModuleDescriptorParser}} recursively attempts to walk the parent 
> ancestry (see stack trace below).  It does this while it looks for properties 
> in parent POMs.  Obviously the artifact and/or parent structure is bad 
> (contains a cycle) and needs to be corrected, but it would be helpful if Ivy 
> threw a more meaningful error in this case.
> This can be exposed with two new tests I authored, 
> {{ResolveTest#testErrorResolveMaven2ParentPomWithCycle()}} and 
> {{ResolveTest#testErrorResolveMaven2SelfAsParent()}}.
> My solution is to {{pushNewCopyContext}} on entry to {{parseDescriptor}}, 
> then get/add a new {{LinkedHashSet}} to track parents seen in a walk, and 
> throw a {{CircularDependencyException}} should we encounter a cycle.
> {noformat}
> java.lang.StackOverflowError
> at java.lang.String.checkBounds(String.java:370)
> at java.lang.String.(String.java:415)
> at java.lang.String.(String.java:481)
> at java.io.UnixFileSystem.canonicalize0(Native Method)
> at java.io.UnixFileSystem.canonicalize(UnixFileSystem.java:172)
> at java.io.File.getCanonicalPath(File.java:618)
> at java.io.FilePermission$1.run(FilePermission.java:221)
> at java.io.FilePermission$1.run(FilePermission.java:209)
> at java.security.AccessController.doPrivileged(Native Method)
> at java.io.FilePermission.init(FilePermission.java:209)
> at java.io.FilePermission.(FilePermission.java:285)
> at 
> sun.net.www.protocol.file.FileURLConnection.getPermission(FileURLConnection.java:225)
> at 
> sun.net.www.protocol.jar.JarFileFactory.getPermission(JarFileFactory.java:156)
> at 
> sun.net.www.protocol.jar.JarFileFactory.getCachedJarFile(JarFileFactory.java:126)
> at sun.net.www.protocol.jar.JarFileFactory.get(JarFileFactory.java:81)
> at 
> sun.net.www.protocol.jar.JarURLConnection.connect(JarURLConnection.java:122)
> at 
> sun.net.www.protocol.jar.JarURLConnection.getInputStream(JarURLConnection.java:150)
> at java.net.URLClassLoader.getResourceAsStream(URLClassLoader.java:233)
> at javax.xml.parsers.SecuritySupport$4.run(SecuritySupport.java:94)
> at java.security.AccessController.doPrivileged(Native Method)
> at 
> javax.xml.parsers.SecuritySupport.getResourceAsStream(SecuritySupport.java:87)
> at 
> javax.xml.parsers.FactoryFinder.findJarServiceProvider(FactoryFinder.java:283)
> at javax.xml.parsers.FactoryFinder.find(FactoryFinder.java:255)
> at 
> javax.xml.parsers.DocumentBuilderFactory.newInstance(DocumentBuilderFactory.java:121)
> at org.apache.ivy.util.XMLHelper.getDocBuilder(XMLHelper.java:228)
> at org.apache.ivy.util.XMLHelper.parseToDom(XMLHelper.java:222)
> at org.apache.ivy.plugins.parser.m2.PomReader.(PomReader.java:121)
> at 
> org.apache.ivy.plugins.parser.m2.PomModuleDescriptorParser.parseDescriptor(PomModuleDescriptorParser.java:119)
> at 
> org.apache.ivy.plugins.parser.m2.PomModuleDescriptorParser.parseDescriptor(PomModuleDescriptorParser.java:109)
> at 
> org.apache.ivy.core.cache.DefaultRepositoryCacheManager$MyModuleDescriptorProvider.provideModule(DefaultRepositoryCacheManager.java:826)
> at 
> org.apache.ivy.core.cache.ModuleDescriptorMemoryCache.getStale(ModuleDescriptorMemoryCache.java:68)
> at 
> org.apache.ivy.core.cache.DefaultRepositoryCacheManager.getStaledMd(DefaultRepositoryCacheManager.java:843)
> at 
> org.apache.ivy.core.cache.DefaultRepositoryCacheManager.cacheModuleDescriptor(DefaultRepositoryCacheManager.java:1358)
> at org.apache.ivy.plugins.resolver.BasicResolver.parse(BasicResolver.java:538)
> at 
> org.apache.ivy.plugins.resolver.BasicResolver.getDependency(BasicResolver.java:273)
> at 
> org.apache.ivy.plugins.resolver.ChainResolver.getDependency(ChainResolver.java:103)
> at 
> org.apache.ivy.plugins.parser.m2.PomModuleDescriptorParser.parseOtherPom(PomModuleDescriptorParser.java:394)
> at 
> org.apache.ivy.plugins.parser.m2.PomModuleDescriptorParser.parseDescriptor(PomModuleDescriptorParser.java:139)
> at 
> org.apache.ivy.plugins.parser.m2.PomModuleDescriptorParser.parseDescriptor(PomModuleDescriptorParser.java:109)
> at 
> 

[jira] [Assigned] (IVY-1545) Cycle in parent POM ancestry yields StackOverflowError in PomModuleDescriptorParser

2018-02-08 Thread jaikiran pai (JIRA)

 [ 
https://issues.apache.org/jira/browse/IVY-1545?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

jaikiran pai reassigned IVY-1545:
-

Assignee: jaikiran pai

> Cycle in parent POM ancestry yields StackOverflowError in 
> PomModuleDescriptorParser
> ---
>
> Key: IVY-1545
> URL: https://issues.apache.org/jira/browse/IVY-1545
> Project: Ivy
>  Issue Type: Bug
>  Components: Maven Compatibility
>Affects Versions: 2.4.0, master
>Reporter: Brett Randall
>Assignee: jaikiran pai
>Priority: Minor
> Fix For: master
>
>   Original Estimate: 4h
>  Remaining Estimate: 4h
>
> If the parent-hierarchy of a POM contains a cycle, or the artifact references 
> itself as its parent, a {{StackOverflowError}} as 
> {{PomModuleDescriptorParser}} recursively attempts to walk the parent 
> ancestry (see stack trace below).  It does this while it looks for properties 
> in parent POMs.  Obviously the artifact and/or parent structure is bad 
> (contains a cycle) and needs to be corrected, but it would be helpful if Ivy 
> threw a more meaningful error in this case.
> This can be exposed with two new tests I authored, 
> {{ResolveTest#testErrorResolveMaven2ParentPomWithCycle()}} and 
> {{ResolveTest#testErrorResolveMaven2SelfAsParent()}}.
> My solution is to {{pushNewCopyContext}} on entry to {{parseDescriptor}}, 
> then get/add a new {{LinkedHashSet}} to track parents seen in a walk, and 
> throw a {{CircularDependencyException}} should we encounter a cycle.
> {noformat}
> java.lang.StackOverflowError
> at java.lang.String.checkBounds(String.java:370)
> at java.lang.String.(String.java:415)
> at java.lang.String.(String.java:481)
> at java.io.UnixFileSystem.canonicalize0(Native Method)
> at java.io.UnixFileSystem.canonicalize(UnixFileSystem.java:172)
> at java.io.File.getCanonicalPath(File.java:618)
> at java.io.FilePermission$1.run(FilePermission.java:221)
> at java.io.FilePermission$1.run(FilePermission.java:209)
> at java.security.AccessController.doPrivileged(Native Method)
> at java.io.FilePermission.init(FilePermission.java:209)
> at java.io.FilePermission.(FilePermission.java:285)
> at 
> sun.net.www.protocol.file.FileURLConnection.getPermission(FileURLConnection.java:225)
> at 
> sun.net.www.protocol.jar.JarFileFactory.getPermission(JarFileFactory.java:156)
> at 
> sun.net.www.protocol.jar.JarFileFactory.getCachedJarFile(JarFileFactory.java:126)
> at sun.net.www.protocol.jar.JarFileFactory.get(JarFileFactory.java:81)
> at 
> sun.net.www.protocol.jar.JarURLConnection.connect(JarURLConnection.java:122)
> at 
> sun.net.www.protocol.jar.JarURLConnection.getInputStream(JarURLConnection.java:150)
> at java.net.URLClassLoader.getResourceAsStream(URLClassLoader.java:233)
> at javax.xml.parsers.SecuritySupport$4.run(SecuritySupport.java:94)
> at java.security.AccessController.doPrivileged(Native Method)
> at 
> javax.xml.parsers.SecuritySupport.getResourceAsStream(SecuritySupport.java:87)
> at 
> javax.xml.parsers.FactoryFinder.findJarServiceProvider(FactoryFinder.java:283)
> at javax.xml.parsers.FactoryFinder.find(FactoryFinder.java:255)
> at 
> javax.xml.parsers.DocumentBuilderFactory.newInstance(DocumentBuilderFactory.java:121)
> at org.apache.ivy.util.XMLHelper.getDocBuilder(XMLHelper.java:228)
> at org.apache.ivy.util.XMLHelper.parseToDom(XMLHelper.java:222)
> at org.apache.ivy.plugins.parser.m2.PomReader.(PomReader.java:121)
> at 
> org.apache.ivy.plugins.parser.m2.PomModuleDescriptorParser.parseDescriptor(PomModuleDescriptorParser.java:119)
> at 
> org.apache.ivy.plugins.parser.m2.PomModuleDescriptorParser.parseDescriptor(PomModuleDescriptorParser.java:109)
> at 
> org.apache.ivy.core.cache.DefaultRepositoryCacheManager$MyModuleDescriptorProvider.provideModule(DefaultRepositoryCacheManager.java:826)
> at 
> org.apache.ivy.core.cache.ModuleDescriptorMemoryCache.getStale(ModuleDescriptorMemoryCache.java:68)
> at 
> org.apache.ivy.core.cache.DefaultRepositoryCacheManager.getStaledMd(DefaultRepositoryCacheManager.java:843)
> at 
> org.apache.ivy.core.cache.DefaultRepositoryCacheManager.cacheModuleDescriptor(DefaultRepositoryCacheManager.java:1358)
> at org.apache.ivy.plugins.resolver.BasicResolver.parse(BasicResolver.java:538)
> at 
> org.apache.ivy.plugins.resolver.BasicResolver.getDependency(BasicResolver.java:273)
> at 
> org.apache.ivy.plugins.resolver.ChainResolver.getDependency(ChainResolver.java:103)
> at 
> org.apache.ivy.plugins.parser.m2.PomModuleDescriptorParser.parseOtherPom(PomModuleDescriptorParser.java:394)
> at 
> org.apache.ivy.plugins.parser.m2.PomModuleDescriptorParser.parseDescriptor(PomModuleDescriptorParser.java:139)
> at 
> org.apache.ivy.plugins.parser.m2.PomModuleDescriptorParser.parseDescriptor(PomModuleDescriptorParser.java:109)
> at 
> 

[jira] [Resolved] (IVY-1545) Cycle in parent POM ancestry yields StackOverflowError in PomModuleDescriptorParser

2018-02-08 Thread jaikiran pai (JIRA)

 [ 
https://issues.apache.org/jira/browse/IVY-1545?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

jaikiran pai resolved IVY-1545.
---
   Resolution: Fixed
Fix Version/s: master

Fix merged to master https://github.com/apache/ant-ivy/pull/66

> Cycle in parent POM ancestry yields StackOverflowError in 
> PomModuleDescriptorParser
> ---
>
> Key: IVY-1545
> URL: https://issues.apache.org/jira/browse/IVY-1545
> Project: Ivy
>  Issue Type: Bug
>  Components: Maven Compatibility
>Affects Versions: 2.4.0, master
>Reporter: Brett Randall
>Assignee: jaikiran pai
>Priority: Minor
> Fix For: master
>
>   Original Estimate: 4h
>  Remaining Estimate: 4h
>
> If the parent-hierarchy of a POM contains a cycle, or the artifact references 
> itself as its parent, a {{StackOverflowError}} as 
> {{PomModuleDescriptorParser}} recursively attempts to walk the parent 
> ancestry (see stack trace below).  It does this while it looks for properties 
> in parent POMs.  Obviously the artifact and/or parent structure is bad 
> (contains a cycle) and needs to be corrected, but it would be helpful if Ivy 
> threw a more meaningful error in this case.
> This can be exposed with two new tests I authored, 
> {{ResolveTest#testErrorResolveMaven2ParentPomWithCycle()}} and 
> {{ResolveTest#testErrorResolveMaven2SelfAsParent()}}.
> My solution is to {{pushNewCopyContext}} on entry to {{parseDescriptor}}, 
> then get/add a new {{LinkedHashSet}} to track parents seen in a walk, and 
> throw a {{CircularDependencyException}} should we encounter a cycle.
> {noformat}
> java.lang.StackOverflowError
> at java.lang.String.checkBounds(String.java:370)
> at java.lang.String.(String.java:415)
> at java.lang.String.(String.java:481)
> at java.io.UnixFileSystem.canonicalize0(Native Method)
> at java.io.UnixFileSystem.canonicalize(UnixFileSystem.java:172)
> at java.io.File.getCanonicalPath(File.java:618)
> at java.io.FilePermission$1.run(FilePermission.java:221)
> at java.io.FilePermission$1.run(FilePermission.java:209)
> at java.security.AccessController.doPrivileged(Native Method)
> at java.io.FilePermission.init(FilePermission.java:209)
> at java.io.FilePermission.(FilePermission.java:285)
> at 
> sun.net.www.protocol.file.FileURLConnection.getPermission(FileURLConnection.java:225)
> at 
> sun.net.www.protocol.jar.JarFileFactory.getPermission(JarFileFactory.java:156)
> at 
> sun.net.www.protocol.jar.JarFileFactory.getCachedJarFile(JarFileFactory.java:126)
> at sun.net.www.protocol.jar.JarFileFactory.get(JarFileFactory.java:81)
> at 
> sun.net.www.protocol.jar.JarURLConnection.connect(JarURLConnection.java:122)
> at 
> sun.net.www.protocol.jar.JarURLConnection.getInputStream(JarURLConnection.java:150)
> at java.net.URLClassLoader.getResourceAsStream(URLClassLoader.java:233)
> at javax.xml.parsers.SecuritySupport$4.run(SecuritySupport.java:94)
> at java.security.AccessController.doPrivileged(Native Method)
> at 
> javax.xml.parsers.SecuritySupport.getResourceAsStream(SecuritySupport.java:87)
> at 
> javax.xml.parsers.FactoryFinder.findJarServiceProvider(FactoryFinder.java:283)
> at javax.xml.parsers.FactoryFinder.find(FactoryFinder.java:255)
> at 
> javax.xml.parsers.DocumentBuilderFactory.newInstance(DocumentBuilderFactory.java:121)
> at org.apache.ivy.util.XMLHelper.getDocBuilder(XMLHelper.java:228)
> at org.apache.ivy.util.XMLHelper.parseToDom(XMLHelper.java:222)
> at org.apache.ivy.plugins.parser.m2.PomReader.(PomReader.java:121)
> at 
> org.apache.ivy.plugins.parser.m2.PomModuleDescriptorParser.parseDescriptor(PomModuleDescriptorParser.java:119)
> at 
> org.apache.ivy.plugins.parser.m2.PomModuleDescriptorParser.parseDescriptor(PomModuleDescriptorParser.java:109)
> at 
> org.apache.ivy.core.cache.DefaultRepositoryCacheManager$MyModuleDescriptorProvider.provideModule(DefaultRepositoryCacheManager.java:826)
> at 
> org.apache.ivy.core.cache.ModuleDescriptorMemoryCache.getStale(ModuleDescriptorMemoryCache.java:68)
> at 
> org.apache.ivy.core.cache.DefaultRepositoryCacheManager.getStaledMd(DefaultRepositoryCacheManager.java:843)
> at 
> org.apache.ivy.core.cache.DefaultRepositoryCacheManager.cacheModuleDescriptor(DefaultRepositoryCacheManager.java:1358)
> at org.apache.ivy.plugins.resolver.BasicResolver.parse(BasicResolver.java:538)
> at 
> org.apache.ivy.plugins.resolver.BasicResolver.getDependency(BasicResolver.java:273)
> at 
> org.apache.ivy.plugins.resolver.ChainResolver.getDependency(ChainResolver.java:103)
> at 
> org.apache.ivy.plugins.parser.m2.PomModuleDescriptorParser.parseOtherPom(PomModuleDescriptorParser.java:394)
> at 
> org.apache.ivy.plugins.parser.m2.PomModuleDescriptorParser.parseDescriptor(PomModuleDescriptorParser.java:139)
> at 
> 

[jira] [Commented] (IVY-1545) Cycle in parent POM ancestry yields StackOverflowError in PomModuleDescriptorParser

2018-02-08 Thread ASF GitHub Bot (JIRA)

[ 
https://issues.apache.org/jira/browse/IVY-1545?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16357882#comment-16357882
 ] 

ASF GitHub Bot commented on IVY-1545:
-

Github user asfgit closed the pull request at:

https://github.com/apache/ant-ivy/pull/66


> Cycle in parent POM ancestry yields StackOverflowError in 
> PomModuleDescriptorParser
> ---
>
> Key: IVY-1545
> URL: https://issues.apache.org/jira/browse/IVY-1545
> Project: Ivy
>  Issue Type: Bug
>  Components: Maven Compatibility
>Affects Versions: 2.4.0, master
>Reporter: Brett Randall
>Priority: Minor
>   Original Estimate: 4h
>  Remaining Estimate: 4h
>
> If the parent-hierarchy of a POM contains a cycle, or the artifact references 
> itself as its parent, a {{StackOverflowError}} as 
> {{PomModuleDescriptorParser}} recursively attempts to walk the parent 
> ancestry (see stack trace below).  It does this while it looks for properties 
> in parent POMs.  Obviously the artifact and/or parent structure is bad 
> (contains a cycle) and needs to be corrected, but it would be helpful if Ivy 
> threw a more meaningful error in this case.
> This can be exposed with two new tests I authored, 
> {{ResolveTest#testErrorResolveMaven2ParentPomWithCycle()}} and 
> {{ResolveTest#testErrorResolveMaven2SelfAsParent()}}.
> My solution is to {{pushNewCopyContext}} on entry to {{parseDescriptor}}, 
> then get/add a new {{LinkedHashSet}} to track parents seen in a walk, and 
> throw a {{CircularDependencyException}} should we encounter a cycle.
> {noformat}
> java.lang.StackOverflowError
> at java.lang.String.checkBounds(String.java:370)
> at java.lang.String.(String.java:415)
> at java.lang.String.(String.java:481)
> at java.io.UnixFileSystem.canonicalize0(Native Method)
> at java.io.UnixFileSystem.canonicalize(UnixFileSystem.java:172)
> at java.io.File.getCanonicalPath(File.java:618)
> at java.io.FilePermission$1.run(FilePermission.java:221)
> at java.io.FilePermission$1.run(FilePermission.java:209)
> at java.security.AccessController.doPrivileged(Native Method)
> at java.io.FilePermission.init(FilePermission.java:209)
> at java.io.FilePermission.(FilePermission.java:285)
> at 
> sun.net.www.protocol.file.FileURLConnection.getPermission(FileURLConnection.java:225)
> at 
> sun.net.www.protocol.jar.JarFileFactory.getPermission(JarFileFactory.java:156)
> at 
> sun.net.www.protocol.jar.JarFileFactory.getCachedJarFile(JarFileFactory.java:126)
> at sun.net.www.protocol.jar.JarFileFactory.get(JarFileFactory.java:81)
> at 
> sun.net.www.protocol.jar.JarURLConnection.connect(JarURLConnection.java:122)
> at 
> sun.net.www.protocol.jar.JarURLConnection.getInputStream(JarURLConnection.java:150)
> at java.net.URLClassLoader.getResourceAsStream(URLClassLoader.java:233)
> at javax.xml.parsers.SecuritySupport$4.run(SecuritySupport.java:94)
> at java.security.AccessController.doPrivileged(Native Method)
> at 
> javax.xml.parsers.SecuritySupport.getResourceAsStream(SecuritySupport.java:87)
> at 
> javax.xml.parsers.FactoryFinder.findJarServiceProvider(FactoryFinder.java:283)
> at javax.xml.parsers.FactoryFinder.find(FactoryFinder.java:255)
> at 
> javax.xml.parsers.DocumentBuilderFactory.newInstance(DocumentBuilderFactory.java:121)
> at org.apache.ivy.util.XMLHelper.getDocBuilder(XMLHelper.java:228)
> at org.apache.ivy.util.XMLHelper.parseToDom(XMLHelper.java:222)
> at org.apache.ivy.plugins.parser.m2.PomReader.(PomReader.java:121)
> at 
> org.apache.ivy.plugins.parser.m2.PomModuleDescriptorParser.parseDescriptor(PomModuleDescriptorParser.java:119)
> at 
> org.apache.ivy.plugins.parser.m2.PomModuleDescriptorParser.parseDescriptor(PomModuleDescriptorParser.java:109)
> at 
> org.apache.ivy.core.cache.DefaultRepositoryCacheManager$MyModuleDescriptorProvider.provideModule(DefaultRepositoryCacheManager.java:826)
> at 
> org.apache.ivy.core.cache.ModuleDescriptorMemoryCache.getStale(ModuleDescriptorMemoryCache.java:68)
> at 
> org.apache.ivy.core.cache.DefaultRepositoryCacheManager.getStaledMd(DefaultRepositoryCacheManager.java:843)
> at 
> org.apache.ivy.core.cache.DefaultRepositoryCacheManager.cacheModuleDescriptor(DefaultRepositoryCacheManager.java:1358)
> at org.apache.ivy.plugins.resolver.BasicResolver.parse(BasicResolver.java:538)
> at 
> org.apache.ivy.plugins.resolver.BasicResolver.getDependency(BasicResolver.java:273)
> at 
> org.apache.ivy.plugins.resolver.ChainResolver.getDependency(ChainResolver.java:103)
> at 
> org.apache.ivy.plugins.parser.m2.PomModuleDescriptorParser.parseOtherPom(PomModuleDescriptorParser.java:394)
> at 
> org.apache.ivy.plugins.parser.m2.PomModuleDescriptorParser.parseDescriptor(PomModuleDescriptorParser.java:139)
> at 
> 

[jira] [Commented] (IVY-1545) Cycle in parent POM ancestry yields StackOverflowError in PomModuleDescriptorParser

2018-02-08 Thread ASF GitHub Bot (JIRA)

[ 
https://issues.apache.org/jira/browse/IVY-1545?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16357883#comment-16357883
 ] 

ASF GitHub Bot commented on IVY-1545:
-

Github user jaikiran commented on the issue:

https://github.com/apache/ant-ivy/pull/66
  
@javabrett, thank you reporting as well as providing the fix for this. This 
is now merged.


> Cycle in parent POM ancestry yields StackOverflowError in 
> PomModuleDescriptorParser
> ---
>
> Key: IVY-1545
> URL: https://issues.apache.org/jira/browse/IVY-1545
> Project: Ivy
>  Issue Type: Bug
>  Components: Maven Compatibility
>Affects Versions: 2.4.0, master
>Reporter: Brett Randall
>Priority: Minor
>   Original Estimate: 4h
>  Remaining Estimate: 4h
>
> If the parent-hierarchy of a POM contains a cycle, or the artifact references 
> itself as its parent, a {{StackOverflowError}} as 
> {{PomModuleDescriptorParser}} recursively attempts to walk the parent 
> ancestry (see stack trace below).  It does this while it looks for properties 
> in parent POMs.  Obviously the artifact and/or parent structure is bad 
> (contains a cycle) and needs to be corrected, but it would be helpful if Ivy 
> threw a more meaningful error in this case.
> This can be exposed with two new tests I authored, 
> {{ResolveTest#testErrorResolveMaven2ParentPomWithCycle()}} and 
> {{ResolveTest#testErrorResolveMaven2SelfAsParent()}}.
> My solution is to {{pushNewCopyContext}} on entry to {{parseDescriptor}}, 
> then get/add a new {{LinkedHashSet}} to track parents seen in a walk, and 
> throw a {{CircularDependencyException}} should we encounter a cycle.
> {noformat}
> java.lang.StackOverflowError
> at java.lang.String.checkBounds(String.java:370)
> at java.lang.String.(String.java:415)
> at java.lang.String.(String.java:481)
> at java.io.UnixFileSystem.canonicalize0(Native Method)
> at java.io.UnixFileSystem.canonicalize(UnixFileSystem.java:172)
> at java.io.File.getCanonicalPath(File.java:618)
> at java.io.FilePermission$1.run(FilePermission.java:221)
> at java.io.FilePermission$1.run(FilePermission.java:209)
> at java.security.AccessController.doPrivileged(Native Method)
> at java.io.FilePermission.init(FilePermission.java:209)
> at java.io.FilePermission.(FilePermission.java:285)
> at 
> sun.net.www.protocol.file.FileURLConnection.getPermission(FileURLConnection.java:225)
> at 
> sun.net.www.protocol.jar.JarFileFactory.getPermission(JarFileFactory.java:156)
> at 
> sun.net.www.protocol.jar.JarFileFactory.getCachedJarFile(JarFileFactory.java:126)
> at sun.net.www.protocol.jar.JarFileFactory.get(JarFileFactory.java:81)
> at 
> sun.net.www.protocol.jar.JarURLConnection.connect(JarURLConnection.java:122)
> at 
> sun.net.www.protocol.jar.JarURLConnection.getInputStream(JarURLConnection.java:150)
> at java.net.URLClassLoader.getResourceAsStream(URLClassLoader.java:233)
> at javax.xml.parsers.SecuritySupport$4.run(SecuritySupport.java:94)
> at java.security.AccessController.doPrivileged(Native Method)
> at 
> javax.xml.parsers.SecuritySupport.getResourceAsStream(SecuritySupport.java:87)
> at 
> javax.xml.parsers.FactoryFinder.findJarServiceProvider(FactoryFinder.java:283)
> at javax.xml.parsers.FactoryFinder.find(FactoryFinder.java:255)
> at 
> javax.xml.parsers.DocumentBuilderFactory.newInstance(DocumentBuilderFactory.java:121)
> at org.apache.ivy.util.XMLHelper.getDocBuilder(XMLHelper.java:228)
> at org.apache.ivy.util.XMLHelper.parseToDom(XMLHelper.java:222)
> at org.apache.ivy.plugins.parser.m2.PomReader.(PomReader.java:121)
> at 
> org.apache.ivy.plugins.parser.m2.PomModuleDescriptorParser.parseDescriptor(PomModuleDescriptorParser.java:119)
> at 
> org.apache.ivy.plugins.parser.m2.PomModuleDescriptorParser.parseDescriptor(PomModuleDescriptorParser.java:109)
> at 
> org.apache.ivy.core.cache.DefaultRepositoryCacheManager$MyModuleDescriptorProvider.provideModule(DefaultRepositoryCacheManager.java:826)
> at 
> org.apache.ivy.core.cache.ModuleDescriptorMemoryCache.getStale(ModuleDescriptorMemoryCache.java:68)
> at 
> org.apache.ivy.core.cache.DefaultRepositoryCacheManager.getStaledMd(DefaultRepositoryCacheManager.java:843)
> at 
> org.apache.ivy.core.cache.DefaultRepositoryCacheManager.cacheModuleDescriptor(DefaultRepositoryCacheManager.java:1358)
> at org.apache.ivy.plugins.resolver.BasicResolver.parse(BasicResolver.java:538)
> at 
> org.apache.ivy.plugins.resolver.BasicResolver.getDependency(BasicResolver.java:273)
> at 
> org.apache.ivy.plugins.resolver.ChainResolver.getDependency(ChainResolver.java:103)
> at 
> org.apache.ivy.plugins.parser.m2.PomModuleDescriptorParser.parseOtherPom(PomModuleDescriptorParser.java:394)
> at 
> org.apache.ivy.plugins.parser.m2.PomModuleDescriptorParser.parseDescriptor(PomModuleDescriptorParser.java:139)
> at 

ant-ivy git commit: IVY-1545: Added tracking for a cycle in parent-POM ancestry, throw a CircularDependencyException if found. Added tests for cycles in parent ancestry and references-self as parent.

2018-02-08 Thread jaikiran
Repository: ant-ivy
Updated Branches:
  refs/heads/master 55e6b039a -> 537e13241


IVY-1545: Added tracking for a cycle in parent-POM ancestry, throw a 
CircularDependencyException if found.
Added tests for cycles in parent ancestry and references-self as parent.

This closes #66 pull request at github/apache/ant-ivy repo


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

Branch: refs/heads/master
Commit: 537e13241a7ffd99e5a3676e574e3cd9ea9aae03
Parents: 55e6b03
Author: Brett Randall 
Authored: Fri Mar 25 20:55:15 2016 +1100
Committer: Jaikiran Pai 
Committed: Fri Feb 9 09:17:56 2018 +0530

--
 asciidoc/release-notes.adoc |  1 +
 .../circular/CircularDependencyException.java   | 12 +-
 .../parser/m2/PomModuleDescriptorParser.java| 40 +++---
 .../apache/ivy/core/resolve/ResolveTest.java| 43 
 .../org/apache/dm/parent4/1.0/parent4-1.0.pom   | 36 
 .../org/apache/dm/parent5/1.0/parent5-1.0.pom   | 36 
 .../org/apache/dm/test6/1.0/test6-1.0.jar   |  1 +
 .../org/apache/dm/test6/1.0/test6-1.0.pom   | 37 +
 .../org/apache/dm/test7/1.0/test7-1.0.jar   |  1 +
 .../org/apache/dm/test7/1.0/test7-1.0.pom   | 37 +
 10 files changed, 237 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/537e1324/asciidoc/release-notes.adoc
--
diff --git a/asciidoc/release-notes.adoc b/asciidoc/release-notes.adoc
index 38ca44b..986b153 100644
--- a/asciidoc/release-notes.adoc
+++ b/asciidoc/release-notes.adoc
@@ -74,6 +74,7 @@ For details about the following changes, check our JIRA 
install at link:https://
 - FIX: ApacheURLLister skips versions with URL encoded characters 
[jira:IVY-1442[]] [jira:IVY-1573[]]
 - FIX: Configuration lists are sensitive to whitespace; multiple split/merge 
methods [jira:IVY-309[]] [jira:IVY-1282[]]
 - FIX: Warnings about illegal reflection access due to lack of methods to 
retrieve default authenticator in Java 5 to 8 [jira:IVY-1569[]]
+- FIX: Cycle in parent POM ancestry yields StackOverflowError in 
PomModuleDescriptorParser [jira:IVY-1545] (Thanks to Brett Randall)
 
 - IMPROVEMENT: Throw an IllegalStateException when retrieving the 
resolutionCacheRoot on the DefaultResolutionCacheManager if the basedir (or 
IvySettings) is not set (jira:IVY-1482[])
 - IMPROVEMENT: Optimization: limit the revision numbers scanned if revision 
prefix is specified (Thanks to Ernestas Vaiciukeviius)

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/537e1324/src/java/org/apache/ivy/plugins/circular/CircularDependencyException.java
--
diff --git 
a/src/java/org/apache/ivy/plugins/circular/CircularDependencyException.java 
b/src/java/org/apache/ivy/plugins/circular/CircularDependencyException.java
index 438c572..788b994 100644
--- a/src/java/org/apache/ivy/plugins/circular/CircularDependencyException.java
+++ b/src/java/org/apache/ivy/plugins/circular/CircularDependencyException.java
@@ -17,15 +17,21 @@
  */
 package org.apache.ivy.plugins.circular;
 
+import java.util.Collection;
+
 import org.apache.ivy.core.module.id.ModuleRevisionId;
 
 /**
  * Unchecked exception thrown when a circular dependency exists between 
projects.
  */
 
-@SuppressWarnings("serial")
 public class CircularDependencyException extends RuntimeException {
 
+/**
+ * 
+ */
+private static final long serialVersionUID = 670272039106237360L;
+
 private ModuleRevisionId[] mrids;
 
 /**
@@ -37,6 +43,10 @@ public class CircularDependencyException extends 
RuntimeException {
 this.mrids = mrids;
 }
 
+public CircularDependencyException(final Collection 
mrids) {
+this(mrids.toArray(new ModuleRevisionId[mrids.size()]));
+}
+
 public ModuleRevisionId[] getPath() {
 return this.mrids;
 }

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/537e1324/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java
--
diff --git 
a/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java 
b/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java
index 01b3509..b1c0b7f 100644
--- a/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java
+++ b/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java
@@ -23,8 +23,11 @@ import java.io.InputStream;
 import 

[Bug 62086] NullPointerException in ChainedMapper.mapFileName when building Lucene with Ant 1.10.2

2018-02-08 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62086

--- Comment #3 from Uwe Schindler (ASF)  ---
Looks good, Adrien. +1 to fix this ASAP as it's a regression in a minor update!

-- 
You are receiving this mail because:
You are the assignee for the bug.

ant git commit: Remove width constraints, unbreakable spaces and

2018-02-08 Thread gintas
Repository: ant
Updated Branches:
  refs/heads/master 5266b79bb -> 63dc4df7b


Remove width constraints, unbreakable spaces and 

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

Branch: refs/heads/master
Commit: 63dc4df7b8bba9acc51b10e9d61d3a06560481ce
Parents: 5266b79
Author: Gintas Grigelionis 
Authored: Thu Feb 8 22:56:19 2018 +0100
Committer: Gintas Grigelionis 
Committed: Thu Feb 8 22:56:19 2018 +0100

--
 manual/Integration/jext-plugin.html |  14 +--
 manual/Tasks/BorlandEJBTasks.html   |  66 +-
 manual/Tasks/BorlandGenerateClient.html |  36 +++---
 manual/Tasks/apply.html |  34 ++---
 manual/Tasks/available.html |   2 +-
 manual/Tasks/conditions.html|  48 +++
 manual/Tasks/ejb.html   |   2 +-
 manual/Tasks/ftp.html   |  38 +++---
 manual/Tasks/image.html |  12 +-
 manual/Tasks/import.html|  14 +--
 manual/Tasks/include.html   |  14 +--
 manual/Tasks/jar.html   |   4 +-
 manual/Tasks/java.html  |   2 +-
 manual/Tasks/javac.html |   6 +-
 manual/Tasks/javah.html |  13 +-
 manual/Tasks/jdepend.html   |  30 ++---
 manual/Tasks/jjdoc.html |   8 +-
 manual/Tasks/jjtree.html|  14 +--
 manual/Tasks/junit.html |  26 ++--
 manual/Tasks/junitreport.html   |  12 +-
 manual/Tasks/mail.html  |   2 +-
 manual/Tasks/manifest.html  |   4 +-
 manual/Tasks/native2ascii.html  |   6 +-
 manual/Tasks/propertyfile.html  |  26 ++--
 manual/Tasks/pvcstask.html  |  78 ++--
 manual/Tasks/rmic.html  |   6 +-
 manual/Tasks/schemavalidate.html|  24 ++--
 manual/Tasks/sos.html   |   2 +-
 manual/Tasks/sql.html   | 180 +--
 manual/Tasks/xmlvalidate.html   |  18 +--
 manual/Types/filterchain.html   |   8 +-
 manual/Types/mapper.html|   2 +-
 manual/Types/namespace.html |   2 +-
 manual/Types/resources.html |  12 +-
 34 files changed, 379 insertions(+), 386 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/63dc4df7/manual/Integration/jext-plugin.html
--
diff --git a/manual/Integration/jext-plugin.html 
b/manual/Integration/jext-plugin.html
index 84e88c0..effb033 100644
--- a/manual/Integration/jext-plugin.html
+++ b/manual/Integration/jext-plugin.html
@@ -14,20 +14,18 @@
See the License for the specific language governing permissions and
limitations under the License.
 -->
-
 
 
-  
   
   
 Apache AntWork Plugin for the Jext Java Text Editor
 
 
 
-AntWork Plugin for the Jext Java Text Editor
- by
-  Klaus Hartlage
-  (mailto:khartl...@t-online.de;>khartl...@t-online.de)
+AntWork Plugin for the Jext Java Text Editor
+by
+
+  Klaus Hartlage (mailto:khartl...@t-online.de;>khartl...@t-online.de)
 
 
 
@@ -52,5 +50,5 @@ compile.
 Jext. With a double-click on the error-message you jump to the error
 in the specified java text file.
 
-
-
+
+

http://git-wip-us.apache.org/repos/asf/ant/blob/63dc4df7/manual/Tasks/BorlandEJBTasks.html
--
diff --git a/manual/Tasks/BorlandEJBTasks.html 
b/manual/Tasks/BorlandEJBTasks.html
index 3ee56c6..e473d65 100644
--- a/manual/Tasks/BorlandEJBTasks.html
+++ b/manual/Tasks/BorlandEJBTasks.html
@@ -42,79 +42,79 @@ his homepage.
 Borland element
 
   
-Attribute
-Description
-Required
+Attribute
+Description
+Required
   
   
-destdir
-The base directory into which the generated 
borland
+destdir
+The base directory into which the generated borland
   ready jar files are deposited
-yes
+yes
   
   
-debug
-If true, turn on the debug mode for each 
borland
+debug
+If true, turn on the debug mode for each borland
   tools (java2iiop, iastool ...) default = false
-no
+no
   
   
-verify
-If true, turn on the verification at the end
+verify
+If true, turn on the verification at the end
   of the jar production (default = false)
-no
+no
   
   
-verifyargs
-extra parameter for verify command
-no
+verifyargs
+extra parameter for verify command
+no
   
   
-suffix
-String value appended to the basename of the
+suffix
+String value appended to the basename of the
   

[1/3] ant git commit: Tidy tag soup, trim whitespace, fix styling

2018-02-08 Thread gintas
Repository: ant
Updated Branches:
  refs/heads/master 94d36a9fe -> 5266b79bb


http://git-wip-us.apache.org/repos/asf/ant/blob/5266b79b/manual/tutorial-tasks-filesets-properties.html
--
diff --git a/manual/tutorial-tasks-filesets-properties.html 
b/manual/tutorial-tasks-filesets-properties.html
index 3a36e7e..1662fcf 100644
--- a/manual/tutorial-tasks-filesets-properties.html
+++ b/manual/tutorial-tasks-filesets-properties.html
@@ -27,7 +27,7 @@ tasks [1] this tutorial explains how to get and set 
properties and how to us
 nested filesets and paths. Finally it explains how to contribute tasks to 
Apache Ant.
 
 Content
-
+
 The goal
 Build environment
 Property access
@@ -37,15 +37,13 @@ nested filesets and paths. Finally it explains how to 
contribute tasks to Apache
 Documentation
 Contribute the new task
 Resources
-
-
+
 
-The goal
+The goal
 The goal is to write a task, which searchs in a path for a file and saves 
the
 location of that file in a property.
 
-
-Build environment
+Build environment
 We can use the buildfile from the other tutorial and modify it a little bit.
 That's the advantage of using properties - we can reuse nearly the whole 
script. :-)
 
@@ -65,10 +63,9 @@ That's the advantage of using properties - we can reuse 
nearly the whole script.
 tutorial-tasks-filesets-properties.zip [2] in 
/build.xml.01-propertyaccess
 (future version saved as *.02..., final version as build.xml; same for 
sources).
 
-
-Property access
+Property access
 Our first step is to set a property to a value and print the value of that 
property.
-So our scenario would be
+So our scenario would be
 
 find property="test" value="test-value"/
 find print="test"/
@@ -78,9 +75,9 @@ ok, can be rewritten with the core tasks
 property name="test" value="test-value"/
 echo message="${test}"/
 
-but I have to start on known ground :-)
+but I have to start on known ground :-)
 So what to do? Handling three attributes (property, value, print) and an 
execute method.
-Because this is only an introduction example I don't do much checking:
+Because this is only an introduction example I don't do much checking:
 
 
 import org.apache.tools.ant.BuildException;
@@ -110,7 +107,7 @@ public class Find extends Task {
 }
 
 
-As said in the other tutorial, the property access is done via Project 
instance.
+As said in the other tutorial, the property access is done via Project 
instance.
 We get this instance via the public getProject() method which we 
inherit from
 Task (more precise from ProjectComponent). Reading a property is done 
via
 getProperty(propertyname) (very simple, isn't it?). This 
property returns
@@ -132,7 +129,7 @@ caller.)
 to them, sorry :-)
 
 After putting our two line example from above into a target names 
use.simple
-we can call that from our testcase:
+we can call that from our testcase:
 
 
 import org.junit.Rule;
@@ -161,26 +158,23 @@ public class FindTest {
 }
 
 
-and all works fine.
+and all works fine.
 
-
-
-Using filesets
+Using filesets
 Ant provides a common way of bundling files: the fileset. Because you are 
reading
 this tutorial I think you know them and I don't have to spend more 
explanations about
 their usage in buildfiles. Our goal is to search a file in path. And on this 
step the
 path is simply a fileset (or more precise: a collection of filesets). So our 
usage
-would be
+would be
 
 find file="ant.jar" location="location.ant-jar"
 fileset dir="${ant.home}" includes="**/*.jar"/
 /find
 
-
 
 What do we need? A task with two attributes (file, location) and nested
 filesets. Because we had attribute handling already explained in the example 
above and the
-handling of nested elements is described in the other tutorial the code should 
be very easy:
+handling of nested elements is described in the other tutorial the code 
should be very easy:
 
 public class Find extends Task {
 
@@ -204,18 +198,19 @@ public class Find extends Task {
 }
 }
 
-Ok - that task wouldn't do very much, but we can use it in the described 
manner without
+Ok - that task wouldn't do very much, but we can use it in the described 
manner without
 failure. On next step we have to implement the execute method. And before that 
we will
 implement the appropriate testcases (TDD - test driven development).
 
 In the other tutorial we have reused the already written targets of our 
buildfile.
 Now we will configure most of the testcases via java code (sometimes it's much 
easier
-to write a target than doing it via java coding). What can be tested?
+to write a target than doing it via java coding). What can be tested?
+
 not valid configured task (missing file, missing location, missing 
fileset)
 don't find a present file
 behaviour if file can't be found
 
-Maybe you find some more testcases. But this is enough for now.
+Maybe you find some more testcases. But this is enough for now.
 For 

[3/3] ant git commit: Tidy tag soup, trim whitespace, fix styling

2018-02-08 Thread gintas
Tidy tag soup, trim whitespace, fix styling

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

Branch: refs/heads/master
Commit: 5266b79bb882f1912afa57abb1f19de6f03485e0
Parents: 94d36a9
Author: Gintas Grigelionis 
Authored: Thu Feb 8 22:52:33 2018 +0100
Committer: Gintas Grigelionis 
Committed: Thu Feb 8 22:52:33 2018 +0100

--
 manual/antexternal.html|  12 +-
 manual/anttaskslist.html   |   1 -
 manual/argumentprocessor.html  |   5 +-
 manual/base_task_classes.html  |   5 +-
 manual/clonevm.html|   4 +-
 manual/cover.html  |  14 +-
 manual/credits.html|   6 +-
 manual/develop.html|  67 +--
 manual/dirtasks.html   |  27 +-
 manual/feedback.html   |  42 +-
 manual/ide.html|   2 -
 manual/ifunless.html   |   8 +-
 manual/inputhandler.html   |  10 +-
 manual/install.html|  55 +-
 manual/installlist.html|   1 -
 manual/intro.html  |   7 +-
 manual/javacprops.html |   6 +-
 manual/listeners.html  | 298 +-
 manual/platform.html   |  98 ++--
 manual/projecthelper.html  |  15 +-
 manual/properties.html |  22 +-
 manual/proxy.html  |  42 +-
 manual/running.html|  89 ++-
 manual/stylesheets/style.css   |  57 ++
 manual/sysclasspath.html   |   4 +-
 manual/targets.html|  20 +-
 manual/tasksoverview.html  | 610 
 manual/toc.html|   1 -
 manual/tutorial-HelloWorldWithAnt.html |  92 ++-
 manual/tutorial-tasks-filesets-properties.html | 138 ++---
 manual/tutorial-writing-tasks.html |  71 +--
 manual/tutorials.html  |   8 +-
 manual/using.html  |  99 ++--
 manual/usinglist.html  |   1 -
 34 files changed, 861 insertions(+), 1076 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/5266b79b/manual/antexternal.html
--
diff --git a/manual/antexternal.html b/manual/antexternal.html
index 02d2f7b..4f9bbc3 100644
--- a/manual/antexternal.html
+++ b/manual/antexternal.html
@@ -14,7 +14,6 @@
See the License for the specific language governing permissions and
limitations under the License.
 -->
-
 
 
 
@@ -31,12 +30,12 @@
 administrators.  But what about programmers?  Can the functionality
 provided by Ant tasks be used in java programs?
 
-Yes, and its quite easy.  Before getting into the details, however, 
+Yes, and its quite easy.  Before getting into the details, however,
 we should mention the pros and cons of this approach:
 
 Pros
 
-
+
 
 Robust
 
@@ -65,7 +64,7 @@ code is supported by the entire Apache Ant community.
 
 Cons
 
-
+
 
 Dependency on Ant Libraries
 
@@ -86,7 +85,6 @@ open source!
 
 
 
-
 Example
 
 Let's say you want to unzip a zip file programmatically from java
@@ -136,7 +134,7 @@ static public void unzip(String zipFilepath, String 
destinationDir) {
taskType = "unzip";
taskName = "unzip";
target = new Target();
-   }   
+   }
 }
 Expander expander = new Expander();
 expander.setSrc(new File(zipfile));
@@ -156,5 +154,5 @@ don't.  Ultimately, you have to be willing to get your feet 
wet and
 read the source code.  The above example is merely designed to whet
 your appetite and get you started.  Go for it!
 
-
+
 

http://git-wip-us.apache.org/repos/asf/ant/blob/5266b79b/manual/anttaskslist.html
--
diff --git a/manual/anttaskslist.html b/manual/anttaskslist.html
index bd12049..b5b743b 100644
--- a/manual/anttaskslist.html
+++ b/manual/anttaskslist.html
@@ -25,7 +25,6 @@
 
 
 
-
 Table of Contents
 
 Apache Ant Tasks

http://git-wip-us.apache.org/repos/asf/ant/blob/5266b79b/manual/argumentprocessor.html
--
diff --git a/manual/argumentprocessor.html b/manual/argumentprocessor.html
index 2cd5202..ce7719e 100644
--- a/manual/argumentprocessor.html
+++ 

[2/3] ant git commit: Tidy tag soup, trim whitespace, fix styling

2018-02-08 Thread gintas
http://git-wip-us.apache.org/repos/asf/ant/blob/5266b79b/manual/running.html
--
diff --git a/manual/running.html b/manual/running.html
index dac2ef3..56b03b2 100644
--- a/manual/running.html
+++ b/manual/running.html
@@ -25,7 +25,7 @@
 
 
 Running Apache Ant
-Command Line
+Command Line
  If you've installed Apache Ant as described in the
  Installing Ant section,
 running Ant from the command-line is simple: just type
@@ -36,10 +36,10 @@ build file and runs the target specified in the 
default
 attribute of the project tag.
 To make Ant use
 a build file other than build.xml, use the command-line
-option -buildfile file,
+option -buildfile file,
 where file is the name of the build file you want to use
 (or a directory containing a build.xml file).
-If you use the -find [file] option,
+If you use the -find [file] option,
 Ant will search for a build file first in the current directory, then in
 the parent directory, and so on, until either a build file is found or the root
 of the filesystem has been reached. By default, it will look for a build file
@@ -47,13 +47,13 @@ called build.xml. To have it search for a 
build file other
 than build.xml, specify a file argument.
 Note: If you include any other flags or arguments
 on the command line after
-the -find flag, you must include the file argument
-for the -find flag, even if the name of the
+the -find flag, you must include the file argument
+for the -find flag, even if the name of the
 build file you want to find is build.xml.
 
 You can also set properties on the
 command line.  This can be done with
-the -Dproperty=value option,
+the -Dproperty=value option,
 where property is the name of the property,
 and value is the value for that property. If you specify a
 property that is also set in the build file
@@ -63,8 +63,8 @@ command line will override the value specified in the
 build file.
 Defining properties on the command line can also be used to pass in
 the value of environment variables; just pass
--DMYVAR=%MYVAR% (Windows) or
--DMYVAR=$MYVAR (Unix)
+-DMYVAR=%MYVAR% (Windows) or
+-DMYVAR=$MYVAR (Unix)
 to Ant. You can then access
 these variables inside your build file as ${MYVAR}.
 You can also access environment variables using the
@@ -73,13 +73,13 @@ You can also access environment variables using the
 
 
 Options that affect the amount of logging output by Ant are:
--quiet,
+-quiet,
 which instructs Ant to print less
 information to the console;
--verbose, which causes Ant to print
-additional information to the console; -debug,
+-verbose, which causes Ant to print
+additional information to the console; -debug,
 which causes Ant to print considerably more additional information; and
--silent which makes Ant print nothing but task
+-silent which makes Ant print nothing but task
 output and build failures (useful to capture Ant output by scripts).
 
 
@@ -89,7 +89,7 @@ When omitted, the target that is specified in the
 project tag is
 used.
 
-The -projecthelp option prints out a list
+The -projecthelp option prints out a list
 of the build file's targets. Targets that include a
 description attribute are listed as Main targets,
 those without a description are listed as
@@ -97,7 +97,7 @@ those without a description are listed as
 ("Other targets" are only displayed if there are no main
 targets, or if Ant is invoked in -verbose or -debug mode).
 
-Command-line Options Summary
+Command-line Options Summary
 ant [options] [target [target2 [target3] ...]]
 Options:
   -help, -h  print this message and exit
@@ -139,20 +139,20 @@ Options:
 Loggers  Listeners.
 For more information about -inputhandler see
 InputHandler.
-Easiest way of changing the exit-behaviour is subclassing the original main 
class:
+Easiest way of changing the exit-behaviour is subclassing the original main 
class:
 
 public class CustomExitCode extends org.apache.tools.ant.Main {
 protected void exit(int exitCode) {
 // implement your own behaviour, e.g. NOT exiting the JVM
 }
 }
- and starting Ant with access (-lib path-to-class) to this 
class.
-
+
+and starting Ant with access (-lib path-to-class) to this 
class.
 
-Library Directories
+Library Directories
 
 Prior to Ant 1.6, all jars in the ANT_HOME/lib would be added to the CLASSPATH
-used to run Ant. This was done in the scripts that started Ant. From Ant 1.6,
+  used to run Ant. This was done in the scripts that started Ant. Since 
Ant 1.6,
 two directories are scanned by default and more can be added as required. The
 default directories scanned are ANT_HOME/lib and a user specific directory,
 ${user.home}/.ant/lib. This arrangement allows the Ant installation to be
@@ -180,7 +180,6 @@ option. Ant itself is started with a very minimalistic 
classpath.
 Ant should work perfectly well with an empty CLASSPATH environment variable,
 something the the -noclasspath option actually enforces. We get many more 
support calls 

Jenkins build is back to stable : Ant-Build-Matrix-master-Windows » JDK 10 b37 (early access build) (Windows Only),Windows #172

2018-02-08 Thread Apache Jenkins Server
See 




Jenkins build is back to stable : Ant-Build-Matrix-master-Windows » JDK 1.8.0_121 (unlimited security) 64-bit Windows only,Windows #172

2018-02-08 Thread Apache Jenkins Server
See 




[3/3] ant git commit: Tidy tag soup, remove inlined styling, adjust formatting

2018-02-08 Thread gintas
Tidy tag soup, remove inlined styling, adjust formatting

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

Branch: refs/heads/master
Commit: 94d36a9fe7ba4f1bcb18a0501d57f72b75883d44
Parents: 66392ba
Author: Gintas Grigelionis 
Authored: Thu Feb 8 16:59:52 2018 +0100
Committer: Gintas Grigelionis 
Committed: Thu Feb 8 17:00:18 2018 +0100

--
 manual/Types/antlib.html |  24 +-
 manual/Types/assertions.html |  31 +-
 manual/Types/classfileset.html   |  36 +-
 manual/Types/custom-programming.html |  15 +-
 manual/Types/description.html|   8 +-
 manual/Types/dirset.html |   6 +-
 manual/Types/extension.html  |  13 +-
 manual/Types/extensionset.html   |  12 +-
 manual/Types/filelist.html   |  29 +-
 manual/Types/fileset.html|  11 +-
 manual/Types/filterchain.html| 885 +++---
 manual/Types/filterset.html  | 116 ++--
 manual/Types/mapper.html | 103 ++--
 manual/Types/multirootfileset.html   |   6 +-
 manual/Types/namespace.html  |  24 +-
 manual/Types/patternset.html |  19 +-
 manual/Types/permissions.html|  24 +-
 manual/Types/propertyset.html|   9 +-
 manual/Types/redirector.html |  12 +-
 manual/Types/regexp.html |  13 +-
 manual/Types/resources.html  | 272 -
 manual/Types/selectors-program.html  |  16 +-
 manual/Types/selectors.html  | 339 ++--
 manual/Types/tarfileset.html |  18 +-
 manual/Types/xmlcatalog.html |  61 +-
 manual/Types/zipfileset.html |  34 +-
 manual/stylesheets/style.css |   9 +
 27 files changed, 1007 insertions(+), 1138 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/94d36a9f/manual/Types/antlib.html
--
diff --git a/manual/Types/antlib.html b/manual/Types/antlib.html
index 925320a..0e738c0 100644
--- a/manual/Types/antlib.html
+++ b/manual/Types/antlib.html
@@ -17,13 +17,13 @@
 
 
   
-
+
 
 AntLib
   
 
   
-Antlib
+Antlib
 
 
 Description
@@ -108,7 +108,7 @@
 
 
 
-Antlib namespace
+Antlib namespace
 
   The name space URIs with the pattern antlib:java package
   are given special treatment.
@@ -152,14 +152,14 @@
 
 
   The requirement that the resource is in the default classpath
-  may be removed in future versions of Ant.
+  may be removed in future versions of Ant.
 
 
 
-   Load antlib from inside of the 
buildfile
+   Load antlib from inside of the buildfile

- If you want to separate the antlib from your local Ant installation, 
e.g. because you 
- want to hold that jar in your projects SCM system, you have to 
specify a classpath, so 
+ If you want to separate the antlib from your local Ant installation, 
e.g. because you
+ want to hold that jar in your projects SCM system, you have to 
specify a classpath, so
  that Ant could find that jar. The best solution is loading the antlib 
with taskdef.

 
@@ -168,7 +168,7 @@
taskdef uri="antlib:net.sf.antcontrib"
 resource="net/sf/antcontrib/antlib.xml"
 classpath="path/to/ant-contrib.jar"/
-   
+
target name="iterate"
   antcontrib:for param="file"
  fileset dir="."/
@@ -181,10 +181,7 @@
   
 
 
-   
-   
-
-Current namespace
+Current namespace
 
   Definitions defined in antlibs may be used in antlibs. However
   the namespace that definitions are placed in are dependent on
@@ -258,9 +255,6 @@
 /project
   
 
-
-
 
 
 
-

http://git-wip-us.apache.org/repos/asf/ant/blob/94d36a9f/manual/Types/assertions.html
--
diff --git a/manual/Types/assertions.html b/manual/Types/assertions.html
index e168969..9942b4c 100644
--- a/manual/Types/assertions.html
+++ b/manual/Types/assertions.html
@@ -24,22 +24,22 @@
 
 
 
-Assertions
+Assertions
 
 The assertions type enables or disables the Java 1.4 assertions 
feature,
 on a whole Java program, or components of a program. It can be used
 in java and
-junit to add extra 
validation to code.  
+junit to add extra 
validation to code.
 
 
-Assertions are covered in the 
+Assertions are covered in the
 http://docs.oracle.com/javase/7/docs/technotes/guides/language/assert.html;>Java
 SE documentation,
 and the
 http://docs.oracle.com/javase/specs/jls/se7/html/jls-14.html#jls-14.10;>Java
 Language Specification.
 
 

[1/3] ant git commit: Tidy tag soup, remove inlined styling, adjust formatting

2018-02-08 Thread gintas
Repository: ant
Updated Branches:
  refs/heads/master 66392baa6 -> 94d36a9fe


http://git-wip-us.apache.org/repos/asf/ant/blob/94d36a9f/manual/Types/selectors.html
--
diff --git a/manual/Types/selectors.html b/manual/Types/selectors.html
index db2ec48..a302081 100644
--- a/manual/Types/selectors.html
+++ b/manual/Types/selectors.html
@@ -46,7 +46,7 @@
 Core Selectors.
 
 
-Core Selectors
+Core Selectors
 
 Core selectors are the ones that come standard
 with Ant. They can be used within a fileset and can be contained
@@ -82,12 +82,10 @@
 the return value of the configured algorithm is different from that
 stored in a cache.
   signedselector - 
Select files if
-they are signed, and optionally if they have a signature of a certain 
name.
-  
-  scriptselector - 
+they are signed, and optionally if they have a signature of a certain 
name.
+  scriptselector -
 Use a BSF or JSR 223 scripting language to create
-your own selector
-  
+your own selector
   readable -
 Select files if they are readable.
   writable -
@@ -100,7 +98,7 @@
 Select files if they are owned by a given user.
 
 
-Contains Selector
+Contains Selector
 
 The contains tag in a FileSet limits
 the files defined by that fileset to only those which contain the
@@ -111,7 +109,7 @@
   restrict
   ResourceCollection).
 
-
+
   
 Attribute
 Description
@@ -145,7 +143,7 @@
 Required in practice if the encoding of the files being
 selected is different from the default encoding of the JVM
 where Ant is running.
-Since Ant 1.9.0
+Since Ant 1.9.0
 
 No
 
@@ -162,15 +160,14 @@
 Selects all the HTML files that contain the string
 script.
 
-
-Date Selector
+Date Selector
 
 The date tag in a FileSet will put
 a limit on the files specified by the include tag, so that tags
 whose last modified date does not meet the date limits specified
 by the selector will not end up being selected.
 
-
+
   
 Attribute
 Description
@@ -220,7 +217,7 @@
 The SimpleDateFormat-compatible pattern
   to use when interpreting the datetime attribute using
   the current locale.
-  Since Ant 1.6.2
+  Since Ant 1.6.2
 
 No
   
@@ -244,8 +241,7 @@
 Selects all JAR files which were last modified before midnight
 January 1, 2001.
 
-
-Depend Selector
+Depend Selector
 
 The depend tag selects files
 whose last modified date is later than another, equivalent file in
@@ -259,7 +255,7 @@
 
 The depend selector is case-sensitive.
 
-
+
   
 Attribute
 Description
@@ -296,15 +292,14 @@
   1.5 release.
 
 
-
-Depth Selector
+Depth Selector
 
 The depth tag selects files based on
 how many directory levels deep they are in relation to the base
 directory of the fileset.
 
 
-
+
   
 Attribute
 Description
@@ -338,8 +333,7 @@
 Selects all files in the base directory and one directory below
 that.
 
-
-Different Selector
+Different Selector
 
 The different selector will select a file
 if it is deemed to be 'different' from an equivalent file in
@@ -351,10 +345,10 @@
   mapper) the file is selected.
 If a file is only present in targetdir (or after applying the
   mapper) it is ignored.
- Files with different lengths are different.
- If ignoreFileTimes is turned off, then differing file
+Files with different lengths are different.
+If ignoreFileTimes is turned off, then differing file
 timestamps will cause files to be regarded as different.
- Unless ignoreContents is set to true,
+Unless ignoreContents is set to true,
  a byte-for-byte check is run against the two files.
 
 
@@ -374,7 +368,7 @@
 mapper element is specified, the
 identity type mapper is used.
 
-
+
   
 Attribute
 Description
@@ -399,7 +393,7 @@
 ignoreContents
 Whether to do a byte per byte compare.
   Default is false (contents are compared).
-  Since Ant 1.6.3
+Since Ant 1.6.3
 
 No
   
@@ -427,7 +421,7 @@
 and selects those who are different, disregarding file times.
 
 
-Filename Selector
+Filename Selector
 
 The filename tag acts like the
 include and exclude
@@ -439,7 +433,7 @@
 The filename selector is
 case-sensitive.
 
-
+
   
 Attribute
 Description
@@ -484,8 +478,7 @@
 
 Selects all the cascading style sheet files.
 
-
-Present Selector
+Present Selector
 
 The present 

[2/3] ant git commit: Tidy tag soup, remove inlined styling, adjust formatting

2018-02-08 Thread gintas
http://git-wip-us.apache.org/repos/asf/ant/blob/94d36a9f/manual/Types/mapper.html
--
diff --git a/manual/Types/mapper.html b/manual/Types/mapper.html
index b557360..38c3824 100644
--- a/manual/Types/mapper.html
+++ b/manual/Types/mapper.html
@@ -24,7 +24,7 @@
 
 
 
-Mapping File Names
+Mapping File Names
 Some tasks take source files and create target files. Depending on
 the task, it may be quite obvious which name a target file will have
 (using javac, you know there will be
@@ -40,7 +40,7 @@ that can be parameterized with from and 
to
 attributes - the exact meaning of which is implementation-dependent.
 These instances are defined in mapper elements
 with the following attributes:
-
+
   
 Attribute
 Description
@@ -93,17 +93,16 @@ instead.
 The classpath can be specified via a nested
 classpath, as well - that is,
 a path-like structure.
-Since Ant 1.7.0, nested File Mappers can
+Since Ant 1.7.0, nested File Mappers can
 be supplied via either mapper elements or
 typedef'd
 implementations of org.apache.tools.ant.util.FileNameMapper.
 If nested File Mappers are specified by either means, the mapper will be
 implicitly configured as a composite mapper.
 
-
-The built-in mapper types are:
+The built-in mapper types
 All built-in mappers are case-sensitive.
-As of Ant 1.7.0, each of the built-in mapper implementation
+Since Ant 1.7.0, each of the built-in mapper implementation
   types is directly accessible using a specific tagname. This makes it
   possible for filename mappers to support attributes in addition to
   the generally available to and from.
@@ -114,7 +113,7 @@ implicitly configured as a composite mapper.
 
 
 
-identity
+identity
 The target file name is identical to the source file name. Both
 to and from will be ignored.
 Examples:
@@ -122,7 +121,7 @@ implicitly configured as a composite mapper.
 mapper type=identity/
 identitymapper/
 
-
+
   
 Source file name
 Target file name
@@ -149,7 +148,7 @@ implicitly configured as a composite mapper.
 
 
 
-flatten
+flatten
 The target file name is identical to the source file name, with all
 leading directory information stripped off. Both to and
 from will be ignored.
@@ -158,7 +157,7 @@ leading directory information stripped off. Both 
to and
 mapper type=flatten/
 flattenmapper/
 
-
+
   
 Source file name
 Target file name
@@ -185,7 +184,7 @@ leading directory information stripped off. Both 
to and
 
 
 
-merge
+merge
 The target file name will always be the same, as defined by
 to - from will be ignored.
 Examples:
@@ -193,7 +192,7 @@ leading directory information stripped off. Both 
to and
 mapper type=merge to=archive.tar/
 mergemapper to=archive.tar/
 
-
+
   
 Source file name
 Target file name
@@ -220,7 +219,7 @@ leading directory information stripped off. Both 
to and
 
 
 
-glob
+glob
 Both to and from are required and define patterns 
that may
 contain at most one *. For each source file that matches
 the from pattern, a target file name will be constructed
@@ -233,7 +232,7 @@ that don't match the from pattern will be 
ignored.
 mapper type=glob from=*.java 
to=*.java.bak/
 globmapper from=*.java to=*.java.bak/
 
-
+
   
 Source file name
 Target file name
@@ -259,7 +258,7 @@ that don't match the from pattern will be 
ignored.
 mapper type=glob from=C*ies to=Q*y/
 globmapper from=C*ies to=Q*y/
 
-
+
   
 Source file name
 Target file name
@@ -284,7 +283,7 @@ that don't match the from pattern will be 
ignored.
   
 The globmapper mapper can take the following extra attributes.
   
-  
+  
 
   Attribute
   Description
@@ -295,7 +294,7 @@ that don't match the from pattern will be 
ignored.
   
 If this is false, the mapper will ignore case when matching the glob 
pattern.
 This attribute can be true or false, the default is true.
-  Since Ant 1.6.3.
+  Since Ant 1.6.3
   
   No
 
@@ -306,7 +305,7 @@ that don't match the from pattern will be 
ignored.
 directory separator characters - \ and /.
 This attribute can be true or false, the default is false.
 This attribute is useful for cross-platform build files.
-Since Ant 1.6.3.
+Since Ant 1.6.3
 No
   
 
@@ -344,12 +343,11 @@ that don't match the from pattern will be 
ignored.
   will output "x is f/j.java".
 
 
-
 
 
 
 
-regexp
+regexp
 
 Both to and from are required and define
 regular expressions. If the source file name (as a whole or in part)
@@ -371,9 +369,9 @@ another dollar-sign in Ant.
 
 The regexp mapper needs a supporting library and an implementation
 of org.apache.tools.ant.util.regexp.RegexpMatcher that
-  hides the specifics of the library.  Since Ant 1.8.0 Ant
-  requires Java 1.4 to run, so the implementation based on
-  the java.util.regex package will always be available.
+  hides the 

Jenkins build became unstable: Ant-Build-Matrix-master-Windows » JDK 1.8.0_121 (unlimited security) 64-bit Windows only,Windows #171

2018-02-08 Thread Apache Jenkins Server
See 




Jenkins build became unstable: Ant-Build-Matrix-master-Windows » JDK 10 b37 (early access build) (Windows Only),Windows #170

2018-02-08 Thread Apache Jenkins Server
See 




Jenkins build is back to stable : Ant-Build-Matrix-master-Linux » xenial,JDK 1.8 (latest) #1059

2018-02-08 Thread Apache Jenkins Server
See 




Jenkins build became unstable: Ant-Build-Matrix-master-Linux » xenial,JDK 1.8 (latest) #1058

2018-02-08 Thread Apache Jenkins Server
See 




[Bug 62086] NullPointerException in ChainedMapper.mapFileName when building Lucene with Ant 1.10.2

2018-02-08 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62086

Jaikiran Pai  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
   Target Milestone|--- |1.10.3
 Resolution|--- |FIXED

-- 
You are receiving this mail because:
You are the assignee for the bug.

ant git commit: Update whatsnew with bz-62086 fix

2018-02-08 Thread jaikiran
Repository: ant
Updated Branches:
  refs/heads/master 98e4b51aa -> 66392baa6


Update whatsnew with bz-62086 fix


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

Branch: refs/heads/master
Commit: 66392baa68c6e874cb10f836fbdcc0fb88b0874a
Parents: 98e4b51
Author: Jaikiran Pai 
Authored: Thu Feb 8 20:26:56 2018 +0530
Committer: Jaikiran Pai 
Committed: Thu Feb 8 20:26:56 2018 +0530

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


http://git-wip-us.apache.org/repos/asf/ant/blob/66392baa/WHATSNEW
--
diff --git a/WHATSNEW b/WHATSNEW
index 541fbfa..457af52 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -1,6 +1,13 @@
 Changes from Ant 1.10.2 TO Ant 1.10.3
 =
 
+Fixed bugs:
+---
+
+ * Fixed NullPointerException in ChainedMapper
+   Bugzilla Report 62086
+
+
 Changes from Ant 1.10.1 TO Ant 1.10.2
 =
 



ant git commit: bz-62086 Fix NPE in ChainedMapper.

2018-02-08 Thread jaikiran
Repository: ant
Updated Branches:
  refs/heads/master f20b41c9b -> 98e4b51aa


bz-62086 Fix NPE in ChainedMapper.

This closes #59 pull request at github/apache/ant repo

This NPE happens whenever any of the sub mappers returns `null`, which may
happen eg. with `GlobPatternMapper`.


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

Branch: refs/heads/master
Commit: 98e4b51aa88be2de4e74172a0f4aec153da1ebd7
Parents: f20b41c
Author: Adrien Grand 
Authored: Thu Feb 8 15:22:02 2018 +0100
Committer: Jaikiran Pai 
Committed: Thu Feb 8 20:16:42 2018 +0530

--
 src/main/org/apache/tools/ant/util/ChainedMapper.java  | 3 ++-
 src/tests/junit/org/apache/tools/ant/types/MapperTest.java | 4 
 2 files changed, 6 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/98e4b51a/src/main/org/apache/tools/ant/util/ChainedMapper.java
--
diff --git a/src/main/org/apache/tools/ant/util/ChainedMapper.java 
b/src/main/org/apache/tools/ant/util/ChainedMapper.java
index e47043a..8b3e32f 100644
--- a/src/main/org/apache/tools/ant/util/ChainedMapper.java
+++ b/src/main/org/apache/tools/ant/util/ChainedMapper.java
@@ -18,6 +18,7 @@
 
 package org.apache.tools.ant.util;
 
+import java.util.Objects;
 import java.util.stream.Stream;
 
 /**
@@ -33,7 +34,7 @@ public class ChainedMapper extends ContainerMapper {
 public String[] mapFileName(String sourceFileName) {
 String[] result = getMappers().stream()
 .reduce(new String[] { sourceFileName }, (i, m) -> Stream.of(i)
-
.map(m::mapFileName).flatMap(Stream::of).toArray(String[]::new),
+
.map(m::mapFileName).filter(Objects::nonNull).flatMap(Stream::of).toArray(String[]::new),
 (i, o) -> o);
 return result == null || result.length == 0 ? null : result;
 }

http://git-wip-us.apache.org/repos/asf/ant/blob/98e4b51a/src/tests/junit/org/apache/tools/ant/types/MapperTest.java
--
diff --git a/src/tests/junit/org/apache/tools/ant/types/MapperTest.java 
b/src/tests/junit/org/apache/tools/ant/types/MapperTest.java
index 980f5cc..77c1811 100644
--- a/src/tests/junit/org/apache/tools/ant/types/MapperTest.java
+++ b/src/tests/junit/org/apache/tools/ant/types/MapperTest.java
@@ -35,6 +35,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -224,6 +225,9 @@ public class MapperTest {
 List list = Arrays.asList(targets);
 assertTrue("cannot find expected target \"def\"", 
list.contains("def"));
 assertTrue("cannot find expected target \"ghi\"", 
list.contains("ghi"));
+
+targets = fileNameMapper.mapFileName("z");
+assertNull(targets);
 }
 
 @Test



[Bug 62086] NullPointerException in ChainedMapper.mapFileName when building Lucene with Ant 1.10.2

2018-02-08 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62086

--- Comment #2 from Adrien Grand  ---
Done at https://github.com/apache/ant/pull/59.

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Bug 62086] NullPointerException in ChainedMapper.mapFileName when building Lucene with Ant 1.10.2

2018-02-08 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62086

--- Comment #1 from Jaikiran Pai  ---
I think the change you suggest is fine. Would you like to submit a pull request
with this change to our github repo here https://github.com/apache/ant so that
it can be reviewed and merged?

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Bug 62086] New: NullPointerException in ChainedMapper.mapFileName when building Lucene with Ant 1.10.2

2018-02-08 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62086

Bug ID: 62086
   Summary: NullPointerException in ChainedMapper.mapFileName when
building Lucene with Ant 1.10.2
   Product: Ant
   Version: 1.10.2
  Hardware: PC
OS: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Core
  Assignee: notifications@ant.apache.org
  Reporter: jpou...@gmail.com
  Target Milestone: ---

Ant 1.10.2 fails to build Lucene/Solr while 1.10.1 succeeds. Here is what the
error looks like:

BUILD FAILED
/home/jpountz/src/lucene-solr/build.xml:21: The following error occurred while
executing this line:
/home/jpountz/src/lucene-solr/lucene/common-build.xml:624:
java.lang.NullPointerException
at java.base/java.util.Arrays.stream(Arrays.java:5610)
at java.base/java.util.stream.Stream.of(Stream.java:1187)
at
java.base/java.util.stream.ReferencePipeline$7$1.accept(ReferencePipeline.java:269)
at
java.base/java.util.stream.ReferencePipeline$3$1.accept(ReferencePipeline.java:195)
at
java.base/java.util.Spliterators$ArraySpliterator.forEachRemaining(Spliterators.java:948)
at
java.base/java.util.stream.AbstractPipeline.copyInto(AbstractPipeline.java:484)
at
java.base/java.util.stream.AbstractPipeline.wrapAndCopyInto(AbstractPipeline.java:474)
at
java.base/java.util.stream.AbstractPipeline.evaluate(AbstractPipeline.java:550)
at
java.base/java.util.stream.AbstractPipeline.evaluateToArrayNode(AbstractPipeline.java:260)
at
java.base/java.util.stream.ReferencePipeline.toArray(ReferencePipeline.java:450)
at
org.apache.tools.ant.util.ChainedMapper.lambda$mapFileName$1(ChainedMapper.java:36)
at
java.base/java.util.stream.ReduceOps$1ReducingSink.accept(ReduceOps.java:80)
at
java.base/java.util.ArrayList$ArrayListSpliterator.forEachRemaining(ArrayList.java:1494)
at
java.base/java.util.stream.AbstractPipeline.copyInto(AbstractPipeline.java:484)
at
java.base/java.util.stream.AbstractPipeline.wrapAndCopyInto(AbstractPipeline.java:474)
at
java.base/java.util.stream.ReduceOps$ReduceOp.evaluateSequential(ReduceOps.java:913)
at
java.base/java.util.stream.AbstractPipeline.evaluate(AbstractPipeline.java:234)
at
java.base/java.util.stream.ReferencePipeline.reduce(ReferencePipeline.java:496)
at
org.apache.tools.ant.util.ChainedMapper.mapFileName(ChainedMapper.java:35)
at
org.apache.tools.ant.util.CompositeMapper.lambda$mapFileName$0(CompositeMapper.java:32)
at
java.base/java.util.stream.ReferencePipeline$3$1.accept(ReferencePipeline.java:195)
at
java.base/java.util.stream.ReferencePipeline$2$1.accept(ReferencePipeline.java:177)
at
java.base/java.util.ArrayList$ArrayListSpliterator.forEachRemaining(ArrayList.java:1494)
at
java.base/java.util.stream.AbstractPipeline.copyInto(AbstractPipeline.java:484)
at
java.base/java.util.stream.AbstractPipeline.wrapAndCopyInto(AbstractPipeline.java:474)
at
java.base/java.util.stream.AbstractPipeline.evaluate(AbstractPipeline.java:550)
at
java.base/java.util.stream.AbstractPipeline.evaluateToArrayNode(AbstractPipeline.java:260)
at
java.base/java.util.stream.ReferencePipeline.toArray(ReferencePipeline.java:450)
at
org.apache.tools.ant.util.CompositeMapper.mapFileName(CompositeMapper.java:33)
at
org.apache.tools.ant.taskdefs.PathConvert.execute(PathConvert.java:363)
at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:292)
at jdk.internal.reflect.GeneratedMethodAccessor4.invoke(Unknown Source)
at
java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.base/java.lang.reflect.Method.invoke(Method.java:564)
at
org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:106)
at org.apache.tools.ant.Task.perform(Task.java:346)
at org.apache.tools.ant.Target.execute(Target.java:448)
at
org.apache.tools.ant.helper.ProjectHelper2.parse(ProjectHelper2.java:172)
at
org.apache.tools.ant.taskdefs.ImportTask.importResource(ImportTask.java:221)
at
org.apache.tools.ant.taskdefs.ImportTask.execute(ImportTask.java:165)
at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:292)
at
java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at
java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
at
java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.base/java.lang.reflect.Method.invoke(Method.java:564)
at
org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:106)
at 

ant-ivy git commit: Upgrade to 1.9.10 of Ant

2018-02-08 Thread jaikiran
Repository: ant-ivy
Updated Branches:
  refs/heads/master 783276d94 -> 55e6b039a


Upgrade to 1.9.10 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/55e6b039
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/55e6b039
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/55e6b039

Branch: refs/heads/master
Commit: 55e6b039acd666bcf4a8bc70a6380178b881c08a
Parents: 783276d
Author: Jaikiran Pai 
Authored: Thu Feb 8 18:45:34 2018 +0530
Committer: Jaikiran Pai 
Committed: Thu Feb 8 18:45:34 2018 +0530

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


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/55e6b039/version.properties
--
diff --git a/version.properties b/version.properties
index 7b1a0ba..600be02 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.9
+apache-ant.version=1.9.10
 ant-contrib.version=1.0b3
 bouncycastle.version=1.58
 commons-vfs2.version=2.1