ant-ivy git commit: Bump up version of Checkstyle (use the latest of 7 series)

2018-02-02 Thread gintas 
Repository: ant-ivy
Updated Branches:
  refs/heads/master c470b7589 -> 994fff7f6


Bump up version of Checkstyle (use the latest of 7 series)

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

Branch: refs/heads/master
Commit: 994fff7f6244279f0703a612fb078e44fabcaa16
Parents: c470b75
Author: Gintas Grigelionis 
Authored: Sat Feb 3 07:11:57 2018 +0100
Committer: Gintas Grigelionis 
Committed: Sat Feb 3 07:11:57 2018 +0100

--
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/994fff7f/build.xml
--
diff --git a/build.xml b/build.xml
index 3452eb0..18dbf81 100644
--- a/build.xml
+++ b/build.xml
@@ -564,7 +564,7 @@
 
 
 
-

ant-ivy git commit: Avoid “empty XML tag” warnings

2018-02-02 Thread gintas 
Repository: ant-ivy
Updated Branches:
  refs/heads/master f01d7a5b4 -> c470b7589


Avoid “empty XML tag” warnings

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

Branch: refs/heads/master
Commit: c470b75897486f1bc9626d4f307563fbd4b1fb14
Parents: f01d7a5
Author: Gintas Grigelionis 
Authored: Sat Feb 3 07:08:08 2018 +0100
Committer: Gintas Grigelionis 
Committed: Sat Feb 3 07:08:08 2018 +0100

--
 .../parser/m2/shale-tiger-1.1.0-SNAPSHOT.pom| 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c470b758/test/java/org/apache/ivy/plugins/parser/m2/shale-tiger-1.1.0-SNAPSHOT.pom
--
diff --git 
a/test/java/org/apache/ivy/plugins/parser/m2/shale-tiger-1.1.0-SNAPSHOT.pom 
b/test/java/org/apache/ivy/plugins/parser/m2/shale-tiger-1.1.0-SNAPSHOT.pom
index 519ac8c..7455217 100644
--- a/test/java/org/apache/ivy/plugins/parser/m2/shale-tiger-1.1.0-SNAPSHOT.pom
+++ b/test/java/org/apache/ivy/plugins/parser/m2/shale-tiger-1.1.0-SNAPSHOT.pom
@@ -76,21 +76,21 @@
 
 
   
-
-
+
+
 
-  
+  
 
-
-
+
+
 
-
-
+
+
 
-  
+  
 
-
-
+
+

ant-ivy git commit: Sort contributors by surname, remove duplicate

2018-02-02 Thread gintas 
Repository: ant-ivy
Updated Branches:
  refs/heads/master 6f89144e4 -> f01d7a5b4


Sort contributors by surname, remove duplicate

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

Branch: refs/heads/master
Commit: f01d7a5b45917f697e8eb394f91a4ea18f31fb4d
Parents: 6f89144
Author: Gintas Grigelionis 
Authored: Sat Feb 3 07:00:25 2018 +0100
Committer: Gintas Grigelionis 
Committed: Sat Feb 3 07:00:25 2018 +0100

--
 asciidoc/release-notes.adoc | 11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/f01d7a5b/asciidoc/release-notes.adoc
--
diff --git a/asciidoc/release-notes.adoc b/asciidoc/release-notes.adoc
index 8a3ae8a..38ca44b 100644
--- a/asciidoc/release-notes.adoc
+++ b/asciidoc/release-notes.adoc
@@ -156,16 +156,15 @@ Here is the list of people who have contributed source 
code and documentation up
 * Mitch Gitman
 * Evgeny Goldin
 * Scott Goldstein
-* Pierre Hgnestrand
-* Scott Hebert
-* Tobias Himstedt
+* Stephen Haberman
 * Aaron Hachez
 * Ben Hale
-* Stephen Haberman
 * Peter Hayes
 * Scott Hebert
 * Payam Hekmat
+* Tobias Himstedt
 * Achim Huegen
+* Pierre Hgnestrand
 * Ilya
 * Matt Inger
 * Anders Jacobsson
@@ -180,8 +179,8 @@ Here is the list of people who have contributed source code 
and documentation up
 * Heschi Kreinick
 * Sebastian Krueger
 * Thomas Kurpick
-* Tat Leung
 * Costin Leau
+* Tat Leung
 * Antoine Levy-Lambert
 * Tony Likhite
 * Andrey Lomakin
@@ -239,6 +238,7 @@ Here is the list of people who have contributed source code 
and documentation up
 * Willem Verstraeten
 * Richard Vowles
 * Sven Walter
+* Zhong Wang
 * James P. White
 * Tom Widmer
 * John Williams
@@ -247,4 +247,3 @@ Here is the list of people who have contributed source code 
and documentation up
 * Jaroslaw Wypychowski
 * Sven Zethelius
 * Aleksey Zhukov
-* Zhong Wang

ant-ivy git commit: Update release notes

2018-02-02 Thread gintas 
Repository: ant-ivy
Updated Branches:
  refs/heads/master 7ebc8107a -> 6f89144e4


Update release notes

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

Branch: refs/heads/master
Commit: 6f89144e4b66af0f5cde77db7f5fbf71811c34e2
Parents: 7ebc810
Author: Gintas Grigelionis 
Authored: Fri Feb 2 23:50:29 2018 +0100
Committer: Gintas Grigelionis 
Committed: Fri Feb 2 23:50:29 2018 +0100

--
 asciidoc/release-notes.adoc | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6f89144e/asciidoc/release-notes.adoc
--
diff --git a/asciidoc/release-notes.adoc b/asciidoc/release-notes.adoc
index db7b6fc..8a3ae8a 100644
--- a/asciidoc/release-notes.adoc
+++ b/asciidoc/release-notes.adoc
@@ -70,7 +70,10 @@ For details about the following changes, check our JIRA 
install at link:https://
 - FIX: command line: -types seems to not accept comma [jira:IVY-1355[]]
 - FIX: Mixed use of symlinks leads to cache corruption [jira:IVY-1498[]] 
(Thanks to Stephen Haberman)
 - FIX: Some cached location are badly stored which results in 
MalformedURLException [jira:IVY-1566[]] (Thanks to Aurlien Pupier)
-- FIX: defaultconfmapping not used when extended/inherited from parent file 
[jira:IVY-1420[]] [jira:IVY-1420[]] (Thanks to Willem Verstraeten)
+- FIX: defaultconf/mapping attributes ignored when extended/included from 
parent file [jira:IVY-1315[]] [jira:IVY-1419[]] [jira:IVY-1420[]] 
[jira:IVY-1437[]] (Thanks to Willem Verstraeten)
+- 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[]]
 
 - 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)

[jira] [Commented] (IVY-1483) Ant fails when invoked from Ivy

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

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

ASF GitHub Bot commented on IVY-1483:
-

GitHub user twogee opened a pull request:

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

IVY-1483 Invoke Ant through Ivy;

like this: `java -jar ivy.jar -properties version.properties -main 
org.apache.tools.ant.Main`

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/twogee/ant-ivy ivy-1483

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/ant-ivy/pull/67.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #67


commit 46ee20b19721362a4b1b43f413d1d6d1967df5a4
Author: twogee 
Date:   2018-02-02T22:37:11Z

IVY-1483 Invoke Ant through Ivy;
like this: java -jar ivy.jar -properties version.properties -main 
org.apache.tools.ant.Main




> Ant fails when invoked from Ivy
> ---
>
> Key: IVY-1483
> URL: https://issues.apache.org/jira/browse/IVY-1483
> Project: Ivy
>  Issue Type: Bug
>  Components: Core
>Affects Versions: 2.3.0, 2.4.0
>Reporter: Stephan Feder
>Assignee: Gintas Grigelionis
>Priority: Major
>
> I unpacked apache-ivy-2.3.0-bin.zip in /tmp, changed directory to 
> /tmp/apache-ivy-2.3.0 and invoked Ant via Ivy (3 different ways, none 
> working, all failing the same way):
> {noformat}
> # java -jar ivy-2.3.0.jar -main org.apache.tools.ant.Main 
> :: loading settings :: url = 
> jar:file:/tmp/apache-ivy-2.3.0/ivy-2.3.0.jar!/org/apache/ivy/core/settings/ivysettings.xml
> :: resolving dependencies :: org.apache.ivy#ivy;2.3.0
> confs: [core, httpclient, oro, vfs, sftp, standalone, ant, default, 
> test, source]
> found commons-httpclient#commons-httpclient;3.0 in public
> found commons-logging#commons-logging;1.0.3 in public
> found commons-codec#commons-codec;1.2 in public
> found oro#oro;2.0.8 in public
> found commons-vfs#commons-vfs;1.0 in public
> found commons-logging#commons-logging;1.0.4 in public
> found com.jcraft#jsch;0.1.31 in default
> found org.apache.ant#ant;1.7.1 in public
> found org.apache.ant#ant-launcher;1.7.1 in public
> found org.apache.ant#ant-nodeps;1.7.1 in public
> found org.apache.ant#ant-trax;1.7.1 in public
> found org.bouncycastle#bcpg-jdk14;1.45 in public
> found org.bouncycastle#bcprov-jdk14;1.45 in public
> found junit#junit;3.8.2 in public
> found commons-lang#commons-lang;2.6 in public
> found org.apache.ant#ant-testutil;1.7.0 in public
> found ant#ant-launcher;1.6.2 in public
> found ant-contrib#ant-contrib;1.0b3 in public
> found xerces#xercesImpl;2.6.2 in public
> found xerces#xmlParserAPIs;2.6.2 in public
> :: resolution report :: resolve 2025ms :: artifacts dl 97ms
> :: evicted modules:
> commons-logging#commons-logging;1.0.3 by 
> [commons-logging#commons-logging;1.0.4] in [default]
> -
> |  |modules||   artifacts   |
> |   conf   | number| search|dwnlded|evicted|| number|dwnlded|
> -
> |   core   |   0   |   0   |   0   |   0   ||   0   |   0   |
> |httpclient|   3   |   0   |   0   |   0   ||   3   |   0   |
> |oro   |   1   |   0   |   0   |   0   ||   1   |   0   |
> |vfs   |   2   |   0   |   0   |   0   ||   2   |   0   |
> |   sftp   |   1   |   0   |   0   |   0   ||   1   |   0   |
> |standalone|   0   |   0   |   0   |   0   ||   0   |   0   |
> |ant   |   2   |   0   |   0   |   0   ||   2   |   0   |
> |  default |   13  |   0   |   0   |   1   ||   12  |   0   |
> |   test   |   7   |   0   |   0   |   0   ||   7   |   0   |
> |  source  |   0   |   0   |   0   |   0   ||   0   |   0   |
> -
> Buildfile: build.xml
> init-ivy:
> BUILD FAILED
> /tmp/apache-ivy-2.3.0/build.xml:24: The following error occurred while 
> executing this line:
> jar:file:/tmp/apache-ivy-2.3.0/ivy-2.3.0.jar!/org/apache/ivy/ant/antlib.xml:21:
>  typedef A class needed by class org.apache.ivy.ant.IvyAntSettings cannot be 
> found: org/apache/tools/ant/types/DataType
> Total time: 0 seconds
> {noformat}
> {noformat}
> # java -jar ivy-2.3.0.jar

[jira] [Work started] (IVY-1483) Ant fails when invoked from Ivy

2018-02-02 Thread Gintas Grigelionis (JIRA) 

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

Work on IVY-1483 started by Gintas Grigelionis.
---
> Ant fails when invoked from Ivy
> ---
>
> Key: IVY-1483
> URL: https://issues.apache.org/jira/browse/IVY-1483
> Project: Ivy
>  Issue Type: Bug
>  Components: Core
>Affects Versions: 2.3.0, 2.4.0
>Reporter: Stephan Feder
>Assignee: Gintas Grigelionis
>Priority: Major
>
> I unpacked apache-ivy-2.3.0-bin.zip in /tmp, changed directory to 
> /tmp/apache-ivy-2.3.0 and invoked Ant via Ivy (3 different ways, none 
> working, all failing the same way):
> {noformat}
> # java -jar ivy-2.3.0.jar -main org.apache.tools.ant.Main 
> :: loading settings :: url = 
> jar:file:/tmp/apache-ivy-2.3.0/ivy-2.3.0.jar!/org/apache/ivy/core/settings/ivysettings.xml
> :: resolving dependencies :: org.apache.ivy#ivy;2.3.0
> confs: [core, httpclient, oro, vfs, sftp, standalone, ant, default, 
> test, source]
> found commons-httpclient#commons-httpclient;3.0 in public
> found commons-logging#commons-logging;1.0.3 in public
> found commons-codec#commons-codec;1.2 in public
> found oro#oro;2.0.8 in public
> found commons-vfs#commons-vfs;1.0 in public
> found commons-logging#commons-logging;1.0.4 in public
> found com.jcraft#jsch;0.1.31 in default
> found org.apache.ant#ant;1.7.1 in public
> found org.apache.ant#ant-launcher;1.7.1 in public
> found org.apache.ant#ant-nodeps;1.7.1 in public
> found org.apache.ant#ant-trax;1.7.1 in public
> found org.bouncycastle#bcpg-jdk14;1.45 in public
> found org.bouncycastle#bcprov-jdk14;1.45 in public
> found junit#junit;3.8.2 in public
> found commons-lang#commons-lang;2.6 in public
> found org.apache.ant#ant-testutil;1.7.0 in public
> found ant#ant-launcher;1.6.2 in public
> found ant-contrib#ant-contrib;1.0b3 in public
> found xerces#xercesImpl;2.6.2 in public
> found xerces#xmlParserAPIs;2.6.2 in public
> :: resolution report :: resolve 2025ms :: artifacts dl 97ms
> :: evicted modules:
> commons-logging#commons-logging;1.0.3 by 
> [commons-logging#commons-logging;1.0.4] in [default]
> -
> |  |modules||   artifacts   |
> |   conf   | number| search|dwnlded|evicted|| number|dwnlded|
> -
> |   core   |   0   |   0   |   0   |   0   ||   0   |   0   |
> |httpclient|   3   |   0   |   0   |   0   ||   3   |   0   |
> |oro   |   1   |   0   |   0   |   0   ||   1   |   0   |
> |vfs   |   2   |   0   |   0   |   0   ||   2   |   0   |
> |   sftp   |   1   |   0   |   0   |   0   ||   1   |   0   |
> |standalone|   0   |   0   |   0   |   0   ||   0   |   0   |
> |ant   |   2   |   0   |   0   |   0   ||   2   |   0   |
> |  default |   13  |   0   |   0   |   1   ||   12  |   0   |
> |   test   |   7   |   0   |   0   |   0   ||   7   |   0   |
> |  source  |   0   |   0   |   0   |   0   ||   0   |   0   |
> -
> Buildfile: build.xml
> init-ivy:
> BUILD FAILED
> /tmp/apache-ivy-2.3.0/build.xml:24: The following error occurred while 
> executing this line:
> jar:file:/tmp/apache-ivy-2.3.0/ivy-2.3.0.jar!/org/apache/ivy/ant/antlib.xml:21:
>  typedef A class needed by class org.apache.ivy.ant.IvyAntSettings cannot be 
> found: org/apache/tools/ant/types/DataType
> Total time: 0 seconds
> {noformat}
> {noformat}
> # java -jar ivy-2.3.0.jar -dependency org.apache.ant ant 1.7.1 -main 
> org.apache.tools.ant.Main
> :: loading settings :: url = 
> jar:file:/tmp/apache-ivy-2.3.0/ivy-2.3.0.jar!/org/apache/ivy/core/settings/ivysettings.xml
> :: resolving dependencies :: org.apache.ant#ant-caller;working
> confs: [default]
> found org.apache.ant#ant;1.7.1 in public
> found org.apache.ant#ant-launcher;1.7.1 in public
> found xerces#xercesImpl;2.9.0 in public
> found xml-apis#xml-apis;1.3.04 in public
> :: resolution report :: resolve 733ms :: artifacts dl 34ms
> -
> |  |modules||   artifacts   |
> |   conf   | number| search|dwnlded|evicted|| number|dwnlded|
> -
> |

[jira] [Comment Edited] (IVY-1483) Ant fails when invoked from Ivy

2018-02-02 Thread Gintas Grigelionis (JIRA) 

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

Gintas Grigelionis edited comment on IVY-1483 at 2/2/18 10:31 PM:
--

I can reproduce the bug with Java 8 and 9 on master. BTW, resolving current 
ivy.xml requires a new option for properties file. Also, ivy.xml must have 
ant-junit as a dependency, since test dependencies are not transitive.


was (Author: twogee):
I cannot reproduce the bug with Java 8. BTW, resolving current ivy.xml requires 
a new option for properties file.

> Ant fails when invoked from Ivy
> ---
>
> Key: IVY-1483
> URL: https://issues.apache.org/jira/browse/IVY-1483
> Project: Ivy
>  Issue Type: Bug
>  Components: Core
>Affects Versions: 2.3.0, 2.4.0
>Reporter: Stephan Feder
>Assignee: Gintas Grigelionis
>Priority: Major
>
> I unpacked apache-ivy-2.3.0-bin.zip in /tmp, changed directory to 
> /tmp/apache-ivy-2.3.0 and invoked Ant via Ivy (3 different ways, none 
> working, all failing the same way):
> {noformat}
> # java -jar ivy-2.3.0.jar -main org.apache.tools.ant.Main 
> :: loading settings :: url = 
> jar:file:/tmp/apache-ivy-2.3.0/ivy-2.3.0.jar!/org/apache/ivy/core/settings/ivysettings.xml
> :: resolving dependencies :: org.apache.ivy#ivy;2.3.0
> confs: [core, httpclient, oro, vfs, sftp, standalone, ant, default, 
> test, source]
> found commons-httpclient#commons-httpclient;3.0 in public
> found commons-logging#commons-logging;1.0.3 in public
> found commons-codec#commons-codec;1.2 in public
> found oro#oro;2.0.8 in public
> found commons-vfs#commons-vfs;1.0 in public
> found commons-logging#commons-logging;1.0.4 in public
> found com.jcraft#jsch;0.1.31 in default
> found org.apache.ant#ant;1.7.1 in public
> found org.apache.ant#ant-launcher;1.7.1 in public
> found org.apache.ant#ant-nodeps;1.7.1 in public
> found org.apache.ant#ant-trax;1.7.1 in public
> found org.bouncycastle#bcpg-jdk14;1.45 in public
> found org.bouncycastle#bcprov-jdk14;1.45 in public
> found junit#junit;3.8.2 in public
> found commons-lang#commons-lang;2.6 in public
> found org.apache.ant#ant-testutil;1.7.0 in public
> found ant#ant-launcher;1.6.2 in public
> found ant-contrib#ant-contrib;1.0b3 in public
> found xerces#xercesImpl;2.6.2 in public
> found xerces#xmlParserAPIs;2.6.2 in public
> :: resolution report :: resolve 2025ms :: artifacts dl 97ms
> :: evicted modules:
> commons-logging#commons-logging;1.0.3 by 
> [commons-logging#commons-logging;1.0.4] in [default]
> -
> |  |modules||   artifacts   |
> |   conf   | number| search|dwnlded|evicted|| number|dwnlded|
> -
> |   core   |   0   |   0   |   0   |   0   ||   0   |   0   |
> |httpclient|   3   |   0   |   0   |   0   ||   3   |   0   |
> |oro   |   1   |   0   |   0   |   0   ||   1   |   0   |
> |vfs   |   2   |   0   |   0   |   0   ||   2   |   0   |
> |   sftp   |   1   |   0   |   0   |   0   ||   1   |   0   |
> |standalone|   0   |   0   |   0   |   0   ||   0   |   0   |
> |ant   |   2   |   0   |   0   |   0   ||   2   |   0   |
> |  default |   13  |   0   |   0   |   1   ||   12  |   0   |
> |   test   |   7   |   0   |   0   |   0   ||   7   |   0   |
> |  source  |   0   |   0   |   0   |   0   ||   0   |   0   |
> -
> Buildfile: build.xml
> init-ivy:
> BUILD FAILED
> /tmp/apache-ivy-2.3.0/build.xml:24: The following error occurred while 
> executing this line:
> jar:file:/tmp/apache-ivy-2.3.0/ivy-2.3.0.jar!/org/apache/ivy/ant/antlib.xml:21:
>  typedef A class needed by class org.apache.ivy.ant.IvyAntSettings cannot be 
> found: org/apache/tools/ant/types/DataType
> Total time: 0 seconds
> {noformat}
> {noformat}
> # java -jar ivy-2.3.0.jar -dependency org.apache.ant ant 1.7.1 -main 
> org.apache.tools.ant.Main
> :: loading settings :: url = 
> jar:file:/tmp/apache-ivy-2.3.0/ivy-2.3.0.jar!/org/apache/ivy/core/settings/ivysettings.xml
> :: resolving dependencies :: org.apache.ant#ant-caller;working
> confs: [default]
> found org.apache.ant#ant;1.7.1 in public
> found org.apache.ant#ant-launcher;1.7.1 in public
> found xerces#xercesImpl;2.9.0 in public
> found

[jira] [Assigned] (IVY-1483) Ant fails when invoked from Ivy

2018-02-02 Thread Gintas Grigelionis (JIRA) 

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

Gintas Grigelionis reassigned IVY-1483:
---

Assignee: Gintas Grigelionis

> Ant fails when invoked from Ivy
> ---
>
> Key: IVY-1483
> URL: https://issues.apache.org/jira/browse/IVY-1483
> Project: Ivy
>  Issue Type: Bug
>  Components: Core
>Affects Versions: 2.3.0, 2.4.0
>Reporter: Stephan Feder
>Assignee: Gintas Grigelionis
>Priority: Major
>
> I unpacked apache-ivy-2.3.0-bin.zip in /tmp, changed directory to 
> /tmp/apache-ivy-2.3.0 and invoked Ant via Ivy (3 different ways, none 
> working, all failing the same way):
> {noformat}
> # java -jar ivy-2.3.0.jar -main org.apache.tools.ant.Main 
> :: loading settings :: url = 
> jar:file:/tmp/apache-ivy-2.3.0/ivy-2.3.0.jar!/org/apache/ivy/core/settings/ivysettings.xml
> :: resolving dependencies :: org.apache.ivy#ivy;2.3.0
> confs: [core, httpclient, oro, vfs, sftp, standalone, ant, default, 
> test, source]
> found commons-httpclient#commons-httpclient;3.0 in public
> found commons-logging#commons-logging;1.0.3 in public
> found commons-codec#commons-codec;1.2 in public
> found oro#oro;2.0.8 in public
> found commons-vfs#commons-vfs;1.0 in public
> found commons-logging#commons-logging;1.0.4 in public
> found com.jcraft#jsch;0.1.31 in default
> found org.apache.ant#ant;1.7.1 in public
> found org.apache.ant#ant-launcher;1.7.1 in public
> found org.apache.ant#ant-nodeps;1.7.1 in public
> found org.apache.ant#ant-trax;1.7.1 in public
> found org.bouncycastle#bcpg-jdk14;1.45 in public
> found org.bouncycastle#bcprov-jdk14;1.45 in public
> found junit#junit;3.8.2 in public
> found commons-lang#commons-lang;2.6 in public
> found org.apache.ant#ant-testutil;1.7.0 in public
> found ant#ant-launcher;1.6.2 in public
> found ant-contrib#ant-contrib;1.0b3 in public
> found xerces#xercesImpl;2.6.2 in public
> found xerces#xmlParserAPIs;2.6.2 in public
> :: resolution report :: resolve 2025ms :: artifacts dl 97ms
> :: evicted modules:
> commons-logging#commons-logging;1.0.3 by 
> [commons-logging#commons-logging;1.0.4] in [default]
> -
> |  |modules||   artifacts   |
> |   conf   | number| search|dwnlded|evicted|| number|dwnlded|
> -
> |   core   |   0   |   0   |   0   |   0   ||   0   |   0   |
> |httpclient|   3   |   0   |   0   |   0   ||   3   |   0   |
> |oro   |   1   |   0   |   0   |   0   ||   1   |   0   |
> |vfs   |   2   |   0   |   0   |   0   ||   2   |   0   |
> |   sftp   |   1   |   0   |   0   |   0   ||   1   |   0   |
> |standalone|   0   |   0   |   0   |   0   ||   0   |   0   |
> |ant   |   2   |   0   |   0   |   0   ||   2   |   0   |
> |  default |   13  |   0   |   0   |   1   ||   12  |   0   |
> |   test   |   7   |   0   |   0   |   0   ||   7   |   0   |
> |  source  |   0   |   0   |   0   |   0   ||   0   |   0   |
> -
> Buildfile: build.xml
> init-ivy:
> BUILD FAILED
> /tmp/apache-ivy-2.3.0/build.xml:24: The following error occurred while 
> executing this line:
> jar:file:/tmp/apache-ivy-2.3.0/ivy-2.3.0.jar!/org/apache/ivy/ant/antlib.xml:21:
>  typedef A class needed by class org.apache.ivy.ant.IvyAntSettings cannot be 
> found: org/apache/tools/ant/types/DataType
> Total time: 0 seconds
> {noformat}
> {noformat}
> # java -jar ivy-2.3.0.jar -dependency org.apache.ant ant 1.7.1 -main 
> org.apache.tools.ant.Main
> :: loading settings :: url = 
> jar:file:/tmp/apache-ivy-2.3.0/ivy-2.3.0.jar!/org/apache/ivy/core/settings/ivysettings.xml
> :: resolving dependencies :: org.apache.ant#ant-caller;working
> confs: [default]
> found org.apache.ant#ant;1.7.1 in public
> found org.apache.ant#ant-launcher;1.7.1 in public
> found xerces#xercesImpl;2.9.0 in public
> found xml-apis#xml-apis;1.3.04 in public
> :: resolution report :: resolve 733ms :: artifacts dl 34ms
> -
> |  |modules||   artifacts   |
> |   conf   | number| search|dwnlded|evicted|| number|dwnlded|
> -
>

[jira] [Updated] (IVY-1571) resolve loops and throws StackOverflowError

2018-02-02 Thread Gintas Grigelionis (JIRA) 

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

Gintas Grigelionis updated IVY-1571:

Description: 
Hi,

We have 40+ modules, for some of modules, while resolving the "commons-io" and 
"httpclient" dependencies, it loops and throws StackOverflowError

Can you please help with this.

  was:
Hi,

We have 40+ modules, for some of modules, while resolving the "commons-io" and 
"httpclient" dependencies, it getting to loop and giving "StachoverflowError"

Can you please help with this.


> resolve loops and throws StackOverflowError
> ---
>
> Key: IVY-1571
> URL: https://issues.apache.org/jira/browse/IVY-1571
> Project: Ivy
>  Issue Type: Bug
>Reporter: Naresh
>Priority: Major
>
> Hi,
> We have 40+ modules, for some of modules, while resolving the "commons-io" 
> and "httpclient" dependencies, it loops and throws StackOverflowError
> Can you please help with this.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

[jira] [Updated] (IVY-1571) resolve loops and throws StackOverflowError

2018-02-02 Thread Gintas Grigelionis (JIRA) 

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

Gintas Grigelionis updated IVY-1571:

Summary: resolve loops and throws StackOverflowError  (was: While resolve 
dependency it gettign to loop and giving stackoverflow error)

> resolve loops and throws StackOverflowError
> ---
>
> Key: IVY-1571
> URL: https://issues.apache.org/jira/browse/IVY-1571
> Project: Ivy
>  Issue Type: Bug
>Reporter: Naresh
>Priority: Major
>
> Hi,
> We have 40+ modules, for some of modules, while resolving the "commons-io" 
> and "httpclient" dependencies, it getting to loop and giving 
> "StachoverflowError"
> Can you please help with this.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

[jira] [Commented] (IVY-309) Use an abstraction of configurations

2018-02-02 Thread Gintas Grigelionis (JIRA) 

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

Gintas Grigelionis commented on IVY-309:


It's down to 3 splits and 1 join now :)

> Use an abstraction of configurations
> 
>
> Key: IVY-309
> URL: https://issues.apache.org/jira/browse/IVY-309
> Project: Ivy
>  Issue Type: Improvement
>  Components: Core
>Affects Versions: 1.4-RC1
>Reporter: Stephane Bailliez
>Assignee: Gintas Grigelionis
>Priority: Minor
>
> The code is full of split, join, trim, "*" each time you deal with 
> configuration input.
> Would be nice to abstract that into a single class that takes care of all 
> that.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

[jira] [Work started] (IVY-309) Use an abstraction of configurations

2018-02-02 Thread Gintas Grigelionis (JIRA) 

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

Work on IVY-309 started by Gintas Grigelionis.
--
> Use an abstraction of configurations
> 
>
> Key: IVY-309
> URL: https://issues.apache.org/jira/browse/IVY-309
> Project: Ivy
>  Issue Type: Improvement
>  Components: Core
>Affects Versions: 1.4-RC1
>Reporter: Stephane Bailliez
>Assignee: Gintas Grigelionis
>Priority: Minor
>
> The code is full of split, join, trim, "*" each time you deal with 
> configuration input.
> Would be nice to abstract that into a single class that takes care of all 
> that.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

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

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

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

ASF GitHub Bot commented on IVY-1545:
-

Github user twogee commented on the issue:

https://github.com/apache/ant-ivy/pull/66
  
@javabrett - could you please rebase your branch and force push?


> 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] [Updated] (IVY-1407) Classifiers not working with embedded ivy:resolve dependencies

2018-02-02 Thread Gintas Grigelionis (JIRA) 

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

Gintas Grigelionis updated IVY-1407:

Description: 
I noticed that when using the new  child elements that were 
introduced in 2.3, classifier resolution no longer works. This is unfortunate 
because having dependencies in the ant build.xml allowed for ant property 
references to be used in the dependency declarations, which is really useful.

For example:

build.xml:
{code}

  

  

{code}
ivysettings.xml:
{code}

  
  
http://nexus.local:8082/nexus/content/groups/all;
  
pattern="[organisation]/[module]/[revision]/[artifact]-[revision](-[m:classifier]).[ext]">

  

{code}
What winds up happening is that the *binary* jar is getting downloaded and 
placed in the sources directory, instead of the source jar. It essentially 
seems like the classifier parameter is not passed along to the resolver.


  was:
I noticed that when using the new  child elements that were 
introduced in 2.3, classifier resolution no longer works. This is unfortunate 
because having dependencies in the ant build.xml allowed for ant property 
references to be used in the dependency declarations, which is really useful.

For example:

build.xml:


  

  


ivysettings.xml:


  
  
http://nexus.local:8082/nexus/content/groups/all;
  
pattern="[organisation]/[module]/[revision]/[artifact]-[revision](-[m:classifier]).[ext]">

  


What winds up happening is that the *binary* jar is getting downloaded and 
placed in the sources directory, instead of the source jar. It essentially 
seems like the classifier parameter is not passed along to the resolver.



> Classifiers not working with embedded ivy:resolve dependencies
> --
>
> Key: IVY-1407
> URL: https://issues.apache.org/jira/browse/IVY-1407
> Project: Ivy
>  Issue Type: Bug
>Affects Versions: 2.3.0
>Reporter: Edwin Park
>Priority: Major
>
> I noticed that when using the new  child elements that were 
> introduced in 2.3, classifier resolution no longer works. This is unfortunate 
> because having dependencies in the ant build.xml allowed for ant property 
> references to be used in the dependency declarations, which is really useful.
> For example:
> build.xml:
> {code}
> 
>   
> 
>   
> 
> {code}
> ivysettings.xml:
> {code}
> 
>   
>   
>root="http://nexus.local:8082/nexus/content/groups/all;
>   
> pattern="[organisation]/[module]/[revision]/[artifact]-[revision](-[m:classifier]).[ext]">
> 
>   
> 
> {code}
> What winds up happening is that the *binary* jar is getting downloaded and 
> placed in the sources directory, instead of the source jar. It essentially 
> seems like the classifier parameter is not passed along to the resolver.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

[jira] [Resolved] (IVY-1442) ApacheURLLister does not properly handle links with URL encoding

2018-02-02 Thread Gintas Grigelionis (JIRA) 

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

Gintas Grigelionis resolved IVY-1442.
-
   Resolution: Duplicate
Fix Version/s: master

> ApacheURLLister does not properly handle links with URL encoding
> 
>
> Key: IVY-1442
> URL: https://issues.apache.org/jira/browse/IVY-1442
> Project: Ivy
>  Issue Type: Bug
>  Components: Core
>Affects Versions: 2.2.0
> Environment: Ant 1.8.0, Java 6
>Reporter: Daniel Holmes
>Assignee: Gintas Grigelionis
>Priority: Major
> Fix For: master
>
>
> This element of the listing
> {code}
> } else {
> // text is not truncated, so it must match the url after 
> stripping optional
> // trailing slashes
> String strippedHref = href.endsWith("/") ? href.substring(0, 
> href.length() - 1) : href;
> String strippedText = text.endsWith("/") ? text.substring(0, 
> text.length() - 1) : text;
> if (!strippedHref.equalsIgnoreCase(strippedText)) {
> continue;
> }
> }
> {code}
> checks that the href text matches the displayed text of the link.  
> When we altered our version strings to use Debian package syntax, our version 
> numbers now include the of a colon ":".  So, when this logic now is looking 
> for links on the module page, the link for the subdirectory of the version is 
> no longer being returned by this class because this equality check is now 
> failing.  We are using Jenkins build artifact pages and an Ivy URL resolver 
> to locate these modules/versions and the issue is that due to the colon, the 
> href value is URLEncoded and the text shows it plain.  This now falls to the 
> continue in the above code and we don't get the version URL in the list this 
> class is supposed to return.
> Example  tag that should work and no longer is now that our versions 
> include the ":".  (%3A is URLEncode of : )
> 1:2013.09.J821



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

[jira] [Assigned] (IVY-1442) ApacheURLLister does not properly handle links with URL encoding

2018-02-02 Thread Gintas Grigelionis (JIRA) 

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

Gintas Grigelionis reassigned IVY-1442:
---

Assignee: Gintas Grigelionis

> ApacheURLLister does not properly handle links with URL encoding
> 
>
> Key: IVY-1442
> URL: https://issues.apache.org/jira/browse/IVY-1442
> Project: Ivy
>  Issue Type: Bug
>  Components: Core
>Affects Versions: 2.2.0
> Environment: Ant 1.8.0, Java 6
>Reporter: Daniel Holmes
>Assignee: Gintas Grigelionis
>Priority: Major
>
> This element of the listing
> {code}
> } else {
> // text is not truncated, so it must match the url after 
> stripping optional
> // trailing slashes
> String strippedHref = href.endsWith("/") ? href.substring(0, 
> href.length() - 1) : href;
> String strippedText = text.endsWith("/") ? text.substring(0, 
> text.length() - 1) : text;
> if (!strippedHref.equalsIgnoreCase(strippedText)) {
> continue;
> }
> }
> {code}
> checks that the href text matches the displayed text of the link.  
> When we altered our version strings to use Debian package syntax, our version 
> numbers now include the of a colon ":".  So, when this logic now is looking 
> for links on the module page, the link for the subdirectory of the version is 
> no longer being returned by this class because this equality check is now 
> failing.  We are using Jenkins build artifact pages and an Ivy URL resolver 
> to locate these modules/versions and the issue is that due to the colon, the 
> href value is URLEncoded and the text shows it plain.  This now falls to the 
> continue in the above code and we don't get the version URL in the list this 
> class is supposed to return.
> Example  tag that should work and no longer is now that our versions 
> include the ":".  (%3A is URLEncode of : )
> 1:2013.09.J821



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

[jira] [Commented] (IVY-1459) include in dependency doesn't work as expected with extra attributes

2018-02-02 Thread Gintas Grigelionis (JIRA) 

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

Gintas Grigelionis commented on IVY-1459:
-

Hi Olivier, could you please try a [build from 
master|https://teamcity.jetbrains.com/viewLog.html?=bt125=lastSuccessful]
 (sorry, Apache Jenkins builds sometimes fail for reasons not related to coding 
issues)? The attributes on include were silently ignored before.

> include in dependency doesn't work as expected with extra attributes
> 
>
> Key: IVY-1459
> URL: https://issues.apache.org/jira/browse/IVY-1459
> Project: Ivy
>  Issue Type: Bug
>  Components: Core
>Affects Versions: 2.3.0
> Environment: GNU/Linux, Ivy 2.3.0, Ant 1.9.2, Java 6 SUN
>Reporter: Olivier Patry
>Priority: Major
>  Labels: dependency, include
>
> Hi,
> I try to combine  tag in dependency and extra attributes which 
> seems not allowed according to the documentation (since it is not mentioned 
> that  allows extra attributes).
> Why not allowed?
> Can it be allowed?
> Moreover, the actual behavior seems buggy since several artifacts can be 
> resolved with the same regexp but only one is used and no error occurs.
> I currently use  in combination with the  
> tag, so that I can resolve artifacts from regexp restricted to a given set of 
> configurations. If I keep only conf mapping, let's say I get 36 artifacts, 
> then if I had a , I get only 12 of them (should be the 
> same result since the include rule doesn't expose any restriction). This is 
> related to the first issue where no error occurs for several artifacts 
> matches.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

[jira] [Updated] (IVY-1484) Incorrect retrieve for repository module which depends on a default and classifier artifact of another module

2018-02-02 Thread Gintas Grigelionis (JIRA) 

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

Gintas Grigelionis updated IVY-1484:

Description: 
Problem seen when retrieving gwt-user;2.5.1 from maven central

The POM for that module contains
{code:xml}

  
javax.validation
validation-api
1.0.0.GA
  
  
javax.validation
validation-api
1.0.0.GA
sources
  

{code}

The ivy.xml that gets derived from this an used in the cache contains
{code:xml}

  
  

  

{code}
But when I retrieve for my module which depends on gwt-user, I only get the 
-sources.jar for this transitive dependencies retrieved. According to the 
ivy:report, this dependency looks like
{code:xml}

  



  
http://black-velvet.gdl.englab.netapp.com:8081/nexus/content/repositories/Unofficial/javax/validation/validation-api/1.0.0.GA/validation-api-1.0.0.GA-sources.jar"/>
  

  

{code}
What appears to have occurred is that the binary artifact which is implicitly 
specified by the first dependency in the derived ivy.xml file is 'lost' when 
the source specific artifact is added by the second dependency. Since there is 
now an actual list of artifacts for the module, that set (now only the sources 
one) is the only one retrieved.

I'm thinking there are probably a couple possible solutions. One could be to 
explicitly add the artifacts to the derived ivy.xml files. Another could be to 
add the binary artifact explicitly during the resolve process in the case where 
the implicit specification would be lost because additional artifacts are 
selected.

As a test, I modified the ivy.xml in my cache to the following and I did get 
both artifacts retrieved.
{code:xml}

  


  

{code}
I believe that I can work around this from my module that specifies gwt-user by 
explicitly including these transitive artifacts for the time being.

  was:
Problem seen when retrieving gwt-user;2.5.1 from maven central

The POM for that module contains


javax.validationvalidation-api1.0.0.GA
javax.validationvalidation-api1.0.0.GAsources


The ivy.xml that gets derived from this an used in the cache contains








But when I retrieve for my module which depends on gwt-user, I only get the 
-sources.jar for this transitive dependencies retrieved.  According to the 
ivy:report, this dependency looks like







http://black-velvet.gdl.englab.netapp.com:8081/nexus/content/repositories/Unofficial/javax/validation/validation-api/1.0.0.GA/validation-api-1.0.0.GA-sources.jar"/>





What appears to have occurred is that the binary artifact which is implicitly 
specified by the first dependency in the derived ivy.xml file is 'lost' when 
the source specific artifact is added by the second dependency.  Since there is 
now an actual list of artifacts for the module, that set (now only the sources 
one) is the only one retrieved.

I'm thinking there are probably a couple possible solutions.  One could be to 
explicitly add the artifacts to the derived ivy.xml files.  Another could be to 
add the binary artifact explicitly during the resolve process in the case where 
the implicit specification would be lost because additional artifacts are 
selected.

As a test, I modified the ivy.xml in my cache to the following and I did get 
both artifacts retrieved.








I believe that I can work around this from my module that specifies gwt-user by 
explicitly including these transitive artifacts for the time being. 


> Incorrect retrieve for repository module which depends on a default and 
> classifier artifact of another module
> -
>
> Key: IVY-1484
> URL: https://issues.apache.org/jira/browse/IVY-1484
> Project: Ivy
>  Issue Type: Bug
>  Components: Maven Compatibility
>Affects Versions: 2.2.0, 2.4.0-RC1
> Environment: Ant 1.9.2
>Reporter: Daniel Holmes
>Priority: Major
>  Labels: maven, repository
>
> Problem seen when retrieving gwt-user;2.5.1 from maven central
> The POM for that module contains
> {code:xml}
> 
>   
> javax.validation
> validation-api
> 1.0.0.GA
>   
>   
> javax.validation
> validation-api
> 1.0.0.GA
> sources
>   
> 
> {code}
> The ivy.xml that gets derived from this an used in the cache contains
> {code:xml}
> 
>force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
>force="true" conf="compile->compile(*),master(*);runtime->runtime(*)">
>  m:classifier="sources"/>
>   
> 
> {code}
> But when I retrieve for

[jira] [Updated] (IVY-1505) Ivy can not correctly resolve hbase-client pom

2018-02-02 Thread Gintas Grigelionis (JIRA) 

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

Gintas Grigelionis updated IVY-1505:

Description: 
Hi,

When I added hbase-client as a dependency like as:
{panel}
{code}
 
{code}
{panel}

Ivy does not correctly map some dependencies of hbase-client. hbase-common and 
hbase-annotation should be in compile scope. In Ivy resolve xml they look like:
{panel:title= 
~/.ivy2/cache/org.apache.hbase/hbase-client/ivy-0.98.8-hadoop2.xml}
{code}








{code}
{panel}
I think this a bug. Can you help me how can i fix it ?

  was:
Hi,

When I added hbase-client as a dependecy like as:
{panel}
 
{panel}

Ivy does not correctly map some dependencies of hbase-client. hbase-common and 
hbase-annotation should be in compile scope. In Ivy resolve xml they look like:
{panel:title= 
~/.ivy2/cache/org.apache.hbase/hbase-client/ivy-0.98.8-hadoop2.xml}








{panel}
I think this a bug. Can you help me how can i fix it ?


> Ivy can not correctly resolve hbase-client pom
> --
>
> Key: IVY-1505
> URL: https://issues.apache.org/jira/browse/IVY-1505
> Project: Ivy
>  Issue Type: Bug
>Affects Versions: 2.3.0
>Reporter: Talat UYARER
>Priority: Major
>
> Hi,
> When I added hbase-client as a dependency like as:
> {panel}
> {code}
>   conf="*->default">
> {code}
> {panel}
> Ivy does not correctly map some dependencies of hbase-client. hbase-common 
> and hbase-annotation should be in compile scope. In Ivy resolve xml they look 
> like:
> {panel:title= 
> ~/.ivy2/cache/org.apache.hbase/hbase-client/ivy-0.98.8-hadoop2.xml}
> {code}
>  rev="0.98.8-hadoop2" force="true" conf="test->runtime(*),master(*)"/>
>  rev="0.98.8-hadoop2" force="true" conf="test->runtime(*),master(*)">
>  m:classifier="tests"/>
> 
>  force="true" conf="test->runtime(*),master(*)"/>
>  force="true" conf="test->runtime(*),master(*)">
>  m:classifier="tests"/>
> 
> {code}
> {panel}
> I think this a bug. Can you help me how can i fix it ?



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

[jira] [Commented] (IVY-1571) While resolve dependency it gettign to loop and giving stackoverflow error

2018-02-02 Thread Gintas Grigelionis (JIRA) 

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

Gintas Grigelionis commented on IVY-1571:
-

Related to IVY-1545?

> While resolve dependency it gettign to loop and giving stackoverflow error
> --
>
> Key: IVY-1571
> URL: https://issues.apache.org/jira/browse/IVY-1571
> Project: Ivy
>  Issue Type: Bug
>Reporter: Naresh
>Priority: Major
>
> Hi,
> We have 40+ modules, for some of modules, while resolving the "commons-io" 
> and "httpclient" dependencies, it getting to loop and giving 
> "StachoverflowError"
> Can you please help with this.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

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

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

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

ASF GitHub Bot commented on IVY-1545:
-

GitHub user twogee opened a pull request:

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

IVY-1545 Detect circular dependencies in POMs



You can merge this pull request into a Git repository by running:

$ git pull https://github.com/javabrett/ant-ivy IVY-1545

Alternatively you can review and apply these changes as the patch at:

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

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #66


commit dee9aa6d043d184a521f6ed970b71cbb3cab0b02
Author: Brett Randall 
Date:   2016-03-25T09:55:15Z

Added logging to help diagnose a recursion StackOverflowError condition.

commit 335be3eb2c9d2b10786dff790fb78206d1e31523
Author: Brett Randall 
Date:   2016-03-26T08:15:25Z

Fixed two minor comment typos.

commit 65b9650cbc7a4b8b9faa560a50eafa826fcd6fae
Author: Brett Randall 
Date:   2016-03-26T02:12:20Z

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.




> 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 
>

ant-ivy git commit: IVY-1569 Avoid reflection warnings (or worse) in Java 9+

2018-02-02 Thread gintas 
Repository: ant-ivy
Updated Branches:
  refs/heads/master 1d3567f30 -> 7ebc8107a


IVY-1569 Avoid reflection warnings (or worse) in Java 9+

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

Branch: refs/heads/master
Commit: 7ebc8107a22038c06c0b0ff095f9f73d854e1422
Parents: 1d3567f
Author: Gintas Grigelionis 
Authored: Fri Feb 2 19:18:57 2018 +0100
Committer: Gintas Grigelionis 
Committed: Fri Feb 2 19:18:57 2018 +0100

--
 .../apache/ivy/util/url/IvyAuthenticator.java   | 61 ++--
 1 file changed, 44 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/7ebc8107/src/java/org/apache/ivy/util/url/IvyAuthenticator.java
--
diff --git a/src/java/org/apache/ivy/util/url/IvyAuthenticator.java 
b/src/java/org/apache/ivy/util/url/IvyAuthenticator.java
index 0b0ce6b..c29d694 100644
--- a/src/java/org/apache/ivy/util/url/IvyAuthenticator.java
+++ b/src/java/org/apache/ivy/util/url/IvyAuthenticator.java
@@ -18,6 +18,7 @@
 package org.apache.ivy.util.url;
 
 import java.lang.reflect.Field;
+import java.lang.reflect.Method;
 import java.net.Authenticator;
 import java.net.PasswordAuthentication;
 
@@ -50,26 +51,20 @@ public final class IvyAuthenticator extends Authenticator {
 // We will try to use the original authenticator as backup 
authenticator.
 // Since there is no getter available, so try to use some reflection to
 // obtain it. If that doesn't work, assume there is no original 
authenticator
-Authenticator original = null;
+Authenticator original = (getJavaVersion() < 9) ? getTheAuthenticator()
+: getDefaultAuthenticator();
 
-try {
-Field f = Authenticator.class.getDeclaredField("theAuthenticator");
-f.setAccessible(true);
-original = (Authenticator) f.get(null);
-} catch (Throwable t) {
-Message.debug("Error occurred while getting the original 
authenticator: "
-+ t.getMessage());
+if (original instanceof IvyAuthenticator) {
+return;
 }
 
-if (!(original instanceof IvyAuthenticator)) {
-try {
-Authenticator.setDefault(new IvyAuthenticator(original));
-} catch (SecurityException e) {
-if (!securityWarningLogged) {
-securityWarningLogged = true;
-Message.warn("Not enough permissions to set the 
IvyAuthenticator. "
-+ "HTTP(S) authentication will be disabled!");
-}
+try {
+Authenticator.setDefault(new IvyAuthenticator(original));
+} catch (SecurityException e) {
+if (!securityWarningLogged) {
+securityWarningLogged = true;
+Message.warn("Not enough permissions to set the 
IvyAuthenticator. "
++ "HTTP(S) authentication will be disabled!");
 }
 }
 }
@@ -121,4 +116,36 @@ public final class IvyAuthenticator extends Authenticator {
 return RequestorType.PROXY.equals(getRequestorType());
 }
 
+private static Authenticator getDefaultAuthenticator() {
+try {
+final Method m = 
Authenticator.class.getDeclaredMethod("getDefault");
+return (Authenticator) m.invoke(null);
+} catch (final Throwable t) {
+handleReflectionException(t);
+}
+return null;
+}
+
+private static Authenticator getTheAuthenticator() {
+try {
+Field f = Authenticator.class.getDeclaredField("theAuthenticator");
+f.setAccessible(true);
+return (Authenticator) f.get(null);
+} catch (final Throwable t) {
+handleReflectionException(t);
+}
+return null;
+}
+
+private static void handleReflectionException(final Throwable t) {
+Message.debug("Error occurred while getting the original 
authenticator: "
++ t.getMessage());
+}
+
+private static int getJavaVersion() {
+// See 
https://docs.oracle.com/javase/8/docs/technotes/guides/versioning/spec/versioning2.html#wp90002
+final String[] version = 
System.getProperty("java.version").split("\\.");
+final int major = Integer.parseInt(version[0]);
+return major == 1 ? Integer.parseInt(version[1]) : major;
+}
 }

ant-ivy git commit: IVY-1282 Add missing trim()

2018-02-02 Thread gintas 
Repository: ant-ivy
Updated Branches:
  refs/heads/master 68e0a9c71 -> 1d3567f30


IVY-1282 Add missing trim()

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

Branch: refs/heads/master
Commit: 1d3567f3051682dd0ea8406a3f605cb5c42de27f
Parents: 68e0a9c
Author: Gintas Grigelionis 
Authored: Fri Feb 2 19:08:53 2018 +0100
Committer: Gintas Grigelionis 
Committed: Fri Feb 2 19:08:53 2018 +0100

--
 .../ivy/plugins/parser/AbstractModuleDescriptorParser.java | 2 +-
 .../ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java | 2 +-
 src/java/org/apache/ivy/util/StringUtils.java  | 6 +-
 3 files changed, 3 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/1d3567f3/src/java/org/apache/ivy/plugins/parser/AbstractModuleDescriptorParser.java
--
diff --git 
a/src/java/org/apache/ivy/plugins/parser/AbstractModuleDescriptorParser.java 
b/src/java/org/apache/ivy/plugins/parser/AbstractModuleDescriptorParser.java
index 903e432..0005927 100644
--- a/src/java/org/apache/ivy/plugins/parser/AbstractModuleDescriptorParser.java
+++ b/src/java/org/apache/ivy/plugins/parser/AbstractModuleDescriptorParser.java
@@ -125,7 +125,7 @@ public abstract class AbstractModuleDescriptorParser 
implements ModuleDescriptor
 return;
 }
 
-String[] conf = confs.split(";");
+String[] conf = confs.trim().split("\\s*;\\s*");
 parseDepsConfs(conf, dd, useDefaultMappingToGuessRightOperand, 
evaluateConditions);
 }
 

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/1d3567f3/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java
--
diff --git 
a/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java 
b/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java
index a5ab593..bd8b180 100644
--- a/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java
+++ b/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java
@@ -850,7 +850,7 @@ public final class XmlModuleDescriptorUpdater {
 private String removeConfigurationsFromMapping(String mapping) {
 StringBuilder newMapping = new StringBuilder();
 String mappingSep = "";
-for (String groups : mapping.split(";")) {
+for (String groups : mapping.trim().split("\\s*;\\s*")) {
 String[] ops = groups.split("->");
 List confsToWrite = new ArrayList<>();
 for (String lh : splitToArray(ops[0])) {

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/1d3567f3/src/java/org/apache/ivy/util/StringUtils.java
--
diff --git a/src/java/org/apache/ivy/util/StringUtils.java 
b/src/java/org/apache/ivy/util/StringUtils.java
index 099437c..64ce722 100644
--- a/src/java/org/apache/ivy/util/StringUtils.java
+++ b/src/java/org/apache/ivy/util/StringUtils.java
@@ -129,11 +129,7 @@ public final class StringUtils {
 if (list == null) {
 return null;
 }
-String[] parts = list.split(",");
-for (int i = 0; i < parts.length; i++) {
-parts[i] = parts[i].trim();
-}
-return parts;
+return list.trim().split("\\s*,\\s*");
 }
 
 /**

[Bug 62071] Calling FileSet.setFile twice fails with misleading message

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

--- Comment #3 from Sterling Greene  ---
Thanks Stefan.

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

Jenkins build is back to normal : Ant-Master SonarQube #135

2018-02-02 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 #160

2018-02-02 Thread Apache Jenkins Server 
See

[Bug 62071] Calling FileSet.setFile twice fails with misleading message

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

Stefan Bodewig  changed:

   What|Removed |Added

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

--- Comment #2 from Stefan Bodewig  ---
fixed in both branches with commit a390fd6 -
https://github.com/apache/ant/commit/a390fd653ca45cb32cee7b25050ae70a4f1b55c9

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

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

2018-02-02 Thread bodewig 
Merge branch '1.9.x'


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

Branch: refs/heads/master
Commit: f11bc4eaa38aecd467c8c9d954100baa0c71c893
Parents: 32d178f a390fd6
Author: Stefan Bodewig 
Authored: Fri Feb 2 10:51:50 2018 +0100
Committer: Stefan Bodewig 
Committed: Fri Feb 2 10:51:50 2018 +0100

--
 WHATSNEW|  5 +
 .../apache/tools/ant/types/AbstractFileSet.java | 13 +++--
 .../tools/ant/types/AbstractFileSetTest.java| 20 
 3 files changed, 36 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/f11bc4ea/WHATSNEW
--

http://git-wip-us.apache.org/repos/asf/ant/blob/f11bc4ea/src/main/org/apache/tools/ant/types/AbstractFileSet.java
--

[1/3] ant git commit: fix javadoc

2018-02-02 Thread bodewig 
Repository: ant
Updated Branches:
  refs/heads/master 32d178ffe -> f11bc4eaa


fix javadoc


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

Branch: refs/heads/master
Commit: 82573c463b5640cd98128b2eeb23110e694ac148
Parents: b38faab
Author: Stefan Bodewig 
Authored: Fri Feb 2 10:25:30 2018 +0100
Committer: Stefan Bodewig 
Committed: Fri Feb 2 10:25:30 2018 +0100

--
 src/main/org/apache/tools/ant/types/AbstractFileSet.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/82573c46/src/main/org/apache/tools/ant/types/AbstractFileSet.java
--
diff --git a/src/main/org/apache/tools/ant/types/AbstractFileSet.java 
b/src/main/org/apache/tools/ant/types/AbstractFileSet.java
index 1639150..7d1ac4a 100644
--- a/src/main/org/apache/tools/ant/types/AbstractFileSet.java
+++ b/src/main/org/apache/tools/ant/types/AbstractFileSet.java
@@ -292,7 +292,7 @@ public abstract class AbstractFileSet extends DataType
 }
 
 /**
- * Appends excludes to the current list of include
+ * Appends excludes to the current list of exclude
  * patterns.
  *
  * @param excludes array containing the exclude patterns.

[2/3] ant git commit: BZ 62071 - fix error message when fileset.setFile is called twice

2018-02-02 Thread bodewig 
BZ 62071 - fix error message when fileset.setFile is called twice


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

Branch: refs/heads/master
Commit: a390fd653ca45cb32cee7b25050ae70a4f1b55c9
Parents: 82573c4
Author: Stefan Bodewig 
Authored: Fri Feb 2 10:25:53 2018 +0100
Committer: Stefan Bodewig 
Committed: Fri Feb 2 10:25:53 2018 +0100

--
 WHATSNEW|  5 +
 .../apache/tools/ant/types/AbstractFileSet.java | 11 ++-
 .../tools/ant/types/AbstractFileSetTest.java| 20 
 3 files changed, 35 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/a390fd65/WHATSNEW
--
diff --git a/WHATSNEW b/WHATSNEW
index 1430c8d..923f75a 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -30,6 +30,11 @@ Fixed bugs:
streams of a process, could end up being truncated.
Bugzilla Report 58833, 58451
 
+ * // will now throw an exception
+   with a more useful error message when setFile is called twice on
+   the same instance.
+   Bugzilla Report 62071
+
 Other changes:
 --
 

http://git-wip-us.apache.org/repos/asf/ant/blob/a390fd65/src/main/org/apache/tools/ant/types/AbstractFileSet.java
--
diff --git a/src/main/org/apache/tools/ant/types/AbstractFileSet.java 
b/src/main/org/apache/tools/ant/types/AbstractFileSet.java
index 7d1ac4a..0c1d57d 100644
--- a/src/main/org/apache/tools/ant/types/AbstractFileSet.java
+++ b/src/main/org/apache/tools/ant/types/AbstractFileSet.java
@@ -232,7 +232,16 @@ public abstract class AbstractFileSet extends DataType
 if (isReference()) {
 throw tooManyAttributes();
 }
-if (getDir() != null) {
+if (fileAttributeUsed) {
+if (getDir().equals(file.getParentFile())) {
+String[] includes = 
defaultPatterns.getIncludePatterns(getProject());
+if (includes.length == 1 && 
includes[0].equals(file.getName())) {
+// NOOP, setFile has been invoked twice with the same 
parameter
+return;
+}
+}
+throw new BuildException("setFile cannot be called twice with 
different arguments");
+} else if (getDir() != null) {
 throw dirAndFileAreMutuallyExclusive();
 }
 setDir(file.getParentFile());

http://git-wip-us.apache.org/repos/asf/ant/blob/a390fd65/src/tests/junit/org/apache/tools/ant/types/AbstractFileSetTest.java
--
diff --git 
a/src/tests/junit/org/apache/tools/ant/types/AbstractFileSetTest.java 
b/src/tests/junit/org/apache/tools/ant/types/AbstractFileSetTest.java
index 56ee498..a025b2b 100644
--- a/src/tests/junit/org/apache/tools/ant/types/AbstractFileSetTest.java
+++ b/src/tests/junit/org/apache/tools/ant/types/AbstractFileSetTest.java
@@ -244,4 +244,24 @@ public abstract class AbstractFileSetTest {
 File dir = f1.getDir(project);
 assertEquals("Dir is basedir", dir, project.getBaseDir());
 }
+
+@Test
+public void canCallSetFileTwiceWithSameArgument() {
+AbstractFileSet f = getInstance();
+f.setFile(new File("/a"));
+f.setFile(new File("/a"));
+// really only asserts no exception is thrown
+}
+
+@Test
+public void cantCallSetFileTwiceWithDifferentArguments() {
+AbstractFileSet f = getInstance();
+f.setFile(new File("/a"));
+try {
+f.setFile(new File("/b"));
+fail("expected an exception");
+} catch (BuildException ex) {
+assertEquals("setFile cannot be called twice with different 
arguments", ex.getMessage());
+}
+}
 }

[2/2] ant git commit: BZ 62071 - fix error message when fileset.setFile is called twice

2018-02-02 Thread bodewig 
BZ 62071 - fix error message when fileset.setFile is called twice


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

Branch: refs/heads/1.9.x
Commit: a390fd653ca45cb32cee7b25050ae70a4f1b55c9
Parents: 82573c4
Author: Stefan Bodewig 
Authored: Fri Feb 2 10:25:53 2018 +0100
Committer: Stefan Bodewig 
Committed: Fri Feb 2 10:25:53 2018 +0100

--
 WHATSNEW|  5 +
 .../apache/tools/ant/types/AbstractFileSet.java | 11 ++-
 .../tools/ant/types/AbstractFileSetTest.java| 20 
 3 files changed, 35 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/a390fd65/WHATSNEW
--
diff --git a/WHATSNEW b/WHATSNEW
index 1430c8d..923f75a 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -30,6 +30,11 @@ Fixed bugs:
streams of a process, could end up being truncated.
Bugzilla Report 58833, 58451
 
+ * // will now throw an exception
+   with a more useful error message when setFile is called twice on
+   the same instance.
+   Bugzilla Report 62071
+
 Other changes:
 --
 

http://git-wip-us.apache.org/repos/asf/ant/blob/a390fd65/src/main/org/apache/tools/ant/types/AbstractFileSet.java
--
diff --git a/src/main/org/apache/tools/ant/types/AbstractFileSet.java 
b/src/main/org/apache/tools/ant/types/AbstractFileSet.java
index 7d1ac4a..0c1d57d 100644
--- a/src/main/org/apache/tools/ant/types/AbstractFileSet.java
+++ b/src/main/org/apache/tools/ant/types/AbstractFileSet.java
@@ -232,7 +232,16 @@ public abstract class AbstractFileSet extends DataType
 if (isReference()) {
 throw tooManyAttributes();
 }
-if (getDir() != null) {
+if (fileAttributeUsed) {
+if (getDir().equals(file.getParentFile())) {
+String[] includes = 
defaultPatterns.getIncludePatterns(getProject());
+if (includes.length == 1 && 
includes[0].equals(file.getName())) {
+// NOOP, setFile has been invoked twice with the same 
parameter
+return;
+}
+}
+throw new BuildException("setFile cannot be called twice with 
different arguments");
+} else if (getDir() != null) {
 throw dirAndFileAreMutuallyExclusive();
 }
 setDir(file.getParentFile());

http://git-wip-us.apache.org/repos/asf/ant/blob/a390fd65/src/tests/junit/org/apache/tools/ant/types/AbstractFileSetTest.java
--
diff --git 
a/src/tests/junit/org/apache/tools/ant/types/AbstractFileSetTest.java 
b/src/tests/junit/org/apache/tools/ant/types/AbstractFileSetTest.java
index 56ee498..a025b2b 100644
--- a/src/tests/junit/org/apache/tools/ant/types/AbstractFileSetTest.java
+++ b/src/tests/junit/org/apache/tools/ant/types/AbstractFileSetTest.java
@@ -244,4 +244,24 @@ public abstract class AbstractFileSetTest {
 File dir = f1.getDir(project);
 assertEquals("Dir is basedir", dir, project.getBaseDir());
 }
+
+@Test
+public void canCallSetFileTwiceWithSameArgument() {
+AbstractFileSet f = getInstance();
+f.setFile(new File("/a"));
+f.setFile(new File("/a"));
+// really only asserts no exception is thrown
+}
+
+@Test
+public void cantCallSetFileTwiceWithDifferentArguments() {
+AbstractFileSet f = getInstance();
+f.setFile(new File("/a"));
+try {
+f.setFile(new File("/b"));
+fail("expected an exception");
+} catch (BuildException ex) {
+assertEquals("setFile cannot be called twice with different 
arguments", ex.getMessage());
+}
+}
 }

[1/2] ant git commit: fix javadoc

2018-02-02 Thread bodewig 
Repository: ant
Updated Branches:
  refs/heads/1.9.x b38faab1c -> a390fd653


fix javadoc


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

Branch: refs/heads/1.9.x
Commit: 82573c463b5640cd98128b2eeb23110e694ac148
Parents: b38faab
Author: Stefan Bodewig 
Authored: Fri Feb 2 10:25:30 2018 +0100
Committer: Stefan Bodewig 
Committed: Fri Feb 2 10:25:30 2018 +0100

--
 src/main/org/apache/tools/ant/types/AbstractFileSet.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/82573c46/src/main/org/apache/tools/ant/types/AbstractFileSet.java
--
diff --git a/src/main/org/apache/tools/ant/types/AbstractFileSet.java 
b/src/main/org/apache/tools/ant/types/AbstractFileSet.java
index 1639150..7d1ac4a 100644
--- a/src/main/org/apache/tools/ant/types/AbstractFileSet.java
+++ b/src/main/org/apache/tools/ant/types/AbstractFileSet.java
@@ -292,7 +292,7 @@ public abstract class AbstractFileSet extends DataType
 }
 
 /**
- * Appends excludes to the current list of include
+ * Appends excludes to the current list of exclude
  * patterns.
  *
  * @param excludes array containing the exclude patterns.

[Bug 62071] Calling FileSet.setFile twice fails with misleading message

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

--- Comment #1 from Stefan Bodewig  ---
I don't think the initial intention has ever been to prohibit calling setFile
twice, after all you can still call setDir twice. After some pondering I've
decided it would be easier to fix the error message. If you call setFile twice
with two different arguments the surely something must be wrong.

Currently running tests, will be fixed in 1.9.10 and 1.10.2.

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