[ant] branch master updated: As asked on the user list: targets also could contain datatypes (as stated in the java-comment on Target#children. While target execution tasks are "perform()"ed and datat

[jhm]

This is an automated email from the ASF dual-hosted git repository.

jhm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ant.git


The following commit(s) were added to refs/heads/master by this push:
 new e463023  As asked on the user list: targets also could contain 
datatypes (as stated in the java-comment on Target#children. While target 
execution tasks are "perform()"ed and datatypes are "maybeConfigure()"d.
e463023 is described below

commit e46302326d74578dae77c83d8af7107325d11931
Author: Jan MatÚrne 
AuthorDate: Wed Jun 30 15:18:24 2021 +0200

As asked on the user list: targets also could contain datatypes (as stated 
in the java-comment on Target#children.
While target execution tasks are "perform()"ed and datatypes are 
"maybeConfigure()"d.
---
 manual/targets.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manual/targets.html b/manual/targets.html
index f8d6ff2..4cd0240 100644
--- a/manual/targets.html
+++ b/manual/targets.html
@@ -25,7 +25,7 @@
 
   Targets
 
-  A target is a container of tasks that cooperate to reach a
+  A target is a container of tasks and datatypes that cooperate to reach a
 desired state during the build process.
 
   Targets can depend on other targets and Apache Ant ensures that these

[ant-antlibs-common] branch master updated: Use JavaDoc ant-Tags as in Ant itself.

[jhm]

This is an automated email from the ASF dual-hosted git repository.

jhm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ant-antlibs-common.git


The following commit(s) were added to refs/heads/master by this push:
 new 80597b9  Use JavaDoc ant-Tags as in Ant itself.
80597b9 is described below

commit 80597b90630813ae1798e22449e348aef29871bb
Author: Jan MatÚrne 
AuthorDate: Sun Aug 16 08:16:28 2020 +0200

Use JavaDoc ant-Tags as in Ant itself.
---
 build.xml | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/build.xml b/build.xml
index 0e0ce60..d4cebdb 100644
--- a/build.xml
+++ b/build.xml
@@ -242,6 +242,12 @@
 
 
   
+  
+  
+  
+  
+  
+  
 
   
 

[ant-antlibs-vss] branch master updated: add missing file from common/

[jhm]

This is an automated email from the ASF dual-hosted git repository.

jhm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ant-antlibs-vss.git


The following commit(s) were added to refs/heads/master by this push:
 new 6d1362e  add missing file from common/
6d1362e is described below

commit 6d1362e828af4c7b1dd858cadc020dc7209c03dd
Author: Jan MatÚrne 
AuthorDate: Sun Aug 16 08:02:35 2020 +0200

add missing file from common/
---
 prepare.xml | 65 +
 1 file changed, 65 insertions(+)

diff --git a/prepare.xml b/prepare.xml
new file mode 100644
index 000..b3a64f4
--- /dev/null
+++ b/prepare.xml
@@ -0,0 +1,65 @@
+
+
+
+
+
+
+  
+  
+  https://repo1.maven.org/maven2/org/apache/ant/ant-antunit/${antunit.version}/ant-antunit-${antunit.version}.jar"/>
+  
+
+  
+  
+
+  
+updating prepare.xml
+
+  
+
+  
+updating AntUnit
+
+  
+  
+  
+  
+  
+Bootstrap done. Next step: 
+  ant -f prepare.xml prepare
+  
+  
+  
+Preparation done. Next steps:
+ ant clean distribution
+ ant -lib ${antunit.file} -lib build/lib test
+  
+
+

[ant-antlibs-props] branch master updated: Fix Javadoc as it breaks the build

[jhm]

This is an automated email from the ASF dual-hosted git repository.

jhm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ant-antlibs-props.git


The following commit(s) were added to refs/heads/master by this push:
 new bef9a17  Fix Javadoc as it breaks the build
bef9a17 is described below

commit bef9a17cda546aa65e1a135e7a3d9fa0b2146158
Author: Jan MatÚrne 
AuthorDate: Fri Aug 14 10:23:49 2020 +0200

Fix Javadoc as it breaks the build
---
 src/main/org/apache/ant/props/LogicalOperationEvaluator.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/org/apache/ant/props/LogicalOperationEvaluator.java 
b/src/main/org/apache/ant/props/LogicalOperationEvaluator.java
index 066..ccfafdd 100644
--- a/src/main/org/apache/ant/props/LogicalOperationEvaluator.java
+++ b/src/main/org/apache/ant/props/LogicalOperationEvaluator.java
@@ -23,7 +23,7 @@ import org.apache.tools.ant.PropertyHelper.PropertyEvaluator;
 
 /**
  * {@link PropertyEvaluator} that processes combinations of !,
- * & (+ is also accepted for XML ease-of-use),
+ *  (+ is also accepted for XML ease-of-use),
  * ^ (XOR), and |, in descending priority.
  * Probably only useful when used with {@link NestedPropertyExpander} which, 
when
  * taken in conjunction with {@link ConditionTypeEvaluator}, will resolve 
nested

[ant] branch master updated: Correct a typo

[jhm]

This is an automated email from the ASF dual-hosted git repository.

jhm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ant.git


The following commit(s) were added to refs/heads/master by this push:
 new add1b33  Correct a typo
 new cd17a66  Merge branch 'PR-104'
add1b33 is described below

commit add1b33bc52a72089682e3b7f90487e73c10ad84
Author: Hassan C 
AuthorDate: Mon Oct 21 18:52:28 2019 +0100

Correct a typo
---
 manual/Tasks/mkdir.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manual/Tasks/mkdir.html b/manual/Tasks/mkdir.html
index d624e45..4dc3865 100644
--- a/manual/Tasks/mkdir.html
+++ b/manual/Tasks/mkdir.html
@@ -27,7 +27,7 @@
 Mkdir
 Description
 Creates a directory. Also non-existent parent directories are created, when 
necessary. Does
-nothing if the directory already exist.
+nothing if the directory already exists.
 Parameters
 
   

[ant-ivy] branch master updated: BREAKING: Removed old fr\jayasoft\ivy\ant\antlib.xml AntLib definition file (jira:IVY-1612)

[jhm]

This is an automated email from the ASF dual-hosted git repository.

jhm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ant-ivy.git


The following commit(s) were added to refs/heads/master by this push:
 new ecf6c2e  BREAKING: Removed old fr\jayasoft\ivy\ant\antlib.xml AntLib 
definition file (jira:IVY-1612)
ecf6c2e is described below

commit ecf6c2e009d408e4b8e46b30c78d957435020427
Author: Jan Matèrne 
AuthorDate: Fri Oct 25 08:41:22 2019 +0200

BREAKING: Removed old fr\jayasoft\ivy\ant\antlib.xml AntLib definition file 
(jira:IVY-1612)
---
 asciidoc/release-notes.adoc | 3 ++-
 build.xml   | 4 
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/asciidoc/release-notes.adoc b/asciidoc/release-notes.adoc
index 2d79a24..7294279 100644
--- a/asciidoc/release-notes.adoc
+++ b/asciidoc/release-notes.adoc
@@ -45,9 +45,9 @@ For details about the following changes, check our JIRA 
install at link:https://
 
 *List of changes since Ivy 2.5.0:*
 
+- BREAKING: Removed old fr\jayasoft\ivy\ant\antlib.xml AntLib definition file 
(jira:IVY-1612)
 - FIX:
 
-
 - IMPROVEMENT:
 
 - NEW:
@@ -74,6 +74,7 @@ Here is the list of people who have contributed source code 
and documentation up
 * Gintautas Grigelionis
 * Xavier Hanin
 * Nicolas Laleve
+* Jan Matrne 
 * Jaikiran Pai
 * Jon Schneider
 * Gilles Scokart
diff --git a/build.xml b/build.xml
index f914179..9352b70 100644
--- a/build.xml
+++ b/build.xml
@@ -259,10 +259,6 @@
 
 
 
-
-
-
 
 
 

[ant] branch master updated: Made some variable names more consistent with the other parts of the code.

[jhm]

This is an automated email from the ASF dual-hosted git repository.

jhm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ant.git


The following commit(s) were added to refs/heads/master by this push:
 new 1b42c23  Made some variable names more consistent with the other parts 
of the code.
1b42c23 is described below

commit 1b42c235a17c4e35af5c250e7e0cbe07d806f945
Author: Yusuke Shinyama 
AuthorDate: Mon Oct 21 14:05:15 2019 +0900

Made some variable names more consistent with the other parts of the code.
---
 src/main/org/apache/tools/ant/BuildException.java  |  8 +--
 .../org/apache/tools/ant/taskdefs/Checksum.java|  6 +-
 .../tools/ant/taskdefs/condition/Equals.java   | 12 ++--
 .../apache/tools/ant/taskdefs/cvslib/RCSFile.java  |  4 +-
 .../taskdefs/optional/junit/JUnitTestRunner.java   | 16 ++---
 .../tools/ant/taskdefs/optional/unix/Symlink.java  | 76 +++---
 .../org/apache/tools/ant/types/Commandline.java|  8 +--
 7 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/src/main/org/apache/tools/ant/BuildException.java 
b/src/main/org/apache/tools/ant/BuildException.java
index 3025240..6dc2c12 100644
--- a/src/main/org/apache/tools/ant/BuildException.java
+++ b/src/main/org/apache/tools/ant/BuildException.java
@@ -74,15 +74,15 @@ public class BuildException extends RuntimeException {
  * Constructs an exception with the given message and exception as
  * a root cause and a location in a file.
  *
- * @param msg A description of or information about the exception.
- *Should not be null unless a cause is specified.
+ * @param message A description of or information about the exception.
+ *Should not be null unless a cause is 
specified.
  * @param cause The exception that might have caused this one.
  *  May be null.
  * @param location The location in the project file where the error
  * occurred. Must not be null.
  */
-public BuildException(String msg, Throwable cause, Location location) {
-this(msg, cause);
+public BuildException(String message, Throwable cause, Location location) {
+this(message, cause);
 this.location = location;
 }
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/Checksum.java 
b/src/main/org/apache/tools/ant/taskdefs/Checksum.java
index 7bf9fd1..2faf92e 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Checksum.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Checksum.java
@@ -262,12 +262,12 @@ public class Checksum extends MatchingTask implements 
Condition {
  * Specify the pattern to use as a MessageFormat pattern.
  *
  * {0} gets replaced by the checksum, {1} by the filename.
- * @param p a String value
+ * @param pattern a String value
  *
  * @since 1.7.0
  */
-public void setPattern(String p) {
-format = new MessageFormat(p);
+public void setPattern(String pattern) {
+format = new MessageFormat(pattern);
 }
 
 /**
diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/Equals.java 
b/src/main/org/apache/tools/ant/taskdefs/condition/Equals.java
index db0313a..44e3561 100644
--- a/src/main/org/apache/tools/ant/taskdefs/condition/Equals.java
+++ b/src/main/org/apache/tools/ant/taskdefs/condition/Equals.java
@@ -50,10 +50,10 @@ public class Equals implements Condition {
 /**
  * Set the first string
  *
- * @param a1 the first string
+ * @param arg1 the first string
  */
-public void setArg1(String a1) {
-setArg1Internal(a1);
+public void setArg1(String arg1) {
+setArg1Internal(arg1);
 }
 
 private void setArg1Internal(Object arg1) {
@@ -77,10 +77,10 @@ public class Equals implements Condition {
 /**
  * Set the second string
  *
- * @param a2 the second string
+ * @param arg2 the second string
  */
-public void setArg2(String a2) {
-setArg2Internal(a2);
+public void setArg2(String arg2) {
+setArg2Internal(arg2);
 }
 
 private void setArg2Internal(Object arg2) {
diff --git a/src/main/org/apache/tools/ant/taskdefs/cvslib/RCSFile.java 
b/src/main/org/apache/tools/ant/taskdefs/cvslib/RCSFile.java
index 16bc74d..2aa42cd 100644
--- a/src/main/org/apache/tools/ant/taskdefs/cvslib/RCSFile.java
+++ b/src/main/org/apache/tools/ant/taskdefs/cvslib/RCSFile.java
@@ -26,8 +26,8 @@ class RCSFile {
 private String revision;
 private String previousRevision;
 
-RCSFile(final String name, final String rev) {
-this(name, rev, null);
+RCSFile(final String name, final String revision) {
+this(name, revision, null);
 }
 
 RCSFile(final String name,
diff --git 
a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java 
b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java
index f914b17..4370bdc 100644
--- a/src

[ant] branch master updated: Provide more meaningful error message

[jhm]

This is an automated email from the ASF dual-hosted git repository.

jhm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ant.git


The following commit(s) were added to refs/heads/master by this push:
 new f8e349c  Provide more meaningful error message
f8e349c is described below

commit f8e349cdba345f0394ddf0be0b2c92da7a0d0ca8
Author: Jan Matèrne 
AuthorDate: Thu Sep 5 09:08:20 2019 +0200

Provide more meaningful error message
---
 .../apache/tools/ant/taskdefs/optional/script/ScriptDefTest.java  | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git 
a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/script/ScriptDefTest.java
 
b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/script/ScriptDefTest.java
index 24429cb..667db43 100644
--- 
a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/script/ScriptDefTest.java
+++ 
b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/script/ScriptDefTest.java
@@ -170,6 +170,12 @@ public class ScriptDefTest {
 notCompiledDuration = System.nanoTime() - start;
 }
 
-assertTrue(duration < notCompiledDuration);
+assertTrue(
+String.format(
+"Compiled scripts should run faster (%d ns) than not compiled 
(%d ns) scripts.",
+duration, notCompiledDuration
+   ), 
+duration < notCompiledDuration
+);
 }
 }

[ant] branch master updated (1c97966 -> 1e00d44)

[jhm]

This is an automated email from the ASF dual-hosted git repository.

jhm pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/ant.git.


from 1c97966  htmlcheck: generate report file, consistent property names, 
meaningful target name
 new e2b40e5  htmlcheck: correct tool name, consistent report placement
 new 978e8b4  missing dots
 new 1e00d44  extract 'report.dir'

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 check.xml | 37 +
 1 file changed, 21 insertions(+), 16 deletions(-)

[ant] 01/03: htmlcheck: correct tool name, consistent report placement

[jhm]

This is an automated email from the ASF dual-hosted git repository.

jhm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ant.git

commit e2b40e5dd384af9f6844b1c67590d86b0381f26b
Author: twogee 
AuthorDate: Sun Mar 10 07:05:29 2019 +0100

htmlcheck: correct tool name, consistent report placement
---
 check.xml | 20 +++-
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/check.xml b/check.xml
index c0bcd9d..4c14c21 100644
--- a/check.xml
+++ b/check.xml
@@ -19,7 +19,8 @@
 
   
 Check Ant codebase against certain code style guidelines using
-Checkstyle, Apache Rat, SpotBugs, OWASP Dependency Check and Simian.
+Checkstyle, Apache Rat, SpotBugs, OWASP Dependency Check, Simian
+and Nu Html Checker (v.Nu).
 
 Checkstyle uses an abstract syntax tree (AST) for doing checks
 against Java sources. It is available at http://checkstyle.sourceforge.net/
@@ -41,8 +42,9 @@
 plain text files."  It is available at https://www.harukizaemon.com/simian/
 and is for free use in open source projects.
 
-Nu HTML Validator by Mozilla Foundation checks html files against HTML5
-specs and recommendations.
+"The Nu Html Checker (v.Nu) is the backend of checker.html5.org,
+html5.validator.nu, and validator.w3.org/nu." It is available at
+https://validator.github.io/validator/ under MIT license.
 
 See external task page and homepages for more information.
   
@@ -120,7 +122,7 @@
 value="${build.dir}/simian-lib"
 description="Where to store Simian resources"/>
   
 
   
@@ -131,12 +133,12 @@
 value="${build.dir}/reports/owasp-dc"
 description="Where to store the OWASP Dependency Check reports"/>
 
-  
+  
   
+description="Which version of Nu Html Checker to use"/>
   
   
 
-
+
   
 
 
@@ -327,7 +329,7 @@
 
   
 
-  
+  
 
 

[ant] 03/03: extract 'report.dir'

[jhm]

This is an automated email from the ASF dual-hosted git repository.

jhm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ant.git

commit 1e00d447d2a250a4e0581e010cf83b72a31abc7e
Author: Jan Matèrne 
AuthorDate: Tue Mar 12 10:00:20 2019 +0100

extract 'report.dir'
---
 check.xml | 17 ++---
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/check.xml b/check.xml
index 185e023..7d1a901 100644
--- a/check.xml
+++ b/check.xml
@@ -50,15 +50,18 @@
   
 
   
+  
 
-  
 
   
+  
   
   
   
   
   
   
   
   
 
   
@@ -130,7 +133,7 @@
 value="3.2.1"
 description="Which version of OWASP Dependency Check to use"/>
   
 
   
@@ -138,7 +141,7 @@
 value="18.11.5"
 description="Which version of Nu Html Checker to use"/>
   
   

[ant] 02/03: missing dots

[jhm]

This is an automated email from the ASF dual-hosted git repository.

jhm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ant.git

commit 978e8b4677a4d56f30b462cba9cb85718626d956
Author: Jan Matèrne 
AuthorDate: Tue Mar 12 09:57:27 2019 +0100

missing dots
---
 check.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/check.xml b/check.xml
index 4c14c21..185e023 100644
--- a/check.xml
+++ b/check.xml
@@ -27,7 +27,7 @@
 under GPL 2.1 license.
 
 "Apache Rat is a release audit tool, focused on licenses." It is available
-at https://creadur.apache.org/rat/ under Apache License, Version 2.0
+at https://creadur.apache.org/rat/ under Apache License, Version 2.0.
 
 "SpotBugs is a program which uses static analysis to look for bugs in Java
 code." It is available at https://spotbugs.github.io/ under LGPL 3 license.
@@ -35,7 +35,7 @@
 "Dependency-Check is a utility that identifies project dependencies and
 checks if there are any known, publicly disclosed, vulnerabilities." It is
 available at https://www.owasp.org/index.php/OWASP_Dependency_Check under
-Apache License, Version 2.0
+Apache License, Version 2.0.
 
 "Simian (Similarity Analyser) identifies duplication in Java, C#, C, CPP,
 COBOL, Ruby, JSP, ASP, HTML, XML, Visual Basic, Groovy source code and even

[ant] 03/03: htmlcheck: generate report file, consistent property names, meaningful target name

[jhm]

This is an automated email from the ASF dual-hosted git repository.

jhm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ant.git

commit 1c97966dae313dcb822ca7763eda8fa9f7a8ca0f
Author: Jan Matèrne 
AuthorDate: Sat Mar 9 14:37:26 2019 +0100

htmlcheck: generate report file, consistent property names, meaningful 
target name
---
 check.xml | 20 
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/check.xml b/check.xml
index 495cf4b..c0bcd9d 100644
--- a/check.xml
+++ b/check.xml
@@ -41,6 +41,9 @@
 plain text files."  It is available at https://www.harukizaemon.com/simian/
 and is for free use in open source projects.
 
+Nu HTML Validator by Mozilla Foundation checks html files against HTML5
+specs and recommendations.
+
 See external task page and homepages for more information.
   
 
@@ -129,9 +132,16 @@
 description="Where to store the OWASP Dependency Check reports"/>
 
   
-  
+  
+  
+
 
   
 
@@ -317,8 +327,8 @@
 
   
 
-  
-
+
 
   
@@ -326,10 +336,12 @@
   
 
 
+
 
+  taskname="html-check" output="${htmlcheck.report.file}">
   
   
 
+
   
 

[ant] branch master updated (aa61cbc -> 1c97966)

[jhm]

This is an automated email from the ASF dual-hosted git repository.

jhm pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/ant.git.


from aa61cbc  Merge 1.9.x branch into master
 new d01d88a  Fix doctype and language
 new 99bb33d  Add HTML validation check, fix head in package.html
 new 1c97966  htmlcheck: generate report file, consistent property names, 
meaningful target name

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 check.xml  | 34 +-
 manual/Integration/jext-plugin.html|  6 ++--
 manual/Tasks/BorlandEJBTasks.html  |  4 +--
 manual/Tasks/BorlandGenerateClient.html|  4 +--
 manual/Tasks/ant.html  |  4 +--
 manual/Tasks/antcall.html  |  4 +--
 manual/Tasks/antlr.html|  4 +--
 manual/Tasks/antstructure.html |  4 +--
 manual/Tasks/antversion.html   |  4 +--
 manual/Tasks/apply.html|  4 +--
 manual/Tasks/attrib.html   |  4 +--
 manual/Tasks/augment.html  |  4 +--
 manual/Tasks/available.html|  4 +--
 manual/Tasks/basename.html |  4 +--
 manual/Tasks/bindtargets.html  |  4 +--
 manual/Tasks/buildnumber.html  |  4 +--
 manual/Tasks/cab.html  |  4 +--
 manual/Tasks/ccm.html  |  4 +--
 manual/Tasks/changelog.html|  4 +--
 manual/Tasks/checksum.html |  4 +--
 manual/Tasks/chgrp.html|  4 +--
 manual/Tasks/chmod.html|  4 +--
 manual/Tasks/chown.html|  4 +--
 manual/Tasks/clearcase.html|  4 +--
 manual/Tasks/common.html   |  4 +--
 manual/Tasks/componentdef.html |  4 +--
 manual/Tasks/concat.html   |  4 +--
 manual/Tasks/condition.html|  4 +--
 manual/Tasks/conditions.html   |  4 +--
 manual/Tasks/copy.html |  4 +--
 manual/Tasks/copydir.html  |  4 +--
 manual/Tasks/copyfile.html |  4 +--
 manual/Tasks/cvs.html  |  4 +--
 manual/Tasks/cvspass.html  |  4 +--
 manual/Tasks/cvstagdiff.html   |  4 +--
 manual/Tasks/cvsversion.html   |  4 +--
 manual/Tasks/defaultexcludes.html  |  4 +--
 manual/Tasks/delete.html   |  4 +--
 manual/Tasks/deltree.html  |  4 +--
 manual/Tasks/depend.html   |  4 +--
 manual/Tasks/dependset.html|  4 +--
 manual/Tasks/diagnostics.html  |  4 +--
 manual/Tasks/dirname.html  |  4 +--
 manual/Tasks/ear.html  |  4 +--
 manual/Tasks/echo.html |  4 +--
 manual/Tasks/echoproperties.html   |  4 +--
 manual/Tasks/echoxml.html  |  4 +--
 manual/Tasks/ejb.html  |  4 +--
 manual/Tasks/exec.html |  4 +--
 manual/Tasks/fail.html |  4 +--
 manual/Tasks/filter.html   |  4 +--
 manual/Tasks/fixcrlf.html  |  4 +--
 manual/Tasks/ftp.html  |  4 +--
 manual/Tasks/genkey.html   |  4 +--
 manual/Tasks/get.html  |  4 +--
 manual/Tasks/gunzip.html   |  4 +--
 manual/Tasks/gzip.html |  4 +--
 manual/Tasks/hostinfo.html |  4 +--
 manual/Tasks/image.html|  4 +--
 manual/Tasks/imageio.html  |  4 +--
 manual/Tasks/import.html   |  4 +--
 manual/Tasks/include.html  |  4 +--
 manual/Tasks/input.html|  4 +--
 manual/Tasks/jar.html  |  4 +--
 manual/Tasks/jarlib-available.html |  4 +--
 manual/Tasks/jarlib-display.html   |  4 +--
 manual/Tasks/jarlib-manifest.html  |  4 +--
 manual/Tasks/jarlib-resolve.html   |  4 +--
 manual/Tasks/java.html |  4 +--
 manual/Tasks/javac.html| 

[ant] 02/03: Add HTML validation check, fix head in package.html

[jhm]

This is an automated email from the ASF dual-hosted git repository.

jhm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ant.git

commit 99bb33d67b1df68adaa1e6d31dde7ce3e722c3f9
Author: twogee 
AuthorDate: Fri Dec 21 11:01:24 2018 +0100

Add HTML validation check, fix head in package.html
---
 check.xml  | 22 +-
 .../org/apache/tools/ant/property/package.html |  3 +++
 .../tools/ant/taskdefs/optional/sos/package.html   |  3 +++
 .../apache/tools/ant/types/resolver/package.html   |  3 +++
 4 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/check.xml b/check.xml
index 90655ed..495cf4b 100644
--- a/check.xml
+++ b/check.xml
@@ -109,7 +109,7 @@
   
   
+description="Which version of Simian to use"/>
   http://www.harukizaemon.com/simian/simian-${simian.version}.tar.gz;
 description="Where to get Simian"/>
@@ -128,6 +128,11 @@
 value="${build.dir}/reports/owasp-dc"
 description="Where to store the OWASP Dependency Check reports"/>
 
+  
+  
+
   
 
 http://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.version}/ivy-${ivy.version}.jar"/>
@@ -312,4 +317,19 @@
 
   
 
+  
+
+
+  
+  
+  
+
+
+
+  
+  
+
+  
 
diff --git a/src/main/org/apache/tools/ant/property/package.html 
b/src/main/org/apache/tools/ant/property/package.html
index 4568499..871aa12 100644
--- a/src/main/org/apache/tools/ant/property/package.html
+++ b/src/main/org/apache/tools/ant/property/package.html
@@ -16,6 +16,9 @@
limitations under the License.
 -->
 
+
+  Helper classes for Ant properties
+
 
   Contains helper classes for Ant properties.
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sos/package.html 
b/src/main/org/apache/tools/ant/taskdefs/optional/sos/package.html
index 9f02518..ddb3dd3 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/sos/package.html
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/sos/package.html
@@ -16,6 +16,9 @@
limitations under the License.
 -->
 
+
+  SourceOffSite SCM tasks
+
 
   
 Ant tasks for working with a SourceOffSite source control system.
diff --git a/src/main/org/apache/tools/ant/types/resolver/package.html 
b/src/main/org/apache/tools/ant/types/resolver/package.html
index ab75c0e..3921796 100644
--- a/src/main/org/apache/tools/ant/types/resolver/package.html
+++ b/src/main/org/apache/tools/ant/types/resolver/package.html
@@ -16,6 +16,9 @@
limitations under the License.
 -->
 
+
+  Integration with xml-commons resolver
+
 
 Ant integration with xml-commons resolver.
 

[ant] branch master updated: additional testcases

[jhm]

This is an automated email from the ASF dual-hosted git repository.

jhm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ant.git


The following commit(s) were added to refs/heads/master by this push:
 new b5044ca  additional testcases
b5044ca is described below

commit b5044cad48898a946129258127401a2fc2aa5448
Author: Jan Matèrne 
AuthorDate: Mon Feb 18 15:56:31 2019 +0100

additional testcases
---
 .../apache/tools/ant/util/DeweyDecimalTest.java| 56 +-
 1 file changed, 55 insertions(+), 1 deletion(-)

diff --git a/src/tests/junit/org/apache/tools/ant/util/DeweyDecimalTest.java 
b/src/tests/junit/org/apache/tools/ant/util/DeweyDecimalTest.java
index d16ba15..2ea6d34 100644
--- a/src/tests/junit/org/apache/tools/ant/util/DeweyDecimalTest.java
+++ b/src/tests/junit/org/apache/tools/ant/util/DeweyDecimalTest.java
@@ -23,6 +23,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
 
 public class DeweyDecimalTest {
 
@@ -72,6 +73,59 @@ public class DeweyDecimalTest {
 assertEquals(0, new DeweyDecimal("1.2").compareTo(new 
DeweyDecimal("1.2.0")));
 }
 
-// TODO isGreaterThan, ...
+@Test
+public void intConstructor() {
+int[] args = {1,2,3};
+assertEquals("1.2.3", new DeweyDecimal(args).toString());
+}
+
+@Test
+public void intConstructorNegativeValues() {
+int[] args = {-1,-2,-3};
+assertEquals("-1.-2.-3", new DeweyDecimal(args).toString());
+}
 
+@Test
+public void details() {
+ DeweyDecimal dd = new DeweyDecimal("1.2.3");
+ assertEquals(3, dd.getSize());
+ assertEquals(2, dd.get(1));
+}
+
+@Test
+public void isGreaterThanOrEqual() {
+ DeweyDecimal first = new DeweyDecimal("1.2.3");
+ assertTrue(first.isGreaterThanOrEqual(new DeweyDecimal("1")));
+ assertTrue(first.isGreaterThanOrEqual(new DeweyDecimal("1.2")));
+ assertTrue(first.isGreaterThanOrEqual(new DeweyDecimal("1.2.3")));
+ assertTrue(first.isGreaterThanOrEqual(new DeweyDecimal("1.2.3.0")));
+ assertFalse(first.isGreaterThanOrEqual(new DeweyDecimal("1.2.4")));
+ assertFalse(first.isGreaterThanOrEqual(new DeweyDecimal("1.3")));
+ assertFalse(first.isGreaterThanOrEqual(new DeweyDecimal("2")));
+}
+
+@Test
+public void equals() {
+ DeweyDecimal dd = new DeweyDecimal("1.2.3");
+ assertFalse(dd.equals("other"));
+ assertFalse(dd.equals(null));
+ assertTrue(dd.equals(new DeweyDecimal("1.2.3")));
+ assertTrue(dd.equals(new DeweyDecimal("1.2.3.0")));
+}
+
+@Test
+public void isLessThan() {
+ DeweyDecimal dd = new DeweyDecimal("1.2.3");
+ assertTrue(dd.isLessThan(new DeweyDecimal("2")));
+ assertFalse(dd.isLessThan(new DeweyDecimal("1")));
+ assertFalse(dd.isLessThan(new DeweyDecimal("1.2.3")));
+}
+
+@Test
+public void isLessThanOrEqual() {
+ DeweyDecimal dd = new DeweyDecimal("1.2.3");
+ assertTrue(dd.isLessThanOrEqual(new DeweyDecimal("2")));
+ assertFalse(dd.isLessThanOrEqual(new DeweyDecimal("1")));
+ assertTrue(dd.isLessThanOrEqual(new DeweyDecimal("1.2.3")));
+}
 }

svn commit: r1835539 - in /ant/site/ant: production/projects.html sources/projects.xml

[jhm]

Author: jhm
Date: Tue Jul 10 11:28:38 2018
New Revision: 1835539

URL: http://svn.apache.org/viewvc?rev=1835539=rev
Log:
not found any more: Leafcutter, luntbuild (alternative URLs found),  Savant

Modified:
ant/site/ant/production/projects.html
ant/site/ant/sources/projects.xml

Modified: ant/site/ant/production/projects.html
URL: 
http://svn.apache.org/viewvc/ant/site/ant/production/projects.html?rev=1835539=1835538=1835539=diff
==
--- ant/site/ant/production/projects.html (original)
+++ ant/site/ant/production/projects.html Tue Jul 10 11:28:38 2018
@@ -855,58 +855,6 @@
   
   
   
-
-Leafcutter
-  
-Leafcutter is an API which allows you to execute 
Ant tasks from Java code. 
-   Leafcutter is useful as: 
-   A way of integrating Ant tasks into existing Java programs. 

-   A wholesale alternative to standard Ant for process automation. 

-   
-
-  
-  
-  
-  Compatibility:
-  
-  
-  unknown
-  
-  
-  
-  
-  URL:
-  
-  
-  https://leafcutter.dev.java.net/;>https://leafcutter.dev.java.net/
-  
-  
-  
-  
-  Contact:
-  
-  
-  https://leafcutter.dev.java.net/servlets/ProjectForumView;>Discussion 
Forum
-  
-  
-  
-  
-  License:
-  
-  
-  Apache Software Foundation License
-  
-  
-  
-  
 
 luntbuild
   
@@ -916,6 +864,13 @@
 and monitoring tasks is performed from a clean web
 interface. It supports schedules builds, force builds,
 rebuilds, clean build, increment build, etc.
+Hint: The URL provided us by the 
luntbuild team is no longer
+available as JavaForge has been shut down permanently on 31 March 2016.
+We have found some "luntbuild"s available on 
+  https://sourceforge.net/projects/luntbuild/;>Sourceforge page of the old 
luntbuild
+  http://www.huihoo.org/luntbuild/manual/index.htm;>a 
user guide of a build automation engine on top of Ant
+  https://xebialabs.com/technology/luntbuild/;>homepage 
of a CI server
+
   
   
   
   
-  https://mdatools.net/blog/projects/model-ant/;>https://mdatools.net/blog/projects/model-ant/
+  https://mdatools.net/blog/modelant/;>https://mdatools.net/blog/projects/model-ant/
   
   
   
@@ -1166,58 +1121,6 @@
   
   
   
-  
-
-Savant
-  
-Savant is a build and dependency management tool 
written in Java. Savant can be used in
-two different ways:
-As a stand-alone build tool that wraps Apache Ant and provides a 
number of cool new
-features such as plugins that are versioned and downloadable
-As a set of tasks which can be used within Apache Ant build 
files
-
-  
-  
-  
-  Compatibility:
-  
-  
-  Unknown. There is a distro, which ships Ant 1.7.1
-  
-  
-  
-  
-  URL:
-  
-  
-  http://code.google.com/p/savant-build/;>http://code.google.com/p/savant-build/
-  
-  
-  
-  
-  Contact:
-  
-  
-  http://code.google.com/p/savant-build/issues/list;>Bugtracking system
-  
-  
-  
-  
-  License:
-  
-  
-  ASF 2.0
-  
-  
-  
   
 
 WebTest

Modified: ant/site/ant/sources/projects.xml
URL: 
http://svn.apache.org/viewvc/ant/site/ant/sources/projects.xml?rev=1835539=1835538=1835539=diff
==
--- ant/site/ant/sources/projects.xml (original)
+++ ant/site/ant/sources/projects.xml Tue Jul 10 11:28:38 2018
@@ -394,33 +394,6 @@
 
   
 
-  
-Leafcutter is an API which allows you to execute Ant tasks from 
Java code. 
-   Leafcutter is useful as: 
-   A way of integrating 

svn commit: r1835527 - in /ant/site/ant: production/projects.html sources/projects.xml

[jhm]

Author: jhm
Date: Tue Jul 10 09:57:00 2018
New Revision: 1835527

URL: http://svn.apache.org/viewvc?rev=1835527=rev
Log:
not found any more: AntHill, Antiplate, Ant Script Library (found only an old 
article), JavaGen Ant Modules

Modified:
ant/site/ant/production/projects.html
ant/site/ant/sources/projects.xml

Modified: ant/site/ant/production/projects.html
URL: 
http://svn.apache.org/viewvc/ant/site/ant/production/projects.html?rev=1835527=1835526=1835527=diff
==
--- ant/site/ant/production/projects.html (original)
+++ ant/site/ant/production/projects.html Tue Jul 10 09:57:00 2018
@@ -430,59 +430,6 @@
   
   
   
-
-AntHill
-  
-Anthill is a build tool that promotes a controlled 
build
-process by ensuring that every build reflects the source
-repository contents and tagging the repository with a unique
-build number after every build. Anthill also encourages the
-sharing of knowledge within an organization by automatically
-updating a project intranet site with artifacts from the
-latest build.
-  
-  
-  
-  Compatibility:
-  
-  
-  bundles Ant 1.3, is compatible with Ant 1.3 to 1.4.1
-  
-  
-  
-  
-  URL:
-  
-  
-  http://www.urbancode.com/projects/anthill/;>http://www.urbancode.com/projects/anthill/
-  
-  
-  
-  
-  Contact:
-  
-  
-  mailto:m...@urbancode.com;>Maciej Zawadzki
-  
-  
-  
-  
-  License:
-  
-  
-  Mozilla-like license
-  
-  
-  
-  
 
 Antigen
   
@@ -581,55 +528,6 @@
   
   
   
-
-Antiplate
-  
-Antiplate is an ant-script that seeds a 
project-structure for typical java-projects,
-including an ant-buildscript with typical targets like compiling, 
create distributions,
-execute tests etc.
-  
-  
-  
-  Compatibility:
-  
-  
-  Ant 1.6 or later
-  
-  
-  
-  
-  URL:
-  
-  
-  http://antiplate.origo.ethz.ch/;>Homepage
-  
-  
-  
-  
-  Contact:
-  
-  
-  mailto:antipl...@mnementh.de;>antipl...@mnementh.de
-  
-  
-  
-  
-  License:
-  
-  
-  Apache License 2.0
-  
-  
-  
-  
 
 Antlion
   
@@ -684,63 +582,6 @@
   
   
   
-
-Ant Script Library
-  
-The Ant Script Library (ASL) is a collection of 
re-usable
-Ant scripts that can be imported into your own projects. The ASL
-provides a number of pre-defined targets that simplify setting up build
-scripts for a new project, bringing re-use and consistency to your own
-Ant scripts.
-  
-  
-  
-  Compatibility:
-  
-  
-  Ant 1.7 or later
-  
-  
-  
-  
-  URL:
-  
-  
-  https://www.exubero.com/asl/;>https://www.exubero.com/asl/
-
-  
-  
-  
-  
-  Contact:
-  
-  
-  mailto:j...@exubero.com;>Joe Schmetzer
-  
-  
-  
-  
-  License:
-  
-  
-  The Apache Software License 2.0
-  
-  
-  
-  
-
-AntShellExt (Ant Shell Extension)
-  
-The domain is sold and we did not found it any 
more.
-  
 
 Antworks
   
@@ -1014,55 +855,6 @@
   
   
   
-
-JAM - JavaGen Ant Modules
-  
-JAM is a m

ant git commit: add a "link" to existing release notes so we could find it better

[jhm]

Repository: ant
Updated Branches:
  refs/heads/1.9.x e06168ca7 -> ea5bb77da


add a "link" to existing release notes so we could find it better


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

Branch: refs/heads/1.9.x
Commit: ea5bb77da3b8d9e6a1b8042ff2e4ae3c1065a091
Parents: e06168c
Author: Jan Matèrne 
Authored: Tue Mar 6 11:36:50 2018 +0100
Committer: Jan Matèrne 
Committed: Tue Mar 6 11:39:50 2018 +0100

--
 ReleaseInstructions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/ea5bb77d/ReleaseInstructions
--
diff --git a/ReleaseInstructions b/ReleaseInstructions
index 27d4c41..a68dccf 100644
--- a/ReleaseInstructions
+++ b/ReleaseInstructions
@@ -159,7 +159,7 @@ Note: This document was updated in the context of releasing 
Ant
 13. Upload the maven artifacts located under java-repository/org/apache/ant
 these artifacts comprise currently for each ant jar of one POM
 file, the corresponding jar file and the corresponding GPG
-signatures (x.pom, x.jar, x.pom.asc, x.jar.asc) MD5 and SHA1 are
+signatures (x.pom, x.jar, x.pom.asc, x.jar.asc) SHA1 are
 generated by ivy during the upload
 
 to

ant git commit: add a "link" to existing release notes so we could find it better

[jhm]

Repository: ant
Updated Branches:
  refs/heads/master 74dfda1d2 -> f02565dbd


add a "link" to existing release notes so we could find it better


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

Branch: refs/heads/master
Commit: f02565dbd10c894620cf65501bd63326ecea9301
Parents: 74dfda1
Author: Jan Matèrne 
Authored: Tue Mar 6 11:36:50 2018 +0100
Committer: Jan Matèrne 
Committed: Tue Mar 6 11:36:50 2018 +0100

--
 ReleaseInstructions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/f02565db/ReleaseInstructions
--
diff --git a/ReleaseInstructions b/ReleaseInstructions
index 7a752fc..b9b4296 100644
--- a/ReleaseInstructions
+++ b/ReleaseInstructions
@@ -160,7 +160,7 @@ Note: This document was adapted from the one created in the 
context of
 13. Upload the maven artifacts located under java-repository/org/apache/ant
 these artifacts comprise currently for each ant jar of one POM
 file, the corresponding jar file and the corresponding GPG
-signatures (x.pom, x.jar, x.pom.asc, x.jar.asc) MD5 and SHA1 are
+signatures (x.pom, x.jar, x.pom.asc, x.jar.asc) SHA1 are
 generated by ivy during the upload
 
 to

ant-ivy git commit: Add "link" to release notes so we could find it better.

[jhm]

Repository: ant-ivy
Updated Branches:
  refs/heads/master afd3f11cd -> 8ed4a9bea


Add "link" to release notes so we could find it better.


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

Branch: refs/heads/master
Commit: 8ed4a9bea706320d97ce2fd3e6545d7ebdf8a49b
Parents: afd3f11
Author: Jan Matèrne 
Authored: Tue Mar 6 11:35:16 2018 +0100
Committer: Jan Matèrne 
Committed: Tue Mar 6 11:35:16 2018 +0100

--
 ReleaseInstructions | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/8ed4a9be/ReleaseInstructions
--
diff --git a/ReleaseInstructions b/ReleaseInstructions
new file mode 100644
index 000..7249aaa
--- /dev/null
+++ b/ReleaseInstructions
@@ -0,0 +1,4 @@
+ReleaseInstructions are in /doc/dev/makerelease.html.
+
+Best you navigate to that via /doc/index.html and follow the navigation
+Documentation | Developer doc | Making a release
\ No newline at end of file

svn commit: r1825596 - /ant/site/ant/build.xml

[jhm]

Author: jhm
Date: Wed Feb 28 19:40:02 2018
New Revision: 1825596

URL: http://svn.apache.org/viewvc?rev=1825596=rev
Log:
new target for updating the (online)manual from Ant's git-repo

Modified:
ant/site/ant/build.xml

Modified: ant/site/ant/build.xml
URL: 
http://svn.apache.org/viewvc/ant/site/ant/build.xml?rev=1825596=1825595=1825596=diff
==
--- ant/site/ant/build.xml (original)
+++ ant/site/ant/build.xml Wed Feb 28 19:40:02 2018
@@ -84,6 +84,37 @@
  encoding="iso-8859-1" outputencoding="utf-8"/>
 
 
+
+
+https://git-wip-us.apache.org/repos/asf/ant.git"/>
+
+
+
+
+
+
+
+
+
+
+
+Copying manual from 1.9.x branch
+
+
+
+
+
+
+
+Copying manual from master branch
+
+
+
+
+
+
+
+
 
 
 

svn commit: r1823436 [2/2] - in /ant/site/ant: production/ sources/

[jhm]

Modified: ant/site/ant/production/resources.html
URL: 
http://svn.apache.org/viewvc/ant/site/ant/production/resources.html?rev=1823436=1823435=1823436=diff
==
--- ant/site/ant/production/resources.html (original)
+++ ant/site/ant/production/resources.html Wed Feb  7 07:11:03 2018
@@ -97,7 +97,7 @@
 Welcome
 
 
-https://www.apache.org/licenses/;>License
+https://www.apache.org/licenses/;>License
 
 
 News
@@ -461,7 +461,7 @@
 This is the original description:
 
 Das Build-Tool Ant ist das Open-Source-Werkzeug, das den 
Entwicklungsprozess einer Java-
-oder J2EE-Anwendung wesentlich vereinfacht. Gesteuert durch 
XML-basierte Skripte führt es
+oder J2EE-Anwendung wesentlich vereinfacht. Gesteuert durch 
XML-basierte Skripte führt es
 nahezu alle Aufgaben aus, die nach dem Kodieren einer Anwendung 
anfallen.
 Some topics:
 
@@ -586,11 +586,11 @@
 A German language short reference for Ant that 
covers Ant
 1.4.  This is the original description:
 
-  Ant kurz  gut enthält eine vollständige Referenz der Built-in Tasks
-  und ihrer jeweiligen Attribute sowie kurze Beispiele für ihre Verwendung.
-  Daneben bietet das Buch eine knappe Einführung in die Arbeit mit Ant und
-  eine Erläuterung der Ant-Basiselemente (Projekte, Properties, Targets und 
Tasks).
-  Behandelt werden außerdem grundlegende Konzepte wie Filesets, Patternsets 
und
+  Ant kurz  gut enthält eine 
vollständige Referenz der Built-in Tasks
+  und ihrer jeweiligen Attribute sowie kurze Beispiele 
für ihre Verwendung.
+  Daneben bietet das Buch eine knappe 
Einführung in die Arbeit mit Ant und
+  eine Erläuterung der Ant-Basiselemente 
(Projekte, Properties, Targets und Tasks).
+  Behandelt werden außerdem grundlegende 
Konzepte wie Filesets, Patternsets und
   Pfadstrukturen, das Schreiben eigener Tasks, die Aufruf-Syntax und Optional 
Tasks. 
   
   
@@ -766,8 +766,8 @@
   
   
   
-
-Programmieren für Ant
+
+Programmieren für Ant
   
 This article describes the main topics of 
programming your own tasks.
 Description is done on five examples.

Modified: ant/site/ant/production/security.html
URL: 
http://svn.apache.org/viewvc/ant/site/ant/production/security.html?rev=1823436=1823435=1823436=diff
==
--- ant/site/ant/production/security.html (original)
+++ ant/site/ant/production/security.html Wed Feb  7 07:11:03 2018
@@ -97,7 +97,7 @@
 Welcome
 
 
-https://www.apache.org/licenses/;>License
+https://www.apache.org/licenses/;>License
 
 
 News
@@ -265,6 +265,22 @@
 the descriptions here are incomplete, please report them
 privately to the Apache Security Team. Thank you.
   
+
+Fixed in Apache Ant 1.9.10 / Ant 1.10.2
+  
+Low: Denial of Service http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-5645;>CVE-2017-5645
+When using Apache Ants Log4jListener there 
could be a security 
+  issue with the underlying Apache Log4j library in version 1.x. 
+  Please note that Log4j 1.x has reached its end of life and is no 
longer 
+  maintained. For details about migrating away from Log4j 1.x please 
+  consult with the Apache Log4j team.
+This was fixed in revisions
+  https://git-wip-us.apache.org/repos/asf?p=ant.git;a=commit;h=2b53103932031a1d2321f5dc890ede55a9833f95;>2b53103932031a1d2321f5dc890ede55a9833f95
 and
+  https://git-wip-us.apache.org/repos/asf?p=ant.git;a=commit;h=146df361556b499f2fa7d34f58a86508b9492652;>146df361556b499f2fa7d34f58a86508b9492652.
+This was first reported to the Security 
Team on 8 January 2018 

svn commit: r1823436 [1/2] - in /ant/site/ant: production/ sources/

[jhm]

Author: jhm
Date: Wed Feb  7 07:11:03 2018
New Revision: 1823436

URL: http://svn.apache.org/viewvc?rev=1823436=rev
Log:
CVE-2017-5645: Apache Ant 1.9.9 and 1.10.1 - Apache  Log4j 1.2.13 security 
vulnerability

Modified:
ant/site/ant/production/antnews.html
ant/site/ant/production/archive.html
ant/site/ant/production/bindownload.html
ant/site/ant/production/bugs.html
ant/site/ant/production/bylaws.html
ant/site/ant/production/contributors.html
ant/site/ant/production/external.html
ant/site/ant/production/faq.html
ant/site/ant/production/git.html
ant/site/ant/production/index.html
ant/site/ant/production/legal.html
ant/site/ant/production/mail.html
ant/site/ant/production/manualdownload.html
ant/site/ant/production/mission.html
ant/site/ant/production/problems.html
ant/site/ant/production/processes.html
ant/site/ant/production/projects.html
ant/site/ant/production/resources.html
ant/site/ant/production/security.html
ant/site/ant/production/srcdownload.html
ant/site/ant/production/svn.html
ant/site/ant/sources/security.xml

Modified: ant/site/ant/production/antnews.html
URL: 
http://svn.apache.org/viewvc/ant/site/ant/production/antnews.html?rev=1823436=1823435=1823436=diff
==
--- ant/site/ant/production/antnews.html (original)
+++ ant/site/ant/production/antnews.html Wed Feb  7 07:11:03 2018
@@ -107,7 +107,7 @@
 Welcome
 
 
-https://www.apache.org/licenses/;>License
+https://www.apache.org/licenses/;>License
 
 
 News

Modified: ant/site/ant/production/archive.html
URL: 
http://svn.apache.org/viewvc/ant/site/ant/production/archive.html?rev=1823436=1823435=1823436=diff
==
--- ant/site/ant/production/archive.html (original)
+++ ant/site/ant/production/archive.html Wed Feb  7 07:11:03 2018
@@ -1,292 +1,292 @@
-
-
-http://www.w3.org/TR/html4/loose.dtd;>
-
-
-
-
-  
-Apache Ant - Archive
-
-  
-  
-  
-
-
-  
-
-  
-
-  
-
-  
-
-
-
-  http://www.google.com/search; method="get">
-
-  
-
-  
-  
-
-
-  
-  
-  
-  
-  
-  the Apache Ant site
-
-
-  
-  
-
-
-
-  
-
-  
-
-  
-
-  
-
-  
-  
-
-  
-  
-
-Home
-
-  
-
-
-  
-
-  Projects
-
-  
-
-
-  
-
-
-  
-
-  
-
-  
-  Apache Ant
-  
-
-Welcome
-
-
-https://www.apache.org/licenses/;>License
-
-
-News
-
-
-Security 
Reports
-
-  
-
-  Documentation
-  
-
-Manual 
1.10.x
-
-
-Manual 
1.9.x
-
-
-Related 
Projects
-
-
-External Tools 
and Tasks
-
-
-Resources
-
-
-Fr

svn commit: r1823435 - /ant/site/ant/sources/stylesheets/templates.vm

[jhm]

Author: jhm
Date: Wed Feb  7 07:10:08 2018
New Revision: 1823435

URL: http://svn.apache.org/viewvc?rev=1823435=rev
Log:
support https:// too

Modified:
ant/site/ant/sources/stylesheets/templates.vm

Modified: ant/site/ant/sources/stylesheets/templates.vm
URL: 
http://svn.apache.org/viewvc/ant/site/ant/sources/stylesheets/templates.vm?rev=1823435=1823434=1823435=diff
==
--- ant/site/ant/sources/stylesheets/templates.vm (original)
+++ ant/site/ant/sources/stylesheets/templates.vm Wed Feb  7 07:10:08 2018
@@ -92,7 +92,7 @@
 #end
 
 #macro ( projectanchor $name $value )
-  #if ($value.startsWith("http://;))
+  #if ($value.startsWith("http://;) || $value.startsWith("https://;))
 $name
   #elseif ($value.startsWith("/site"))
 http://jakarta.apache.org$value;>$name

ant git commit: update to latest Simian (fixed the multi formatter issue)

[jhm]

Repository: ant
Updated Branches:
  refs/heads/1.9.x 49eefb1c9 -> 76933d2e2


update to latest Simian (fixed the multi formatter issue)


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

Branch: refs/heads/1.9.x
Commit: 76933d2e2835b5083f264ce33bdc0f4132c6e68c
Parents: 49eefb1
Author: Jan Matèrne 
Authored: Tue Jan 30 06:58:13 2018 +0100
Committer: Jan Matèrne 
Committed: Tue Jan 30 06:59:31 2018 +0100

--
 check.xml | 14 +++---
 1 file changed, 3 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/76933d2e/check.xml
--
diff --git a/check.xml b/check.xml
index 52f3fb3..b5a6586 100644
--- a/check.xml
+++ b/check.xml
@@ -91,7 +91,7 @@
 
   
   
   http://www.harukizaemon.com/simian/simian-${simian.version}.tar.gz;
@@ -182,6 +182,7 @@
   
 
 
+  Install Simian ${simian.version}
   
   
   
@@ -194,6 +195,7 @@
   
 
 
+Run Simian
 
   
 
@@ -202,17 +204,7 @@
 
 
 
-
 
 
 

[2/2] ant git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ant

[jhm]

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ant


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

Branch: refs/heads/master
Commit: 14bd7590fbc50f5b3146288584f9116e37ee38c1
Parents: 732309b c9025be
Author: Jan Matèrne 
Authored: Tue Jan 30 06:58:56 2018 +0100
Committer: Jan Matèrne 
Committed: Tue Jan 30 06:58:56 2018 +0100

--
 WHATSNEW|  4 +
 manual/Tasks/concat.html|  8 +-
 manual/Tasks/ejb.html   | 92 ++--
 .../ant/taskdefs/optional/image/Image.java  |  3 +
 .../ant/taskdefs/optional/image/ImageTest.java  |  6 +-
 5 files changed, 62 insertions(+), 51 deletions(-)
--

[1/2] ant git commit: update to latest Simian (fixed the multi formatter issue)

[jhm]

Repository: ant
Updated Branches:
  refs/heads/master c9025be06 -> 14bd7590f


update to latest Simian (fixed the multi formatter issue)


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

Branch: refs/heads/master
Commit: 732309b596d17c1083b1bfda4ee13c9c70ae65cb
Parents: 91ab5f0
Author: Jan Matèrne 
Authored: Tue Jan 30 06:58:13 2018 +0100
Committer: Jan Matèrne 
Committed: Tue Jan 30 06:58:13 2018 +0100

--
 check.xml | 14 +++---
 1 file changed, 3 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/732309b5/check.xml
--
diff --git a/check.xml b/check.xml
index 52f3fb3..b5a6586 100644
--- a/check.xml
+++ b/check.xml
@@ -91,7 +91,7 @@
 
   
   
   http://www.harukizaemon.com/simian/simian-${simian.version}.tar.gz;
@@ -182,6 +182,7 @@
   
 
 
+  Install Simian ${simian.version}
   
   
   
@@ -194,6 +195,7 @@
   
 
 
+Run Simian
 
   
 
@@ -202,17 +204,7 @@
 
 
 
-
 
 
 

ant git commit: whatsnew += Log4jListener is deprecated (breaks BWC)

[jhm]

Repository: ant
Updated Branches:
  refs/heads/1.9.x 4ffebc6a1 -> 49eefb1c9


whatsnew += Log4jListener is deprecated (breaks BWC)


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

Branch: refs/heads/1.9.x
Commit: 49eefb1c988e9a12b5cb8e4aa310a18c021b4fec
Parents: 4ffebc6
Author: Jan Matèrne 
Authored: Sun Jan 28 13:30:28 2018 +0100
Committer: Jan Matèrne 
Committed: Sun Jan 28 13:31:38 2018 +0100

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


http://git-wip-us.apache.org/repos/asf/ant/blob/49eefb1c/WHATSNEW
--
diff --git a/WHATSNEW b/WHATSNEW
index 235e723..1430c8d 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -1,6 +1,9 @@
 Changes from Ant 1.9.9 TO Ant 1.9.10
 
 
+ * The Log4jListener is marked as deprecated as the required log4j library
+   (in version 1.x) is not maintained any more.
+
 Fixed bugs:
 ---
 

ant git commit: whatsnew += Log4jListener is deprecated (breaks BWC)

[jhm]

Repository: ant
Updated Branches:
  refs/heads/master 68ca10349 -> 91ab5f02e


whatsnew += Log4jListener is deprecated (breaks BWC)


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

Branch: refs/heads/master
Commit: 91ab5f02e8e90d157986aa5233b2251c38faadba
Parents: 68ca103
Author: Jan Matèrne 
Authored: Sun Jan 28 13:30:28 2018 +0100
Committer: Jan Matèrne 
Committed: Sun Jan 28 13:30:28 2018 +0100

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


http://git-wip-us.apache.org/repos/asf/ant/blob/91ab5f02/WHATSNEW
--
diff --git a/WHATSNEW b/WHATSNEW
index f782bcf..6c090c2 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -23,6 +23,9 @@ Changes that could break older environments:
  * 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.
+
 Fixed bugs:
 ---
 

ant git commit: user actual version of simian

[jhm]

Repository: ant
Updated Branches:
  refs/heads/1.9.x 5892ab045 -> 4ffebc6a1


user actual version of simian


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

Branch: refs/heads/1.9.x
Commit: 4ffebc6a12a8eb68384e0d8e4d7f2eea9656c3a0
Parents: 5892ab0
Author: Jan Matèrne 
Authored: Sun Jan 28 12:51:38 2018 +0100
Committer: Jan Matèrne 
Committed: Sun Jan 28 12:55:28 2018 +0100

--
 check.xml | 12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/4ffebc6a/check.xml
--
diff --git a/check.xml b/check.xml
index 83e16a5..52f3fb3 100644
--- a/check.xml
+++ b/check.xml
@@ -91,7 +91,7 @@
 
   
   
   http://www.harukizaemon.com/simian/simian-${simian.version}.tar.gz;
@@ -202,7 +202,17 @@
 
 
 
+
 
 
 

ant git commit: user actual version of simian

[jhm]

Repository: ant
Updated Branches:
  refs/heads/master de8b97556 -> 68ca10349


user actual version of simian


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

Branch: refs/heads/master
Commit: 68ca103490aff462e0bb52af29f079eb435d6f22
Parents: de8b975
Author: Jan Matèrne 
Authored: Sun Jan 28 12:51:38 2018 +0100
Committer: Jan Matèrne 
Committed: Sun Jan 28 12:51:38 2018 +0100

--
 check.xml | 12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/68ca1034/check.xml
--
diff --git a/check.xml b/check.xml
index 83e16a5..52f3fb3 100644
--- a/check.xml
+++ b/check.xml
@@ -91,7 +91,7 @@
 
   
   
   http://www.harukizaemon.com/simian/simian-${simian.version}.tar.gz;
@@ -202,7 +202,17 @@
 
 
 
+
 
 
 

ant git commit: hint: log4j-bridge requires a newer version of Ant

[jhm]

Repository: ant
Updated Branches:
  refs/heads/1.9.x 294f13b8c -> 6fe6914f6


hint: log4j-bridge requires a newer version of Ant


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

Branch: refs/heads/1.9.x
Commit: 6fe6914f62ab7efa01995ee9d9ed0291fb699b1b
Parents: 294f13b
Author: Jan Matèrne 
Authored: Fri Jan 26 20:00:50 2018 +0100
Committer: Jan Matèrne 
Committed: Fri Jan 26 20:02:05 2018 +0100

--
 manual/listeners.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/6fe6914f/manual/listeners.html
--
diff --git a/manual/listeners.html b/manual/listeners.html
index e201638..7387288 100644
--- a/manual/listeners.html
+++ b/manual/listeners.html
@@ -420,7 +420,7 @@ documentation page.
 
 Using the Log4j 1.2 Bridge
 You could use the http://logging.apache.org/log4j/2.x/log4j-1.2-api/index.html;>Log4j 
Bridge
-if your application is written against the Log4j (1.x) API, but you want to 
use the Log4j 2.x runtime. 
+if your application is written against the Log4j (1.x) API, but you want to 
use the Log4j 2.x runtime.
 For using the bridge with Ant you have to add
 
   log4j-1.2-api-${log4j.version}.jar
@@ -429,6 +429,7 @@ For using the bridge with Ant you have to add
   log4j2.xml
 
 to your classpath (e.g. via the -lib option).
+(For using the bridge Ant 1.9.10/1.10.2 or higher is required.)
 Translating the 1.x properties file into the 2.x xml syntax would result in
 
 ?xml version=1.0 encoding=UTF-8?

ant git commit: hint: log4j-bridge requires a newer version of Ant

[jhm]

Repository: ant
Updated Branches:
  refs/heads/master 1d84c903d -> 21b231f57


hint: log4j-bridge requires a newer version of Ant


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

Branch: refs/heads/master
Commit: 21b231f572b9a16ad1b9602c2dabf9355906cfb5
Parents: 1d84c90
Author: Jan Matèrne 
Authored: Fri Jan 26 20:00:50 2018 +0100
Committer: Jan Matèrne 
Committed: Fri Jan 26 20:00:50 2018 +0100

--
 manual/listeners.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/21b231f5/manual/listeners.html
--
diff --git a/manual/listeners.html b/manual/listeners.html
index e201638..7387288 100644
--- a/manual/listeners.html
+++ b/manual/listeners.html
@@ -420,7 +420,7 @@ documentation page.
 
 Using the Log4j 1.2 Bridge
 You could use the http://logging.apache.org/log4j/2.x/log4j-1.2-api/index.html;>Log4j 
Bridge
-if your application is written against the Log4j (1.x) API, but you want to 
use the Log4j 2.x runtime. 
+if your application is written against the Log4j (1.x) API, but you want to 
use the Log4j 2.x runtime.
 For using the bridge with Ant you have to add
 
   log4j-1.2-api-${log4j.version}.jar
@@ -429,6 +429,7 @@ For using the bridge with Ant you have to add
   log4j2.xml
 
 to your classpath (e.g. via the -lib option).
+(For using the bridge Ant 1.9.10/1.10.2 or higher is required.)
 Translating the 1.x properties file into the 2.x xml syntax would result in
 
 ?xml version=1.0 encoding=UTF-8?

ant git commit: document how to use the Log4j 1.2 Bridge

[jhm]

Repository: ant
Updated Branches:
  refs/heads/1.9.x 6bb1f2f05 -> a1258d875


document how to use the Log4j 1.2 Bridge


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

Branch: refs/heads/1.9.x
Commit: a1258d875c22ee4b3d666ab6fdb9178a6e5136ad
Parents: 6bb1f2f
Author: Jan Matèrne 
Authored: Tue Jan 23 14:25:19 2018 +0100
Committer: Jan Matèrne 
Committed: Tue Jan 23 14:26:24 2018 +0100

--
 manual/listeners.html | 39 +--
 1 file changed, 37 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/a1258d87/manual/listeners.html
--
diff --git a/manual/listeners.html b/manual/listeners.html
index bbb03e0..e201638 100644
--- a/manual/listeners.html
+++ b/manual/listeners.html
@@ -418,6 +418,41 @@ log4j.appender.LogFile.file=build.log
 For more information about configuring Log4J see http://logging.apache.org/log4j/docs/documentation.html;>its
 documentation page.
 
+Using the Log4j 1.2 Bridge
+You could use the http://logging.apache.org/log4j/2.x/log4j-1.2-api/index.html;>Log4j 
Bridge
+if your application is written against the Log4j (1.x) API, but you want to 
use the Log4j 2.x runtime. 
+For using the bridge with Ant you have to add
+
+  log4j-1.2-api-${log4j.version}.jar
+  log4j-api-${log4j.version}.jar
+  log4j-core-${log4j.version}.jar
+  log4j2.xml
+
+to your classpath (e.g. via the -lib option).
+Translating the 1.x properties file into the 2.x xml syntax would result in
+
+?xml version=1.0 encoding=UTF-8?
+Configuration status=WARN
+  Appenders
+File name=file fileName=build.log
+  PatternLayout
+Pattern[%6r] %8c{1} : %m%n/Pattern
+  /PatternLayout
+/File
+  /Appenders
+  Loggers
+Root level=ERROR
+  AppenderRef ref=file level=DEBUG/
+/Root
+Logger name=org.apache.tools.ant.Project 
level=INFO/
+Logger name=org.apache.tools.ant.Project 
level=INFO/
+Logger name=org.apache.tools.ant.taskdefs 
level=INFO/
+Logger name=org.apache.tools.ant.taskdefs.Echo 
level=WARN/
+  /Loggers
+/Configuration
+
+
+
 
 
 XmlLogger
@@ -605,7 +640,7 @@ developers.
 
 
   
-A listener or logger should not write to standard output or error in the 
messageLogged() method;
+A listener or logger should not write to standard output or error in the 
messageLogged() method;
 Ant captures these internally and it will trigger an infinite loop.
   
   
@@ -613,7 +648,7 @@ developers.
 the output is processed. Slow logging means a slow build.
   
   When a build is started, and BuildListener.buildStarted(BuildEvent 
event) is called,
-the project is not fully functional. The build has started, yes, and the 
event.getProject() method call
+the project is not fully functional. The build has started, yes, and the 
event.getProject() method call
 returns the Project instance, but that project is initialized with JVM and 
ant properties, nor has it
 parsed the build file yet. You cannot call 
Project.getProperty() for property lookup, or
 Project.getName() to get the project name (it will return 
null).

ant git commit: document how to use the Log4j 1.2 Bridge

[jhm]

Repository: ant
Updated Branches:
  refs/heads/master 610b0b641 -> 6d42415d9


document how to use the Log4j 1.2 Bridge


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

Branch: refs/heads/master
Commit: 6d42415d95b2a8c920b0dd6206bff2bbaa63a2cb
Parents: 610b0b6
Author: Jan Matèrne 
Authored: Tue Jan 23 14:25:19 2018 +0100
Committer: Jan Matèrne 
Committed: Tue Jan 23 14:25:19 2018 +0100

--
 manual/listeners.html | 39 +--
 1 file changed, 37 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/6d42415d/manual/listeners.html
--
diff --git a/manual/listeners.html b/manual/listeners.html
index bbb03e0..e201638 100644
--- a/manual/listeners.html
+++ b/manual/listeners.html
@@ -418,6 +418,41 @@ log4j.appender.LogFile.file=build.log
 For more information about configuring Log4J see http://logging.apache.org/log4j/docs/documentation.html;>its
 documentation page.
 
+Using the Log4j 1.2 Bridge
+You could use the http://logging.apache.org/log4j/2.x/log4j-1.2-api/index.html;>Log4j 
Bridge
+if your application is written against the Log4j (1.x) API, but you want to 
use the Log4j 2.x runtime. 
+For using the bridge with Ant you have to add
+
+  log4j-1.2-api-${log4j.version}.jar
+  log4j-api-${log4j.version}.jar
+  log4j-core-${log4j.version}.jar
+  log4j2.xml
+
+to your classpath (e.g. via the -lib option).
+Translating the 1.x properties file into the 2.x xml syntax would result in
+
+?xml version=1.0 encoding=UTF-8?
+Configuration status=WARN
+  Appenders
+File name=file fileName=build.log
+  PatternLayout
+Pattern[%6r] %8c{1} : %m%n/Pattern
+  /PatternLayout
+/File
+  /Appenders
+  Loggers
+Root level=ERROR
+  AppenderRef ref=file level=DEBUG/
+/Root
+Logger name=org.apache.tools.ant.Project 
level=INFO/
+Logger name=org.apache.tools.ant.Project 
level=INFO/
+Logger name=org.apache.tools.ant.taskdefs 
level=INFO/
+Logger name=org.apache.tools.ant.taskdefs.Echo 
level=WARN/
+  /Loggers
+/Configuration
+
+
+
 
 
 XmlLogger
@@ -605,7 +640,7 @@ developers.
 
 
   
-A listener or logger should not write to standard output or error in the 
messageLogged() method;
+A listener or logger should not write to standard output or error in the 
messageLogged() method;
 Ant captures these internally and it will trigger an infinite loop.
   
   
@@ -613,7 +648,7 @@ developers.
 the output is processed. Slow logging means a slow build.
   
   When a build is started, and BuildListener.buildStarted(BuildEvent 
event) is called,
-the project is not fully functional. The build has started, yes, and the 
event.getProject() method call
+the project is not fully functional. The build has started, yes, and the 
event.getProject() method call
 returns the Project instance, but that project is initialized with JVM and 
ant properties, nor has it
 parsed the build file yet. You cannot call 
Project.getProperty() for property lookup, or
 Project.getName() to get the project name (it will return 
null).

ant git commit: make the Log4j 1.2 Bridge work

[jhm]

Repository: ant
Updated Branches:
  refs/heads/master f5b174345 -> 610b0b641


make the Log4j 1.2 Bridge work


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

Branch: refs/heads/master
Commit: 610b0b64166c09fcd7155be0e2285ca12c880d15
Parents: f5b1743
Author: Jan Matèrne 
Authored: Tue Jan 23 13:36:35 2018 +0100
Committer: Jan Matèrne 
Committed: Tue Jan 23 13:36:35 2018 +0100

--
 .../tools/ant/listener/Log4jListener.java   | 141 ---
 1 file changed, 59 insertions(+), 82 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/610b0b64/src/main/org/apache/tools/ant/listener/Log4jListener.java
--
diff --git a/src/main/org/apache/tools/ant/listener/Log4jListener.java 
b/src/main/org/apache/tools/ant/listener/Log4jListener.java
index ad9426e..11a4501 100644
--- a/src/main/org/apache/tools/ant/listener/Log4jListener.java
+++ b/src/main/org/apache/tools/ant/listener/Log4jListener.java
@@ -15,11 +15,9 @@
  *  limitations under the License.
  *
  */
-
 package org.apache.tools.ant.listener;
 
 import org.apache.log4j.Logger;
-import org.apache.log4j.helpers.NullEnumeration;
 import org.apache.tools.ant.BuildEvent;
 import org.apache.tools.ant.BuildListener;
 import org.apache.tools.ant.Project;
@@ -41,20 +39,13 @@ public class Log4jListener implements BuildListener {
  */
 public static final String LOG_ANT = "org.apache.tools.ant";
 
-/** Indicates if the listener was initialized. */
-private final boolean initialized;
-
-/**
- * Construct the listener and make sure there is a valid appender.
- */
-public Log4jListener() {
-final Logger log = Logger.getLogger(LOG_ANT);
-final Logger rootLog = Logger.getRootLogger();
-initialized = !(rootLog.getAllAppenders() instanceof NullEnumeration);
-if (!initialized) {
-log.error("No log4j.properties in build area");
-}
-}
+ /**
+ * Construct the listener
+  */
+ public Log4jListener() {
+// trigger the log4j initialization (if at all it's not yet 
initialized)
+ final Logger log = Logger.getLogger(LOG_ANT);
+ }
 
 /**
  * @see BuildListener#buildStarted
@@ -62,10 +53,8 @@ public class Log4jListener implements BuildListener {
  */
 @Override
 public void buildStarted(final BuildEvent event) {
-if (initialized) {
-final Logger log = Logger.getLogger(Project.class.getName());
-log.info("Build started.");
-}
+final Logger log = Logger.getLogger(Project.class.getName());
+log.info("Build started.");
 }
 
 /**
@@ -74,13 +63,11 @@ public class Log4jListener implements BuildListener {
  */
 @Override
 public void buildFinished(final BuildEvent event) {
-if (initialized) {
-final Logger log = Logger.getLogger(Project.class.getName());
-if (event.getException() == null) {
-log.info("Build finished.");
-} else {
-log.error("Build finished with error.", event.getException());
-}
+final Logger log = Logger.getLogger(Project.class.getName());
+if (event.getException() == null) {
+log.info("Build finished.");
+} else {
+log.error("Build finished with error.", event.getException());
 }
 }
 
@@ -90,10 +77,8 @@ public class Log4jListener implements BuildListener {
  */
 @Override
 public void targetStarted(final BuildEvent event) {
-if (initialized) {
-final Logger log = Logger.getLogger(Target.class.getName());
-log.info("Target \"" + event.getTarget().getName() + "\" 
started.");
-}
+final Logger log = Logger.getLogger(Target.class.getName());
+log.info("Target \"" + event.getTarget().getName() + "\" started.");
 }
 
 /**
@@ -102,15 +87,13 @@ public class Log4jListener implements BuildListener {
  */
 @Override
 public void targetFinished(final BuildEvent event) {
-if (initialized) {
-final String targetName = event.getTarget().getName();
-final Logger cat = Logger.getLogger(Target.class.getName());
-if (event.getException() == null) {
-cat.info("Target \"" + targetName + "\" finished.");
-} else {
-cat.error("Target \"" + targetName
-+ "\" finished with error.", event.getException());
-}
+final String targetName = event.getTarget().getName();
+   

ant git commit: clarify version vs. reference

[jhm]

Repository: ant
Updated Branches:
  refs/heads/1.9.x aba4643a3 -> 1465c4581


clarify version vs. reference


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

Branch: refs/heads/1.9.x
Commit: 1465c4581ace84548ec9dfc487d62cfec14d84ad
Parents: aba4643
Author: Jan Matèrne 
Authored: Tue Jan 23 10:14:27 2018 +0100
Committer: Jan Matèrne 
Committed: Tue Jan 23 10:15:31 2018 +0100

--
 manual/listeners.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/1465c458/manual/listeners.html
--
diff --git a/manual/listeners.html b/manual/listeners.html
index 673106f..bbb03e0 100644
--- a/manual/listeners.html
+++ b/manual/listeners.html
@@ -99,7 +99,7 @@ listeners and loggers.
 org.apache.tools.ant.listener.Log4jListener
 
 Passes events to Apache Log4j for highly customizable logging.
-Deprecated: Apache Log4j (1) is not developed any more. Last
+Deprecated: Apache Log4j (1.x) is not developed any more. Last
 release is 1.2.17 from 26-May-2012 and contains vulnerability issues.
 
 BuildListener

ant git commit: clarify version vs. reference

[jhm]

Repository: ant
Updated Branches:
  refs/heads/master 641f81e0e -> f5b174345


clarify version vs. reference


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

Branch: refs/heads/master
Commit: f5b174345dfac0712a61b2a7c9bb2abd4b3cd53d
Parents: 641f81e
Author: Jan Matèrne 
Authored: Tue Jan 23 10:14:27 2018 +0100
Committer: Jan Matèrne 
Committed: Tue Jan 23 10:14:27 2018 +0100

--
 manual/listeners.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/f5b17434/manual/listeners.html
--
diff --git a/manual/listeners.html b/manual/listeners.html
index 673106f..bbb03e0 100644
--- a/manual/listeners.html
+++ b/manual/listeners.html
@@ -99,7 +99,7 @@ listeners and loggers.
 org.apache.tools.ant.listener.Log4jListener
 
 Passes events to Apache Log4j for highly customizable logging.
-Deprecated: Apache Log4j (1) is not developed any more. Last
+Deprecated: Apache Log4j (1.x) is not developed any more. Last
 release is 1.2.17 from 26-May-2012 and contains vulnerability issues.
 
 BuildListener

ant git commit: enhance documentation "write a custom logger"

[jhm]

Repository: ant
Updated Branches:
  refs/heads/1.9.x 7a6d765e0 -> aba4643a3


enhance documentation "write a custom logger"


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

Branch: refs/heads/1.9.x
Commit: aba4643a3847d8af8ba5cbfe4a0ad418dcf5c293
Parents: 7a6d765
Author: Jan Matèrne 
Authored: Mon Jan 22 14:54:08 2018 +0100
Committer: Jan Matèrne 
Committed: Mon Jan 22 14:55:43 2018 +0100

--
 manual/develop.html | 45 +
 1 file changed, 45 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/aba4643a/manual/develop.html
--
diff --git a/manual/develop.html b/manual/develop.html
index ed06d30..31add6a 100644
--- a/manual/develop.html
+++ b/manual/develop.html
@@ -466,6 +466,8 @@ implementing class name to the 
default.properties file in the
 org.apache.tools.ant.taskdefs
 package. Then you can use it as if it were a built-in task.
 
+
+
 
 Build Events
 Ant is capable of generating build events as it performs the tasks 
necessary to build a project.
@@ -522,6 +524,49 @@ been configured.
   simultaneously - for example while Ant is executing
   a parallel task.
 
+
+
+
+
+Example
+Writing an adapter to your favourite log library is very easy.
+Just implent the BuildListener interface, instantiate your logger and delegate
+the message to that instance. 
+When starting your build provide your adapter class and the log library to the
+build classpath and activate your logger via -listener option as
+described above.
+
+
+
+public class MyLogAdapter implements BuildListener {
+
+private MyLogger getLogger() {
+final MyLogger log = 
MyLoggerFactory.getLogger(Project.class.getName());
+return log;
+}
+
+@Override
+public void buildStarted(final BuildEvent event) {
+final MyLogger log = getLogger();
+log.info("Build started.");
+}
+
+@Override
+public void buildFinished(final BuildEvent event) {
+final MyLogger logger = getLogger();
+MyLogLevelEnum loglevel = ... // map event.getPriority() to enum via 
Project.MSG_* constants
+boolean allOK = event.getException() == null;
+String logmessage = ... // create log message using data of the event 
and the message invoked
+logger.log(loglevel, logmessage);
+}
+
+// implement all methods in that way
+}
+
+
+
+
+
 
 Source code integration
 

ant git commit: enhance documentation "write a custom logger"

[jhm]

Repository: ant
Updated Branches:
  refs/heads/master 538b7c9ff -> 641f81e0e


enhance documentation "write a custom logger"


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

Branch: refs/heads/master
Commit: 641f81e0e5bebc7901f77510fed02a2eb9aa4eb3
Parents: 538b7c9
Author: Jan Matèrne 
Authored: Mon Jan 22 14:54:08 2018 +0100
Committer: Jan Matèrne 
Committed: Mon Jan 22 14:54:08 2018 +0100

--
 manual/develop.html | 45 +
 1 file changed, 45 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/641f81e0/manual/develop.html
--
diff --git a/manual/develop.html b/manual/develop.html
index ed06d30..31add6a 100644
--- a/manual/develop.html
+++ b/manual/develop.html
@@ -466,6 +466,8 @@ implementing class name to the 
default.properties file in the
 org.apache.tools.ant.taskdefs
 package. Then you can use it as if it were a built-in task.
 
+
+
 
 Build Events
 Ant is capable of generating build events as it performs the tasks 
necessary to build a project.
@@ -522,6 +524,49 @@ been configured.
   simultaneously - for example while Ant is executing
   a parallel task.
 
+
+
+
+
+Example
+Writing an adapter to your favourite log library is very easy.
+Just implent the BuildListener interface, instantiate your logger and delegate
+the message to that instance. 
+When starting your build provide your adapter class and the log library to the
+build classpath and activate your logger via -listener option as
+described above.
+
+
+
+public class MyLogAdapter implements BuildListener {
+
+private MyLogger getLogger() {
+final MyLogger log = 
MyLoggerFactory.getLogger(Project.class.getName());
+return log;
+}
+
+@Override
+public void buildStarted(final BuildEvent event) {
+final MyLogger log = getLogger();
+log.info("Build started.");
+}
+
+@Override
+public void buildFinished(final BuildEvent event) {
+final MyLogger logger = getLogger();
+MyLogLevelEnum loglevel = ... // map event.getPriority() to enum via 
Project.MSG_* constants
+boolean allOK = event.getException() == null;
+String logmessage = ... // create log message using data of the event 
and the message invoked
+logger.log(loglevel, logmessage);
+}
+
+// implement all methods in that way
+}
+
+
+
+
+
 
 Source code integration
 

[3/3] ant git commit: deprecate Log4jListener

[jhm]

deprecate Log4jListener


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

Branch: refs/heads/1.9.x
Commit: 7a6d765e011398468e4b755b4b5acba0fc6ef41f
Parents: 8b737f0
Author: Jan Matèrne 
Authored: Mon Jan 22 11:13:32 2018 +0100
Committer: Jan Matèrne 
Committed: Mon Jan 22 12:50:23 2018 +0100

--
 manual/listeners.html | 9 +++--
 src/main/org/apache/tools/ant/listener/Log4jListener.java | 7 +--
 2 files changed, 12 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/7a6d765e/manual/listeners.html
--
diff --git a/manual/listeners.html b/manual/listeners.html
index 2015cd5..673106f 100644
--- a/manual/listeners.html
+++ b/manual/listeners.html
@@ -97,7 +97,11 @@ listeners and loggers.
   
 
 org.apache.tools.ant.listener.Log4jListener
-Passes events to Log4j for highly customizable 
logging.
+
+Passes events to Apache Log4j for highly customizable logging.
+Deprecated: Apache Log4j (1) is not developed any more. Last
+release is 1.2.17 from 26-May-2012 and contains vulnerability issues.
+
 BuildListener
   
   
@@ -364,6 +368,8 @@ Background is one of the following:
 
 
 Log4jListener
+Deprecated: Apache Log4j (1) is not developed any more. Last
+release is 1.2.17 from 26-May-2012 and contains vulnerability issues.
 Passes build events to Log4j, using the full classname's of the generator of
 each build event as the category:
 
@@ -436,7 +442,6 @@ is declared at all.
 
 
 
-
 TimestampedLogger
 
   Acts like the default logger, except that the final success/failure message 
also includes

http://git-wip-us.apache.org/repos/asf/ant/blob/7a6d765e/src/main/org/apache/tools/ant/listener/Log4jListener.java
--
diff --git a/src/main/org/apache/tools/ant/listener/Log4jListener.java 
b/src/main/org/apache/tools/ant/listener/Log4jListener.java
index 501b511..3a3cce5 100644
--- a/src/main/org/apache/tools/ant/listener/Log4jListener.java
+++ b/src/main/org/apache/tools/ant/listener/Log4jListener.java
@@ -28,9 +28,12 @@ import org.apache.tools.ant.Task;
 
 
 /**
- *  Listener which sends events to Log4j logging system
- *
+ * Listener which sends events to Log4j logging system.
+ * @deprecated Apache Log4j (1) is not developed any more. Last
+ * release is 1.2.17 from 26-May-2012 and contains vulnerability issues.
+ * Use the standard listener or your own custom listener instead.
  */
+@Deprecated
 public class Log4jListener implements BuildListener {
 
 /** Indicates if the listener was initialized. */

[3/3] ant git commit: deprecate Log4jListener

[jhm]

deprecate Log4jListener


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

Branch: refs/heads/master
Commit: 538b7c9ffee7a18064f7726c8b20faf681adb218
Parents: bb1ebbc
Author: Jan Matèrne 
Authored: Mon Jan 22 11:13:32 2018 +0100
Committer: Jan Matèrne 
Committed: Mon Jan 22 11:13:32 2018 +0100

--
 manual/listeners.html | 9 +++--
 src/main/org/apache/tools/ant/listener/Log4jListener.java | 7 +--
 2 files changed, 12 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/538b7c9f/manual/listeners.html
--
diff --git a/manual/listeners.html b/manual/listeners.html
index 2015cd5..673106f 100644
--- a/manual/listeners.html
+++ b/manual/listeners.html
@@ -97,7 +97,11 @@ listeners and loggers.
   
 
 org.apache.tools.ant.listener.Log4jListener
-Passes events to Log4j for highly customizable 
logging.
+
+Passes events to Apache Log4j for highly customizable logging.
+Deprecated: Apache Log4j (1) is not developed any more. Last
+release is 1.2.17 from 26-May-2012 and contains vulnerability issues.
+
 BuildListener
   
   
@@ -364,6 +368,8 @@ Background is one of the following:
 
 
 Log4jListener
+Deprecated: Apache Log4j (1) is not developed any more. Last
+release is 1.2.17 from 26-May-2012 and contains vulnerability issues.
 Passes build events to Log4j, using the full classname's of the generator of
 each build event as the category:
 
@@ -436,7 +442,6 @@ is declared at all.
 
 
 
-
 TimestampedLogger
 
   Acts like the default logger, except that the final success/failure message 
also includes

http://git-wip-us.apache.org/repos/asf/ant/blob/538b7c9f/src/main/org/apache/tools/ant/listener/Log4jListener.java
--
diff --git a/src/main/org/apache/tools/ant/listener/Log4jListener.java 
b/src/main/org/apache/tools/ant/listener/Log4jListener.java
index b25ad1c..ad9426e 100644
--- a/src/main/org/apache/tools/ant/listener/Log4jListener.java
+++ b/src/main/org/apache/tools/ant/listener/Log4jListener.java
@@ -28,9 +28,12 @@ import org.apache.tools.ant.Task;
 
 
 /**
- *  Listener which sends events to Log4j logging system
- *
+ * Listener which sends events to Log4j logging system.
+ * @deprecated Apache Log4j (1) is not developed any more. Last
+ * release is 1.2.17 from 26-May-2012 and contains vulnerability issues.
+ * Use the standard listener or your own custom listener instead.
  */
+@Deprecated
 public class Log4jListener implements BuildListener {
 
 /**

[1/3] ant git commit: run OWASP-checks against our dependencies (draft)

[jhm]

Repository: ant
Updated Branches:
  refs/heads/master 20537a88e -> 538b7c9ff


run OWASP-checks against our dependencies (draft)


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

Branch: refs/heads/master
Commit: d8278278c499d629d1c9d571b8fc0fae60a93eb8
Parents: 20537a8
Author: Jan Matèrne 
Authored: Mon Jan 22 10:56:02 2018 +0100
Committer: Jan Matèrne 
Committed: Mon Jan 22 10:56:02 2018 +0100

--
 check.xml | 48 +++-
 1 file changed, 43 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/d8278278/check.xml
--
diff --git a/check.xml b/check.xml
index 92d0346..83e16a5 100644
--- a/check.xml
+++ b/check.xml
@@ -34,7 +34,7 @@
   
 
   
-  
+
   
 
   
@@ -229,7 +229,7 @@
inline="true" conf="default" 
pathid="findbugs.real.classpath" transitive="true"/>

 http://findbugs.sourceforge.net/; 
resource="edu/umd/cs/findbugs/anttask/tasks.properties" 
classpathref="findbugs.real.classpath" />
-
+
 
 
 
   
 
-
+
 
 
   
@@ -249,8 +249,8 @@
 
 
   
-  
-  
+
+  
 
 
   
 
+  
+http://dl.bintray.com/jeremy-long/owasp/dependency-check-ant-3.1.0-release.zip"/>
+
+
+
+
+
+
+  
+
+  
+
+
+
+  
+  
+  
+
+
+
+  
+  
+
+  
+
+https://jeremylong.github.io/;>
+  
+
+
+https://jeremylong.github.io/;
+projectName="${ant.project.name}"
+>
+  
+  
+
+  
+
 

[2/3] ant git commit: update Log4J dependency

[jhm]

update Log4J dependency


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

Branch: refs/heads/master
Commit: bb1ebbc65b834aed1279b9b733ae9049c52531ec
Parents: d827827
Author: Jan Matèrne 
Authored: Mon Jan 22 11:03:10 2018 +0100
Committer: Jan Matèrne 
Committed: Mon Jan 22 11:03:10 2018 +0100

--
 src/etc/poms/ant-apache-log4j/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/bb1ebbc6/src/etc/poms/ant-apache-log4j/pom.xml
--
diff --git a/src/etc/poms/ant-apache-log4j/pom.xml 
b/src/etc/poms/ant-apache-log4j/pom.xml
index 71400be..e85dd38 100644
--- a/src/etc/poms/ant-apache-log4j/pom.xml
+++ b/src/etc/poms/ant-apache-log4j/pom.xml
@@ -44,7 +44,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/ma
 
   log4j
   log4j
-  1.2.14
+  1.2.17
   compile
 
   

[1/2] ant-ivy git commit: update BouncyCastle

[jhm]

Repository: ant-ivy
Updated Branches:
  refs/heads/master b126634a2 -> a00e85f93


update BouncyCastle


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

Branch: refs/heads/master
Commit: 889ed9e41398504e634d33a81cdab6cd8e236edd
Parents: b126634
Author: Jan Matèrne 
Authored: Mon Sep 25 10:27:45 2017 +0200
Committer: Jan Matèrne 
Committed: Mon Sep 25 10:27:45 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/889ed9e4/ivy.xml
--
diff --git a/ivy.xml b/ivy.xml
index c6fe7b7..3ba878a 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -51,8 +51,8 @@
 
 
 
-
-
+
+
 
 
 

[2/2] ant-ivy git commit: externalize versions (ivy.xml-->versions.properties)

[jhm]

externalize versions (ivy.xml-->versions.properties)


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

Branch: refs/heads/master
Commit: a00e85f93cfa36cc697a26c5b31a282a0d12f8d5
Parents: 889ed9e
Author: Jan Matèrne 
Authored: Mon Sep 25 11:43:40 2017 +0200
Committer: Jan Matèrne 
Committed: Mon Sep 25 11:43:40 2017 +0200

--
 ivy.xml| 33 +
 version.properties | 17 +
 2 files changed, 34 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/a00e85f9/ivy.xml
--
diff --git a/ivy.xml b/ivy.xml
index 3ba878a..e6ee31f 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -42,25 +42,26 @@
 
 
 
+
 
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
 
 
-
-
-
-
-
-
+
+
+
+
+
+
 
 
 

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/a00e85f9/version.properties
--
diff --git a/version.properties b/version.properties
index 394de0f..7b1a0ba 100644
--- a/version.properties
+++ b/version.properties
@@ -22,3 +22,20 @@ target.ivy.bundle.version=2.5.0
 # in case we want to add a qualifier such as alpha, beta, etc...
 # if non empty, add a '_' at the end of the qualifier, so the version would 
look like 1.2.3.alpha_200901011200
 target.ivy.bundle.version.qualifier=alpha_
+
+
+# Versions of dependencies
+#--
+# '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
+ant-contrib.version=1.0b3
+bouncycastle.version=1.58
+commons-vfs2.version=2.1
+hamcrest.version=1.3
+httpclient.version=4.5.3
+jsch.agentproxy.version=0.0.9
+jsch.version=0.1.54
+junit.version=4.12
+oro.version=2.0.8
+xmlunit.version=1.6
\ No newline at end of file

[10/11] ant-ivy git commit: Merge branch 'PR-43'

[jhm]

Merge branch 'PR-43'


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

Branch: refs/heads/master
Commit: c7d4b539bd0684c22950ecf64684f0dcfe36ba7e
Parents: 545536e 3b28fff
Author: Jan Matèrne 
Authored: Wed Jun 14 10:53:58 2017 +0200
Committer: Jan Matèrne 
Committed: Wed Jun 14 10:53:58 2017 +0200

--
 ivy.xml |  32 ++---
 src/example/bintray/ivy.xml |  10 +-
 .../chainedresolvers-project/ivy.xml|   4 +-
 src/example/configurations/jdbc-example/ivy.xml |  32 ++---
 .../src/example/ConfigurationsExample.java  |   9 +-
 .../multi-projects/filter-framework/ivy.xml |  18 +--
 .../src/filter/FilterProvider.java  |   4 +-
 .../src/filter/ccimpl/CCFilter.java |  14 +--
 .../src/filter/hmimpl/HMFilter.java |  11 +-
 .../test/filter/AbstractTestFilter.java |   1 -
 .../configurations/multi-projects/myapp/ivy.xml |  12 +-
 src/example/dependence/dependee/ivy.xml |   4 +-
 src/example/dependence/depender/ivy.xml |   4 +-
 src/example/dual/project/ivy.xml|   4 +-
 src/example/dual/project/src/example/Hello.java |  51 
 .../dual/project/src/example/HelloIvy.java  |  51 
 src/example/hello-ivy/ivy.xml   |   6 +-
 src/example/hello-ivy/src/example/Hello.java|  51 
 .../hello-ivy/src/example/HelloConsole.java |  51 
 .../multi-project/projects/console/ivy.xml  |  12 +-
 .../projects/console/src/console/Main.java  |  10 +-
 src/example/multi-project/projects/find/ivy.xml |  14 +--
 .../projects/find/src/find/FindFile.java|  24 ++--
 .../projects/find/src/find/Main.java|  36 +++---
 src/example/multi-project/projects/list/ivy.xml |  10 +-
 .../projects/list/src/list/ListFile.java|  16 +--
 .../projects/list/src/list/Main.java|  25 ++--
 src/example/multi-project/projects/size/ivy.xml |   8 +-
 .../projects/size/src/size/FileSize.java|  19 +--
 .../multi-project/projects/sizewhere/ivy.xml|  14 +--
 .../projects/sizewhere/src/sizewhere/Main.java  |  32 ++---
 .../sizewhere/src/sizewhere/SizeWhere.java  |   9 +-
 .../multi-project/projects/version/ivy.xml  |   4 +-
 .../projects/version/src/version/Version.java   |   4 +-
 .../ivy/core/cache/RepositoryCacheManager.java  |  18 +--
 .../plugins/repository/ssh/SshRepository.java   |  10 +-
 .../ivy/plugins/repository/vfs/VfsResource.java |   8 +-
 src/java/org/apache/ivy/util/FileUtil.java  |   2 +-
 test/java/org/apache/ivy/TestFixture.java   |   3 +-
 test/java/org/apache/ivy/TestHelper.java|  43 +++
 .../apache/ivy/ant/AntBuildResolverTest.java|  12 +-
 .../org/apache/ivy/ant/AntCallTriggerTest.java  |  11 +-
 .../org/apache/ivy/ant/BuildOBRTaskTest.java|   5 +-
 .../org/apache/ivy/ant/FixDepsTaskTest.java |   9 +-
 .../org/apache/ivy/ant/IvyBuildListTest.java|   7 +-
 .../java/org/apache/ivy/ant/IvyDeliverTest.java |  49 
 .../apache/ivy/ant/IvyPostResolveTaskTest.java  |  69 ++-
 .../java/org/apache/ivy/ant/IvyResolveTest.java |   2 +-
 .../org/apache/ivy/ant/IvyResourcesTest.java|  11 +-
 .../core/module/descriptor/IvyMakePomTest.java  |  13 +--
 .../apache/ivy/core/module/id/ModuleIdTest.java |   1 +
 .../ivy/core/publish/PublishEventsTest.java |  24 ++--
 .../ivy/core/report/ResolveReportTest.java  |   4 +-
 .../apache/ivy/core/resolve/ResolveTest.java| 116 +--
 .../apache/ivy/core/retrieve/RetrieveTest.java  |   2 +-
 .../org/apache/ivy/core/search/SearchTest.java  |  18 +--
 .../java/org/apache/ivy/core/sort/SortTest.java |  97 
 .../ivy/osgi/core/ManifestParserTest.java   |   4 +-
 .../ivy/osgi/core/OsgiLatestStrategyTest.java   |  12 +-
 .../apache/ivy/osgi/obr/OBRResolverTest.java|   6 +-
 .../apache/ivy/osgi/obr/OBRXMLWriterTest.java   |  12 +-
 .../conflict/LatestConflictManagerTest.java |  20 +---
 .../latest/LatestRevisionStrategyTest.java  |  16 ++-
 .../plugins/lock/ArtifactLockStrategyTest.java  |   6 +-
 .../matcher/AbstractPatternMatcherTest.java |  16 +--
 .../xml/XmlModuleDescriptorParserTest.java  |  36 +++---
 .../parser/xml/XmlModuleUpdaterTest.java|  18 +--
 .../repository/vfs/VfsRepositoryTest.java   |  33 ++
 .../plugins/repository/vfs/VfsResourceTest.java |  50 +++-
 .../plugins/repository/vfs/VfsTestHelper.java   |  10 +-
 .../ivy/plugins/repository/vfs/VfsURI.java  |  41 ---
 .../ivy/plugins/resolver/ChainResolverTest.java |  16 +--
 .../plugins/resolver/IBiblioResolverTest.java   |   4 +-
 

[05/11] ant-ivy git commit: Complete generification of examples; update example dependencies; use Java 7 syntax in test; fix regression in ModuleIdTest

[jhm]

Complete generification of examples; update example dependencies; use Java 7 
syntax in test; fix regression in ModuleIdTest

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

Branch: refs/heads/master
Commit: fb3ccf60e9a2d55a1abe8aafe38e45861e7a8eac
Parents: 314dfa8
Author: twogee 
Authored: Tue Jun 13 19:35:37 2017 +0200
Committer: twogee 
Committed: Tue Jun 13 19:35:37 2017 +0200

--
 src/example/bintray/ivy.xml | 10 ++--
 .../chainedresolvers-project/ivy.xml|  4 +-
 src/example/configurations/jdbc-example/ivy.xml | 32 ++---
 .../src/example/ConfigurationsExample.java  |  9 ++--
 .../multi-projects/filter-framework/ivy.xml | 18 +++
 .../src/filter/FilterProvider.java  |  4 +-
 .../src/filter/ccimpl/CCFilter.java | 12 ++---
 .../src/filter/hmimpl/HMFilter.java |  8 ++--
 .../configurations/multi-projects/myapp/ivy.xml | 12 ++---
 src/example/dependence/dependee/ivy.xml |  4 +-
 src/example/dependence/depender/ivy.xml |  4 +-
 src/example/dual/project/ivy.xml|  4 +-
 .../dual/project/src/example/HelloIvy.java  |  4 +-
 src/example/hello-ivy/ivy.xml   |  6 +--
 .../hello-ivy/src/example/HelloConsole.java | 14 +++---
 .../multi-project/projects/console/ivy.xml  | 12 ++---
 .../projects/console/src/console/Main.java  | 10 ++--
 src/example/multi-project/projects/find/ivy.xml | 14 +++---
 .../projects/find/src/find/FindFile.java| 24 +-
 .../projects/find/src/find/Main.java| 34 +++---
 src/example/multi-project/projects/list/ivy.xml | 10 ++--
 .../projects/list/src/list/ListFile.java| 11 +++--
 .../projects/list/src/list/Main.java| 18 ---
 src/example/multi-project/projects/size/ivy.xml |  8 ++--
 .../projects/size/src/size/FileSize.java| 18 +++
 .../multi-project/projects/sizewhere/ivy.xml| 14 +++---
 .../projects/sizewhere/src/sizewhere/Main.java  | 32 ++---
 .../sizewhere/src/sizewhere/SizeWhere.java  |  9 ++--
 .../multi-project/projects/version/ivy.xml  |  4 +-
 .../projects/version/src/version/Version.java   |  4 +-
 .../org/apache/ivy/ant/AntCallTriggerTest.java  |  5 +-
 .../org/apache/ivy/ant/BuildOBRTaskTest.java|  5 +-
 .../org/apache/ivy/ant/FixDepsTaskTest.java |  2 +-
 .../java/org/apache/ivy/ant/IvyDeliverTest.java | 49 +---
 .../apache/ivy/core/module/id/ModuleIdTest.java |  1 +
 35 files changed, 211 insertions(+), 218 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/fb3ccf60/src/example/bintray/ivy.xml
--
diff --git a/src/example/bintray/ivy.xml b/src/example/bintray/ivy.xml
index 120a43b..9b9721c 100644
--- a/src/example/bintray/ivy.xml
+++ b/src/example/bintray/ivy.xml
@@ -20,12 +20,12 @@
 
 
 
-
-
-
+
+
+
 
-
+
 
-
+
 
 

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/fb3ccf60/src/example/chained-resolvers/chainedresolvers-project/ivy.xml
--
diff --git a/src/example/chained-resolvers/chainedresolvers-project/ivy.xml 
b/src/example/chained-resolvers/chainedresolvers-project/ivy.xml
index 450d0a6..5509889 100644
--- a/src/example/chained-resolvers/chainedresolvers-project/ivy.xml
+++ b/src/example/chained-resolvers/chainedresolvers-project/ivy.xml
@@ -14,12 +14,12 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied.  See the License for the
specific language governing permissions and limitations
-   under the License.
+   under the License.
 -->
 
 
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/fb3ccf60/src/example/configurations/jdbc-example/ivy.xml
--
diff --git a/src/example/configurations/jdbc-example/ivy.xml 
b/src/example/configurations/jdbc-example/ivy.xml
index 8e42350..ee8a82c 100644
--- a/src/example/configurations/jdbc-example/ivy.xml
+++ b/src/example/configurations/jdbc-example/ivy.xml
@@ -15,30 +15,30 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied.  See the License for the
specific language governing permissions and limitations
-   under the License.
+   under the License.
 -->
 
 
-   
-   This 

[09/11] ant-ivy git commit: More Java 7 diamonds

[jhm]

More Java 7 diamonds

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

Branch: refs/heads/master
Commit: 3b28fffbbac2a707906e35c7c014aa3eecef3510
Parents: 973704d
Author: twogee 
Authored: Tue Jun 13 22:07:19 2017 +0200
Committer: twogee 
Committed: Tue Jun 13 22:07:19 2017 +0200

--
 .../org/apache/ivy/ant/AntCallTriggerTest.java  |  6 ++--
 .../org/apache/ivy/ant/IvyBuildListTest.java|  3 +-
 .../org/apache/ivy/ant/IvyResourcesTest.java|  6 ++--
 .../ivy/core/publish/PublishEventsTest.java |  8 ++---
 .../apache/ivy/core/retrieve/RetrieveTest.java  |  2 +-
 .../ivy/osgi/core/OsgiLatestStrategyTest.java   | 12 +++
 .../latest/LatestRevisionStrategyTest.java  | 16 -
 .../xml/XmlModuleDescriptorParserTest.java  | 36 ++--
 .../ivy/plugins/resolver/MockResolver.java  |  2 +-
 9 files changed, 44 insertions(+), 47 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/3b28fffb/test/java/org/apache/ivy/ant/AntCallTriggerTest.java
--
diff --git a/test/java/org/apache/ivy/ant/AntCallTriggerTest.java 
b/test/java/org/apache/ivy/ant/AntCallTriggerTest.java
index f92a714..1383366 100644
--- a/test/java/org/apache/ivy/ant/AntCallTriggerTest.java
+++ b/test/java/org/apache/ivy/ant/AntCallTriggerTest.java
@@ -61,12 +61,12 @@ public class AntCallTriggerTest {
 }
 
 private void runAnt(File buildFile, String target, int messageLevel) 
throws BuildException {
-Vector targets = new Vector();
+Vector targets = new Vector<>();
 targets.add(target);
 runAnt(buildFile, targets, messageLevel);
 }
 
-private void runAnt(File buildFile, Vector targets, int messageLevel) 
throws BuildException {
+private void runAnt(File buildFile, Vector targets, int 
messageLevel) throws BuildException {
 runBuild(buildFile, targets, messageLevel);
 
 // this exits the jvm at the end of the call
@@ -92,7 +92,7 @@ public class AntCallTriggerTest {
 // 

 // miserable copy (updated to simple test cases) from ant Main class:
 // the only available way I found to easily run ant exits jvm at the end
-private void runBuild(File buildFile, Vector targets, int messageLevel) 
throws BuildException {
+private void runBuild(File buildFile, Vector targets, int 
messageLevel) throws BuildException {
 
 final Project project = new Project();
 project.setCoreLoader(null);

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/3b28fffb/test/java/org/apache/ivy/ant/IvyBuildListTest.java
--
diff --git a/test/java/org/apache/ivy/ant/IvyBuildListTest.java 
b/test/java/org/apache/ivy/ant/IvyBuildListTest.java
index cb5b4e4..01c0452 100644
--- a/test/java/org/apache/ivy/ant/IvyBuildListTest.java
+++ b/test/java/org/apache/ivy/ant/IvyBuildListTest.java
@@ -18,6 +18,7 @@
 package org.apache.ivy.ant;
 
 import java.io.File;
+import java.net.URI;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -383,7 +384,7 @@ public class IvyBuildListTest {
 assertListOfFiles("test/buildlist/", new String[] {"B", "C", "A", 
"D"}, files);
 
 // the order of E and E2 is undefined
-List other = new ArrayList();
+List other = new ArrayList<>();
 other.add(new File(files[4]).getAbsoluteFile().toURI());
 other.add(new File(files[5]).getAbsoluteFile().toURI());
 Collections.sort(other);

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/3b28fffb/test/java/org/apache/ivy/ant/IvyResourcesTest.java
--
diff --git a/test/java/org/apache/ivy/ant/IvyResourcesTest.java 
b/test/java/org/apache/ivy/ant/IvyResourcesTest.java
index ab60e6d..3103553 100644
--- a/test/java/org/apache/ivy/ant/IvyResourcesTest.java
+++ b/test/java/org/apache/ivy/ant/IvyResourcesTest.java
@@ -63,8 +63,8 @@ public class IvyResourcesTest {
 return resources.getIvyInstance();
 }
 
-private List asList(IvyResources ivyResources) {
-List resources = new ArrayList();
+private List asList(IvyResources ivyResources) {
+List resources = new ArrayList<>();
 for (Object r : ivyResources) {
 assertTrue(r instanceof FileResource);
 resources.add(((FileResource) r).getFile());
@@ -202,7 +202,7 @@ public class IvyResourcesTest {
 

[02/11] ant-ivy git commit: Generics and other fixes in tests and tutorials

[jhm]

Generics and other fixes in tests and tutorials

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

Branch: refs/heads/master
Commit: 8b9f2d5177c849b37809ab38035e1d757d963314
Parents: 4c6450f
Author: twogee 
Authored: Sat Jun 10 08:56:44 2017 +0200
Committer: twogee 
Committed: Sat Jun 10 21:47:21 2017 +0200

--
 ivy.xml | 32 +++
 .../src/filter/ccimpl/CCFilter.java |  4 +-
 .../src/filter/hmimpl/HMFilter.java |  4 +-
 .../test/filter/AbstractTestFilter.java |  1 -
 src/example/dual/project/src/example/Hello.java | 51 --
 .../dual/project/src/example/HelloIvy.java  | 51 ++
 src/example/hello-ivy/src/example/Hello.java| 51 --
 .../hello-ivy/src/example/HelloConsole.java | 51 ++
 .../projects/find/src/find/FindFile.java|  2 +-
 .../projects/find/src/find/Main.java|  4 +-
 .../projects/list/src/list/ListFile.java|  5 +-
 .../projects/size/src/size/FileSize.java|  5 +-
 .../ivy/plugins/repository/vfs/VfsResource.java |  8 +-
 test/java/org/apache/ivy/TestFixture.java   |  3 +-
 test/java/org/apache/ivy/TestHelper.java| 42 -
 .../apache/ivy/ant/AntBuildResolverTest.java| 12 +--
 .../org/apache/ivy/ant/FixDepsTaskTest.java |  9 +-
 .../org/apache/ivy/ant/IvyBuildListTest.java|  4 +-
 .../java/org/apache/ivy/ant/IvyDeliverTest.java | 10 +-
 .../apache/ivy/ant/IvyPostResolveTaskTest.java  | 69 +++---
 .../java/org/apache/ivy/ant/IvyResolveTest.java |  2 +-
 .../org/apache/ivy/ant/IvyResourcesTest.java|  5 +-
 .../apache/ivy/core/module/id/ModuleIdTest.java |  2 +-
 .../ivy/core/publish/PublishEventsTest.java |  5 +-
 .../org/apache/ivy/core/search/SearchTest.java  | 18 ++--
 .../java/org/apache/ivy/core/sort/SortTest.java | 97 ++--
 .../conflict/LatestConflictManagerTest.java | 20 +---
 .../matcher/AbstractPatternMatcherTest.java | 16 ++--
 .../parser/xml/XmlModuleUpdaterTest.java| 18 ++--
 .../repository/vfs/VfsRepositoryTest.java   | 33 ++-
 .../plugins/repository/vfs/VfsResourceTest.java | 50 --
 .../plugins/repository/vfs/VfsTestHelper.java   | 10 +-
 .../ivy/plugins/resolver/ChainResolverTest.java | 16 ++--
 .../plugins/resolver/IBiblioResolverTest.java   |  4 +-
 .../ivy/util/url/ApacheURLListerTest.java   | 20 ++--
 35 files changed, 336 insertions(+), 398 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/8b9f2d51/ivy.xml
--
diff --git a/ivy.xml b/ivy.xml
index f2f7e86..d7417c8 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -26,7 +26,7 @@
 Apache Ivy is a tool for managing (recording, tracking, resolving and 
reporting) project dependencies.
 
 
-
+
 
 
 
@@ -35,32 +35,32 @@
 
 
 
-
-
+
+
 
 
 
 
 
 
-
+
 
-
-
-
-
-
-
+
+
+
+
+
+
 
 
 
 
-
-
-
-
-
-
+
+
+
+
+
+
 
 
 

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/8b9f2d51/src/example/configurations/multi-projects/filter-framework/src/filter/ccimpl/CCFilter.java
--
diff --git 
a/src/example/configurations/multi-projects/filter-framework/src/filter/ccimpl/CCFilter.java
 
b/src/example/configurations/multi-projects/filter-framework/src/filter/ccimpl/CCFilter.java
index 3dd8abb..2dc71c4 100644
--- 
a/src/example/configurations/multi-projects/filter-framework/src/filter/ccimpl/CCFilter.java
+++ 
b/src/example/configurations/multi-projects/filter-framework/src/filter/ccimpl/CCFilter.java
@@ -34,12 +34,12 @@ public class CCFilter implements IFilter {
 return values;
 }
 
-List result = new ArrayList(Arrays.asList(values));
+List result = new ArrayList(Arrays.asList(values));
 CollectionUtils.filter(result, new Predicate() {
 public boolean evaluate(Object o) {
 return o != null && o.toString().startsWith(prefix);
 }
 });
-return (String[]) result.toArray(new String[result.size()]);
+return result.toArray(new String[result.size()]);
 }
 }

[06/11] ant-ivy git commit: Untabify

[jhm]

Untabify

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

Branch: refs/heads/master
Commit: d7651dce4016976d41d71d07d9f5e7f4bebda902
Parents: fb3ccf6
Author: twogee 
Authored: Tue Jun 13 19:49:25 2017 +0200
Committer: twogee 
Committed: Tue Jun 13 19:49:25 2017 +0200

--
 .../hello-ivy/src/example/HelloConsole.java   |  2 +-
 .../projects/find/src/find/Main.java  |  4 ++--
 .../projects/list/src/list/Main.java  |  2 +-
 .../ivy/core/cache/RepositoryCacheManager.java| 18 +-
 .../ivy/plugins/repository/ssh/SshRepository.java | 10 +-
 src/java/org/apache/ivy/util/FileUtil.java|  2 +-
 6 files changed, 19 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/d7651dce/src/example/hello-ivy/src/example/HelloConsole.java
--
diff --git a/src/example/hello-ivy/src/example/HelloConsole.java 
b/src/example/hello-ivy/src/example/HelloConsole.java
index 1d32c35..4f9aa01 100644
--- a/src/example/hello-ivy/src/example/HelloConsole.java
+++ b/src/example/hello-ivy/src/example/HelloConsole.java
@@ -30,7 +30,7 @@ import org.apache.commons.lang.WordUtils;
 public final class HelloConsole {
 public static void main(String[] args) throws Exception {
 Option msg = Option.builder("m")
-   .longOpt("message")
+.longOpt("message")
 .hasArg()
 .desc("the message to capitalize")
 .build();

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/d7651dce/src/example/multi-project/projects/find/src/find/Main.java
--
diff --git a/src/example/multi-project/projects/find/src/find/Main.java 
b/src/example/multi-project/projects/find/src/find/Main.java
index 731f168..ef2aa82 100644
--- a/src/example/multi-project/projects/find/src/find/Main.java
+++ b/src/example/multi-project/projects/find/src/find/Main.java
@@ -31,12 +31,12 @@ import java.util.Collection;
 public final class Main {
 private static Options getOptions() {
 Option dir = Option.builder("d")
-   .longOpt("dir")
+.longOpt("dir")
 .hasArg()
 .desc("list files in given dir")
 .build();
 Option name = Option.builder("n")
-   .longOpt("name")
+.longOpt("name")
 .hasArg()
 .desc("list files with given name")
 .build();

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/d7651dce/src/example/multi-project/projects/list/src/list/Main.java
--
diff --git a/src/example/multi-project/projects/list/src/list/Main.java 
b/src/example/multi-project/projects/list/src/list/Main.java
index c45f0d9..a230d2b 100644
--- a/src/example/multi-project/projects/list/src/list/Main.java
+++ b/src/example/multi-project/projects/list/src/list/Main.java
@@ -30,7 +30,7 @@ import org.apache.commons.cli.ParseException;
 public final class Main {
 private static Options getOptions() {
 Option dir = Option.builder("d")
-   .longOpt("dir")
+.longOpt("dir")
 .hasArg()
 .desc("list files in given dir")
 .build();

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/d7651dce/src/java/org/apache/ivy/core/cache/RepositoryCacheManager.java
--
diff --git a/src/java/org/apache/ivy/core/cache/RepositoryCacheManager.java 
b/src/java/org/apache/ivy/core/cache/RepositoryCacheManager.java
index b2b3e77..c45d4d1 100644
--- a/src/java/org/apache/ivy/core/cache/RepositoryCacheManager.java
+++ b/src/java/org/apache/ivy/core/cache/RepositoryCacheManager.java
@@ -114,8 +114,8 @@ public interface RepositoryCacheManager {
  */
 ArtifactDownloadReport downloadRepositoryResource(Resource resource, 
String name,
   String type, String 
extension,
-   
  CacheResourceOptions options,
-   
  Repository repository);
+  CacheResourceOptions 
options,
+  Repository repository);
 
 /**
  * Caches an original 

[03/11] ant-ivy git commit: More foreach loops

[jhm]

More foreach loops

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

Branch: refs/heads/master
Commit: 8f35a1d28e795833e6a095ff55ecc37f3db882aa
Parents: 8b9f2d5
Author: twogee 
Authored: Sun Jun 11 00:26:54 2017 +0200
Committer: twogee 
Committed: Sun Jun 11 00:26:54 2017 +0200

--
 .../filter-framework/src/filter/hmimpl/HMFilter.java| 3 +--
 src/example/dual/project/src/example/HelloIvy.java  | 4 ++--
 src/example/hello-ivy/src/example/HelloConsole.java | 4 ++--
 src/example/multi-project/projects/list/src/list/Main.java  | 9 -
 4 files changed, 9 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/8f35a1d2/src/example/configurations/multi-projects/filter-framework/src/filter/hmimpl/HMFilter.java
--
diff --git 
a/src/example/configurations/multi-projects/filter-framework/src/filter/hmimpl/HMFilter.java
 
b/src/example/configurations/multi-projects/filter-framework/src/filter/hmimpl/HMFilter.java
index bcb2e1d..6e8b0ad 100644
--- 
a/src/example/configurations/multi-projects/filter-framework/src/filter/hmimpl/HMFilter.java
+++ 
b/src/example/configurations/multi-projects/filter-framework/src/filter/hmimpl/HMFilter.java
@@ -31,8 +31,7 @@ public class HMFilter implements IFilter {
 return values;
 }
 List result = new ArrayList();
-for (int i = 0; i < values.length; i++) {
-String string = values[i];
+for (String string : values) {
 if (string != null && string.startsWith(prefix)) {
 result.add(string);
 }

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/8f35a1d2/src/example/dual/project/src/example/HelloIvy.java
--
diff --git a/src/example/dual/project/src/example/HelloIvy.java 
b/src/example/dual/project/src/example/HelloIvy.java
index bc84237..6125ff0 100644
--- a/src/example/dual/project/src/example/HelloIvy.java
+++ b/src/example/dual/project/src/example/HelloIvy.java
@@ -25,7 +25,7 @@ import org.apache.commons.lang.WordUtils;
  * Simple hello world example to show how easy it is to retrieve libs with ivy,
  * including transitive dependencies
  */
-public final class Hello {
+public final class HelloIvy {
 public static void main(String[] args) throws Exception {
 String  message = "hello ivy !";
 System.out.println("standard message : " + message);
@@ -46,6 +46,6 @@ public final class Hello {
 System.out.println("found logging class in classpath: " + clss);
 }
 
-private Hello() {
+private HelloIvy() {
 }
 }

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/8f35a1d2/src/example/hello-ivy/src/example/HelloConsole.java
--
diff --git a/src/example/hello-ivy/src/example/HelloConsole.java 
b/src/example/hello-ivy/src/example/HelloConsole.java
index f3d0d45..c3e51d1 100644
--- a/src/example/hello-ivy/src/example/HelloConsole.java
+++ b/src/example/hello-ivy/src/example/HelloConsole.java
@@ -28,7 +28,7 @@ import org.apache.commons.lang.WordUtils;
 /**
  * Simple example to show how easy it is to retrieve transitive libs with ivy 
!!!
  */
-public final class Hello {
+public final class HelloConsole {
 public static void main(String[] args) throws Exception {
 Option msg = OptionBuilder.withArgName("msg")
 .hasArg()
@@ -46,6 +46,6 @@ public final class Hello {
 + " : " + WordUtils.capitalizeFully(message));
 }
 
-private Hello() {
+private HelloConsole() {
 }
 }

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/8f35a1d2/src/example/multi-project/projects/list/src/list/Main.java
--
diff --git a/src/example/multi-project/projects/list/src/list/Main.java 
b/src/example/multi-project/projects/list/src/list/Main.java
index 5ae5c8d..c9915b6 100644
--- a/src/example/multi-project/projects/list/src/list/Main.java
+++ b/src/example/multi-project/projects/list/src/list/Main.java
@@ -51,11 +51,10 @@ public final class Main {
 
 CommandLine line = parser.parse(options, args);
 File dir = new File(line.getOptionValue("dir", "."));
-Collection files = ListFile.list(dir);
-System.out.println("listing files in " + dir);
-for (Iterator it = files.iterator(); it.hasNext();) {
-  System.out.println("\t" + it.next() + "\n");
-}
+  

[01/11] ant-ivy git commit: Generics and other fixes in tests and tutorials

[jhm]

Repository: ant-ivy
Updated Branches:
  refs/heads/master 545536e34 -> 225afb8ba


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/8b9f2d51/test/java/org/apache/ivy/plugins/repository/vfs/VfsTestHelper.java
--
diff --git a/test/java/org/apache/ivy/plugins/repository/vfs/VfsTestHelper.java 
b/test/java/org/apache/ivy/plugins/repository/vfs/VfsTestHelper.java
index f64255f..ecbed50 100644
--- a/test/java/org/apache/ivy/plugins/repository/vfs/VfsTestHelper.java
+++ b/test/java/org/apache/ivy/plugins/repository/vfs/VfsTestHelper.java
@@ -57,7 +57,7 @@ public class VfsTestHelper {
 // setup and initialize VFS
 fsManager = new StandardFileSystemManager() {
 protected void configurePlugins() throws FileSystemException {
-// disable automatic loading potential unsupported extensions
+// disable automatic loading of potentially unsupported 
extensions
 }
 };
 
fsManager.setConfiguration(getClass().getResource(VFS_CONF).toString());
@@ -75,10 +75,10 @@ public class VfsTestHelper {
  *name of the resource
  * @return List of well-formed VFS resource identifiers
  */
-public List createVFSUriSet(String resource) {
-List set = new ArrayList();
-for (int i = 0; i < VfsURI.SUPPORTED_SCHEMES.length; i++) {
-set.add(VfsURI.vfsURIFactory(VfsURI.SUPPORTED_SCHEMES[i], 
resource, ivy));
+public List createVFSUriSet(String resource) {
+List set = new ArrayList();
+for (String scheme : VfsURI.SUPPORTED_SCHEMES) {
+set.add(VfsURI.vfsURIFactory(scheme, resource, ivy));
 }
 return set;
 }

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/8b9f2d51/test/java/org/apache/ivy/plugins/resolver/ChainResolverTest.java
--
diff --git a/test/java/org/apache/ivy/plugins/resolver/ChainResolverTest.java 
b/test/java/org/apache/ivy/plugins/resolver/ChainResolverTest.java
index 7f03298..28d04f6 100644
--- a/test/java/org/apache/ivy/plugins/resolver/ChainResolverTest.java
+++ b/test/java/org/apache/ivy/plugins/resolver/ChainResolverTest.java
@@ -158,8 +158,8 @@ public class ChainResolverTest extends 
AbstractDependencyResolverTest {
 assertNotNull(rmr);
 assertEquals("3", rmr.getResolver().getName());
 List ddAsList = Arrays.asList(new DependencyDescriptor[] {dd});
-for (int i = 0; i < resolvers.length; i++) {
-assertEquals(ddAsList, resolvers[i].askedDeps);
+for (MockResolver resolver : resolvers) {
+assertEquals(ddAsList, resolver.askedDeps);
 }
 }
 
@@ -198,8 +198,8 @@ public class ChainResolverTest extends 
AbstractDependencyResolverTest {
 assertNotNull(rmr);
 assertEquals("5", rmr.getResolver().getName());
 List ddAsList = Arrays.asList(new DependencyDescriptor[] {dd});
-for (int i = 0; i < resolvers.length; i++) {
-assertEquals(ddAsList, resolvers[i].askedDeps);
+for (MockResolver resolver : resolvers) {
+assertEquals(ddAsList, resolver.askedDeps);
 }
 }
 
@@ -282,8 +282,8 @@ public class ChainResolverTest extends 
AbstractDependencyResolverTest {
 assertNotNull(rmr);
 assertEquals("5", rmr.getResolver().getName());
 List ddAsList = Arrays.asList(new DependencyDescriptor[] {dd});
-for (int i = 0; i < resolvers.length; i++) {
-assertEquals(ddAsList, resolvers[i].askedDeps);
+for (MockResolver resolver : resolvers) {
+assertEquals(ddAsList, resolver.askedDeps);
 }
 }
 
@@ -375,8 +375,8 @@ public class ChainResolverTest extends 
AbstractDependencyResolverTest {
 chain.setSettings(settings);
 MockResolver[] resolvers = new MockResolver[] 
{MockResolver.buildMockResolver(settings,
 "1", true, null)};
-for (int i = 0; i < resolvers.length; i++) {
-chain.add(resolvers[i]);
+for (MockResolver resolver : resolvers) {
+chain.add(resolver);
 }
 chain.getDependency(dd, data);
 // should not have asked any dependency, should have hit the cache

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/8b9f2d51/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java
--
diff --git a/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java 
b/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java
index 79cfe61..743ff02 100644
--- a/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java
+++ b/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java
@@ -230,8 +230,8 @@ public class IBiblioResolverTest extends 
AbstractDependencyResolverTest {
 Map[] valuesMaps = 

[11/11] ant-ivy git commit: diamont operator

[jhm]

diamont operator


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

Branch: refs/heads/master
Commit: 225afb8bad88c9bbb70b24d9ac3c28fb21f39465
Parents: c7d4b53
Author: Jan Matèrne 
Authored: Wed Jun 14 11:06:18 2017 +0200
Committer: Jan Matèrne 
Committed: Wed Jun 14 11:06:18 2017 +0200

--
 src/java/org/apache/ivy/plugins/repository/vfs/VfsResource.java | 4 +---
 test/java/org/apache/ivy/core/sort/SortTest.java| 3 ---
 2 files changed, 1 insertion(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/225afb8b/src/java/org/apache/ivy/plugins/repository/vfs/VfsResource.java
--
diff --git a/src/java/org/apache/ivy/plugins/repository/vfs/VfsResource.java 
b/src/java/org/apache/ivy/plugins/repository/vfs/VfsResource.java
index 53e4429..3250e96 100644
--- a/src/java/org/apache/ivy/plugins/repository/vfs/VfsResource.java
+++ b/src/java/org/apache/ivy/plugins/repository/vfs/VfsResource.java
@@ -63,7 +63,6 @@ public class VfsResource implements Resource {
 try {
 resourceImpl = fsManager.resolveFile(vfsURI);
 content = resourceImpl.getContent();
-
 exists = resourceImpl.exists();
 lastModified = content.getLastModifiedTime();
 contentLength = content.getSize();
@@ -74,7 +73,6 @@ public class VfsResource implements Resource {
 lastModified = 0;
 contentLength = 0;
 }
-
 init = true;
 }
 }
@@ -88,7 +86,7 @@ public class VfsResource implements Resource {
  */
 public List getChildren() {
 init();
-ArrayList list = new ArrayList();
+ArrayList list = new ArrayList<>();
 try {
 if ((resourceImpl != null) && resourceImpl.exists()
 && (resourceImpl.getType() == FileType.FOLDER)) {

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/225afb8b/test/java/org/apache/ivy/core/sort/SortTest.java
--
diff --git a/test/java/org/apache/ivy/core/sort/SortTest.java 
b/test/java/org/apache/ivy/core/sort/SortTest.java
index cf10807..33031b8 100644
--- a/test/java/org/apache/ivy/core/sort/SortTest.java
+++ b/test/java/org/apache/ivy/core/sort/SortTest.java
@@ -196,7 +196,6 @@ public class SortTest {
  */
 @Test
 public void testLatestIntegration() {
-
 addDependency(md2, "md1", "latest.integration");
 addDependency(md3, "md2", "latest.integration");
 addDependency(md4, "md3", "latest.integration");
@@ -210,7 +209,6 @@ public class SortTest {
 for (List toSort : permutations) {
 assertSorted(expectedOrder, sortModuleDescriptors(toSort, 
nonMatchReporter));
 }
-
 }
 
 /**
@@ -236,7 +234,6 @@ public class SortTest {
 for (List toSort : permutations) {
 assertSorted(possibleOrder, sortModuleDescriptors(toSort, 
nonMatchReporter));
 }
-
 }
 
 /**

[08/11] ant-ivy git commit: More Java 7 syntax in tests and other optimisations

[jhm]

More Java 7 syntax in tests and other optimisations

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

Branch: refs/heads/master
Commit: 973704dc1c284a148c989e3da92a546bd0d2af0d
Parents: 3cf36b8
Author: twogee 
Authored: Tue Jun 13 21:24:03 2017 +0200
Committer: twogee 
Committed: Tue Jun 13 21:55:52 2017 +0200

--
 .../core/module/descriptor/IvyMakePomTest.java  | 11 ++
 .../apache/ivy/osgi/obr/OBRXMLWriterTest.java   | 10 +
 .../plugins/lock/ArtifactLockStrategyTest.java  |  6 +--
 .../ivy/plugins/repository/vfs/VfsURI.java  | 41 +++-
 4 files changed, 29 insertions(+), 39 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/973704dc/test/java/org/apache/ivy/core/module/descriptor/IvyMakePomTest.java
--
diff --git 
a/test/java/org/apache/ivy/core/module/descriptor/IvyMakePomTest.java 
b/test/java/org/apache/ivy/core/module/descriptor/IvyMakePomTest.java
index 8b4ba44..b372479 100644
--- a/test/java/org/apache/ivy/core/module/descriptor/IvyMakePomTest.java
+++ b/test/java/org/apache/ivy/core/module/descriptor/IvyMakePomTest.java
@@ -170,7 +170,7 @@ public class IvyMakePomTest {
 // move to next sibling
 nextChild = nextChild.getNextSibling();
 }
-return new PomDependency(groupId, artifactId, version, scope, 
classifier, optional != null ? Boolean.parseBoolean(optional) : false);
+return new PomDependency(groupId, artifactId, version, scope, 
classifier, optional != null && Boolean.parseBoolean(optional));
 }
 
 private static Node skipIfTextNode(final Node node) {
@@ -182,13 +182,8 @@ public class IvyMakePomTest {
 
 @Override
 public String toString() {
-return "PomDependency{" +
-"groupId='" + groupId + '\'' +
-", artifactId='" + artifactId + '\'' +
-", version='" + version + '\'' +
-", scope='" + scope + '\'' +
-", classifier='" + classifier + '\'' +
-'}';
+return String.format("PomDependency{groupId='%s', artifactId='%s', 
version='%s', scope='%s', classifier='%s'}",
+groupId, artifactId, version, scope, classifier);
 }
 }
 }

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/973704dc/test/java/org/apache/ivy/osgi/obr/OBRXMLWriterTest.java
--
diff --git a/test/java/org/apache/ivy/osgi/obr/OBRXMLWriterTest.java 
b/test/java/org/apache/ivy/osgi/obr/OBRXMLWriterTest.java
index 0054656..f0c4c0d 100644
--- a/test/java/org/apache/ivy/osgi/obr/OBRXMLWriterTest.java
+++ b/test/java/org/apache/ivy/osgi/obr/OBRXMLWriterTest.java
@@ -62,20 +62,14 @@ public class OBRXMLWriterTest {
 
 new File("build/test-files").mkdirs();
 File obrFile = new File("build/test-files/obr-sources.xml");
-FileOutputStream out = new FileOutputStream(obrFile);
-try {
+try (FileOutputStream out = new FileOutputStream(obrFile)) {
 ContentHandler handler = OBRXMLWriter.newHandler(out, "UTF-8", 
true);
 OBRXMLWriter.writeBundles(bundles, handler);
-} finally {
-out.close();
 }
 
-FileInputStream in = new FileInputStream(obrFile);
 BundleRepoDescriptor repo;
-try {
+try (FileInputStream in = new FileInputStream(obrFile)) {
 repo = OBRXMLParser.parse(new URI("file:///test"), in);
-} finally {
-in.close();
 }
 assertEquals(2, CollectionUtils.toList(repo.getModules()).size());
 

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/973704dc/test/java/org/apache/ivy/plugins/lock/ArtifactLockStrategyTest.java
--
diff --git 
a/test/java/org/apache/ivy/plugins/lock/ArtifactLockStrategyTest.java 
b/test/java/org/apache/ivy/plugins/lock/ArtifactLockStrategyTest.java
index e886469..5f0375f 100644
--- a/test/java/org/apache/ivy/plugins/lock/ArtifactLockStrategyTest.java
+++ b/test/java/org/apache/ivy/plugins/lock/ArtifactLockStrategyTest.java
@@ -189,11 +189,7 @@ public class ArtifactLockStrategyTest {
 }
 } catch (ParseException e) {
 Message.info("parse exception " + e);
-} catch (RuntimeException e) {
-Message.info("exception " + e);
-e.printStackTrace();
-  

[04/11] ant-ivy git commit: More generics…

[jhm]

More generics…

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

Branch: refs/heads/master
Commit: 314dfa80d4e815ba3c689cd3ad0d508209665bf6
Parents: 8f35a1d
Author: twogee 
Authored: Sun Jun 11 04:38:47 2017 +0200
Committer: twogee 
Committed: Sun Jun 11 04:38:47 2017 +0200

--
 test/java/org/apache/ivy/TestHelper.java |  9 +++--
 .../apache/ivy/core/publish/PublishEventsTest.java   | 15 +++
 2 files changed, 10 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/314dfa80/test/java/org/apache/ivy/TestHelper.java
--
diff --git a/test/java/org/apache/ivy/TestHelper.java 
b/test/java/org/apache/ivy/TestHelper.java
index 1a18c66..c260f5a 100644
--- a/test/java/org/apache/ivy/TestHelper.java
+++ b/test/java/org/apache/ivy/TestHelper.java
@@ -108,9 +108,8 @@ public class TestHelper {
  * @return a collection of {@link ModuleRevisionId}
  */
 public static Collection parseMrids(String mrids) {
-String[] m = mrids.split(",?\\s+");
 Collection c = new LinkedHashSet();
-for (String s : m) {
+for (String s : mrids.split(",?\\s+")) {
 c.add(ModuleRevisionId.parse(s));
 }
 return c;
@@ -184,8 +183,7 @@ public class TestHelper {
 ModuleRevisionId.parse(m.group(1)), new Date());
 String mrids = m.group(2);
 if (mrids != null) {
-Collection depMrids = parseMrids(mrids);
-for (ModuleRevisionId dep : depMrids) {
+for (ModuleRevisionId dep : parseMrids(mrids)) {
 md.addDependency(new DefaultDependencyDescriptor(dep, 
false));
 }
 }
@@ -203,9 +201,8 @@ public class TestHelper {
  * @return the collection of module descriptors parsed
  */
 public static Collection parseMicroIvyDescriptors(String 
microIvy) {
-String[] mds = microIvy.split("\\s*;;\\s*");
 Collection r = new ArrayList();
-for (String md : mds) {
+for (String md : microIvy.split("\\s*;;\\s*")) {
 r.add(parseMicroIvyDescriptor(md));
 }
 return r;

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/314dfa80/test/java/org/apache/ivy/core/publish/PublishEventsTest.java
--
diff --git a/test/java/org/apache/ivy/core/publish/PublishEventsTest.java 
b/test/java/org/apache/ivy/core/publish/PublishEventsTest.java
index 858d44a..13937c6 100644
--- a/test/java/org/apache/ivy/core/publish/PublishEventsTest.java
+++ b/test/java/org/apache/ivy/core/publish/PublishEventsTest.java
@@ -33,6 +33,7 @@ import 
org.apache.ivy.core.event.publish.StartArtifactPublishEvent;
 import org.apache.ivy.core.module.descriptor.Artifact;
 import org.apache.ivy.core.module.descriptor.MDArtifact;
 import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
+import org.apache.ivy.core.module.id.ArtifactRevisionId;
 import org.apache.ivy.plugins.parser.xml.XmlModuleDescriptorParser;
 import org.apache.ivy.plugins.resolver.MockResolver;
 import org.apache.ivy.plugins.trigger.AbstractTrigger;
@@ -46,7 +47,7 @@ import static org.junit.Assert.*;
 public class PublishEventsTest {
 
 // maps ArtifactRevisionId to PublishTestCase instance.
-private HashMap expectedPublications;
+private HashMap expectedPublications;
 
 // expected values for the current artifact being published.
 private PublishTestCase currentTestCase;
@@ -123,7 +124,7 @@ public class PublishEventsTest {
 assertEquals("sanity check", "foo", dataArtifact.getName());
 ivyArtifact = MDArtifact.newIvyArtifact(publishModule);
 
-expectedPublications = new HashMap();
+expectedPublications = new HashMap();
 expectedPublications.put(dataArtifact.getId(), new 
PublishTestCase(dataArtifact, dataFile,
 true));
 expectedPublications.put(ivyArtifact.getId(), new 
PublishTestCase(ivyArtifact, ivyFile,
@@ -221,8 +222,7 @@ public class PublishEventsTest {
 // delete the datafile. the publish should fail
 // and the ivy artifact should still publish successfully.
 assertTrue("datafile has been destroyed", dataFile.delete());
-PublishTestCase dataPublish = (PublishTestCase) 
expectedPublications.get(dataArtifact
-.getId());
+PublishTestCase dataPublish = 

[07/11] ant-ivy git commit: Java 7 diamonds in tests

[jhm]

Java 7 diamonds in tests

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

Branch: refs/heads/master
Commit: 3cf36b8cacd27557e0af0695c2c827f82d29d6e4
Parents: d7651dc
Author: twogee 
Authored: Tue Jun 13 21:23:23 2017 +0200
Committer: twogee 
Committed: Tue Jun 13 21:23:23 2017 +0200

--
 test/java/org/apache/ivy/TestFixture.java   |   2 +-
 test/java/org/apache/ivy/TestHelper.java|   4 +-
 .../core/module/descriptor/IvyMakePomTest.java  |   2 +-
 .../ivy/core/publish/PublishEventsTest.java |   2 +-
 .../ivy/core/report/ResolveReportTest.java  |   4 +-
 .../apache/ivy/core/resolve/ResolveTest.java| 116 +--
 .../org/apache/ivy/core/search/SearchTest.java  |  14 +--
 .../java/org/apache/ivy/core/sort/SortTest.java |   2 +-
 .../ivy/osgi/core/ManifestParserTest.java   |   4 +-
 .../apache/ivy/osgi/obr/OBRResolverTest.java|   6 +-
 .../apache/ivy/osgi/obr/OBRXMLWriterTest.java   |   2 +-
 .../plugins/repository/vfs/VfsResourceTest.java |   4 +-
 .../plugins/repository/vfs/VfsTestHelper.java   |   2 +-
 .../org/apache/ivy/util/ConfiguratorTest.java   |  10 +-
 .../org/apache/ivy/util/MockMessageLogger.java  |   6 +-
 15 files changed, 90 insertions(+), 90 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/3cf36b8c/test/java/org/apache/ivy/TestFixture.java
--
diff --git a/test/java/org/apache/ivy/TestFixture.java 
b/test/java/org/apache/ivy/TestFixture.java
index b47b626..7886ead 100644
--- a/test/java/org/apache/ivy/TestFixture.java
+++ b/test/java/org/apache/ivy/TestFixture.java
@@ -65,7 +65,7 @@ import org.apache.ivy.plugins.resolver.util.ResolvedResource;
  */
 public class TestFixture {
 
-private final Collection mds = new 
ArrayList();
+private final Collection mds = new ArrayList<>();
 
 private Ivy ivy;
 

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/3cf36b8c/test/java/org/apache/ivy/TestHelper.java
--
diff --git a/test/java/org/apache/ivy/TestHelper.java 
b/test/java/org/apache/ivy/TestHelper.java
index c260f5a..20fdfc3 100644
--- a/test/java/org/apache/ivy/TestHelper.java
+++ b/test/java/org/apache/ivy/TestHelper.java
@@ -108,7 +108,7 @@ public class TestHelper {
  * @return a collection of {@link ModuleRevisionId}
  */
 public static Collection parseMrids(String mrids) {
-Collection c = new LinkedHashSet();
+Collection c = new LinkedHashSet<>();
 for (String s : mrids.split(",?\\s+")) {
 c.add(ModuleRevisionId.parse(s));
 }
@@ -201,7 +201,7 @@ public class TestHelper {
  * @return the collection of module descriptors parsed
  */
 public static Collection parseMicroIvyDescriptors(String 
microIvy) {
-Collection r = new ArrayList();
+Collection r = new ArrayList<>();
 for (String md : microIvy.split("\\s*;;\\s*")) {
 r.add(parseMicroIvyDescriptor(md));
 }

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/3cf36b8c/test/java/org/apache/ivy/core/module/descriptor/IvyMakePomTest.java
--
diff --git 
a/test/java/org/apache/ivy/core/module/descriptor/IvyMakePomTest.java 
b/test/java/org/apache/ivy/core/module/descriptor/IvyMakePomTest.java
index d962e8d..8b4ba44 100644
--- a/test/java/org/apache/ivy/core/module/descriptor/IvyMakePomTest.java
+++ b/test/java/org/apache/ivy/core/module/descriptor/IvyMakePomTest.java
@@ -77,7 +77,7 @@ public class IvyMakePomTest {
 assertNotNull("Dependencies element wasn't found in the generated POM 
file", dependencies);
 assertEquals("Unexpected number of dependencies in the generated POM 
file", 2, dependencies.getLength());
 
-final Set expectedPomArtifactIds = new HashSet();
+final Set expectedPomArtifactIds = new HashSet<>();
 expectedPomArtifactIds.add("foo");
 expectedPomArtifactIds.add("bar");
 for (int i = 0; i < dependencies.getLength(); i++) {

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/3cf36b8c/test/java/org/apache/ivy/core/publish/PublishEventsTest.java
--
diff --git a/test/java/org/apache/ivy/core/publish/PublishEventsTest.java 
b/test/java/org/apache/ivy/core/publish/PublishEventsTest.java
index 13937c6..704a1fc 100644
--- a/test/java/org/apache/ivy/core/publish/PublishEventsTest.java
+++ 

[2/2] ant-ivy git commit: - rename some derived variables according to their sources - javadoc improvement - more tests

[jhm]

- rename some derived variables according to their sources
- javadoc improvement
- more tests


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

Branch: refs/heads/master
Commit: 545536e34f180edd32fbb21b0a5613e6407f0980
Parents: 7f293a0
Author: Jan Matèrne 
Authored: Tue Jun 13 15:11:01 2017 +0200
Committer: Jan Matèrne 
Committed: Tue Jun 13 15:11:01 2017 +0200

--
 .../org/apache/ivy/ant/IvyCacheFileset.java | 21 ++---
 .../org/apache/ivy/ant/IvyCacheFilesetTest.java | 91 
 2 files changed, 83 insertions(+), 29 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/545536e3/src/java/org/apache/ivy/ant/IvyCacheFileset.java
--
diff --git a/src/java/org/apache/ivy/ant/IvyCacheFileset.java 
b/src/java/org/apache/ivy/ant/IvyCacheFileset.java
index bc85eaf..fb526ad 100644
--- a/src/java/org/apache/ivy/ant/IvyCacheFileset.java
+++ b/src/java/org/apache/ivy/ant/IvyCacheFileset.java
@@ -96,7 +96,7 @@ public class IvyCacheFileset extends IvyCacheTask {
  *has to be determined
  * @return
  */
-private File requireCommonBaseDir(final List 
artifactDownloadReports) {
+File requireCommonBaseDir(final List 
artifactDownloadReports) {
 File base = null;
 for (final ArtifactDownloadReport artifactDownloadReport : 
artifactDownloadReports) {
 if (artifactDownloadReport.getLocalFile() == null) {
@@ -150,13 +150,14 @@ public class IvyCacheFileset extends IvyCacheTask {
 /**
  * Returns the common base directory between the passed file1 
and file2.
  * 
- * The returned base directory must be a parent of both the 
file1 and file2.
+ * The returned base directory will be a parent of both the 
file1 and file2 or
+ * it will be null.
  * 
  *
  * @param file1
  *One of the files, for which the common base directory is 
being sought, may be null.
  * @param file2
- *The other file for which the common base directory should be 
returned.
+ *The other file for which the common base directory should be 
returned, may be null.
  * @return the common base directory between a file1 and 
file2. Returns null
  *  if no common base directory could be determined or if either 
file1 or file2
  *  is null
@@ -165,12 +166,12 @@ public class IvyCacheFileset extends IvyCacheTask {
 if (file1 == null || file2 == null) {
 return null;
 }
-final Iterator bases = getParents(file1).iterator();
-final Iterator fileParents = 
getParents(file2.getAbsoluteFile()).iterator();
+final Iterator file1Parents = getParents(file1).iterator();
+final Iterator file2Parents = 
getParents(file2.getAbsoluteFile()).iterator();
 File result = null;
-while (bases.hasNext() && fileParents.hasNext()) {
-File next = (File) bases.next();
-if (next.equals(fileParents.next())) {
+while (file1Parents.hasNext() && file2Parents.hasNext()) {
+File next = (File) file1Parents.next();
+if (next.equals(file2Parents.next())) {
 result = next;
 } else {
 break;
@@ -182,8 +183,8 @@ public class IvyCacheFileset extends IvyCacheTask {
 /**
  * @return a list of files, starting with the root and ending with the 
file itself
  */
-private LinkedList/*  */getParents(File file) {
-LinkedList r = new LinkedList();
+private LinkedList getParents(File file) {
+LinkedList r = new LinkedList<>();
 while (file != null) {
 r.addFirst(file);
 file = file.getParentFile();

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/545536e3/test/java/org/apache/ivy/ant/IvyCacheFilesetTest.java
--
diff --git a/test/java/org/apache/ivy/ant/IvyCacheFilesetTest.java 
b/test/java/org/apache/ivy/ant/IvyCacheFilesetTest.java
index dbb98f7..b02c78c 100644
--- a/test/java/org/apache/ivy/ant/IvyCacheFilesetTest.java
+++ b/test/java/org/apache/ivy/ant/IvyCacheFilesetTest.java
@@ -18,8 +18,11 @@
 package org.apache.ivy.ant;
 
 import java.io.File;
+import java.util.Arrays;
+import java.util.List;
 
 import org.apache.ivy.TestHelper;
+import org.apache.ivy.core.report.ArtifactDownloadReport;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DirectoryScanner;
@@ -170,26 +173,30 @@ public class 

[1/2] ant-ivy git commit: IVY-1475 Throw an error if a common base directory cannot be determined for cachefileset task

[jhm]

Repository: ant-ivy
Updated Branches:
  refs/heads/master c07d659cf -> 545536e34


IVY-1475 Throw an error if a common base directory cannot be determined for 
cachefileset task


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

Branch: refs/heads/master
Commit: 7f293a06a0b7ec9b554d51f150991efa9b7dd54e
Parents: c07d659
Author: Jaikiran Pai 
Authored: Fri Jun 2 16:57:36 2017 +0530
Committer: Jaikiran Pai 
Committed: Tue Jun 13 15:17:51 2017 +0530

--
 doc/use/cachefileset.html   |   8 +-
 .../org/apache/ivy/ant/IvyCacheFileset.java | 120 ---
 .../org/apache/ivy/ant/IvyCacheFilesetTest.java |  37 +-
 3 files changed, 120 insertions(+), 45 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/7f293a06/doc/use/cachefileset.html
--
diff --git a/doc/use/cachefileset.html b/doc/use/cachefileset.html
index aeba54f..747db0d 100644
--- a/doc/use/cachefileset.html
+++ b/doc/use/cachefileset.html
@@ -32,7 +32,13 @@ Please prefer the use of retrieve + standard ant path 
creation, which make your
 more independent from ivy (once artifacts are properly retrieved, ivy is not 
required any more).
 Built fileset is registered in ant with a given id, and can thus be used like 
any other ant fileset using
 refid.
-  
+
+Limitation
+A fileset, in Ant, requires a base directory from within which the files are 
included/excluded. The cachefileset task, in Ivy, internally tries to determine 
a common base directory across all the resolved artifacts' files that have been 
downloaded in the Ivy repository cache(s). Given that Ivy can be configured to 
consist multiple repository caches and each one can potentially be on a 
different filesystem root, there are times, when cachefileset cannot determine 
a common base directory for these resolved artifacts. The cachefileset throws 
an exception in such cases.
+
+Alternative task
+If cachefileset doesn't fit the need of your use case (maybe due to the 
limitations noted above), the [[use/resources]] task could be an alternative 
task to use in certain cases.
+
 
 
 AttributeDescriptionRequired

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/7f293a06/src/java/org/apache/ivy/ant/IvyCacheFileset.java
--
diff --git a/src/java/org/apache/ivy/ant/IvyCacheFileset.java 
b/src/java/org/apache/ivy/ant/IvyCacheFileset.java
index 9a60f2e..bc85eaf 100644
--- a/src/java/org/apache/ivy/ant/IvyCacheFileset.java
+++ b/src/java/org/apache/ivy/ant/IvyCacheFileset.java
@@ -60,35 +60,68 @@ public class IvyCacheFileset extends IvyCacheTask {
 throw new BuildException("setid is required in ivy cachefileset");
 }
 try {
-List paths = getArtifactReports();
-File base = null;
-for (Iterator iter = paths.iterator(); iter.hasNext();) {
-ArtifactDownloadReport a = (ArtifactDownloadReport) 
iter.next();
-if (a.getLocalFile() != null) {
-base = getBaseDir(base, a.getLocalFile());
+final List artifactDownloadReports = 
getArtifactReports();
+if (artifactDownloadReports.isEmpty()) {
+// generate an empty fileset
+final FileSet emptyFileSet = new EmptyFileSet();
+emptyFileSet.setProject(getProject());
+getProject().addReference(setid, emptyFileSet);
+return;
+}
+// find a common base dir of the resolved artifacts
+final File baseDir = 
this.requireCommonBaseDir(artifactDownloadReports);
+final FileSet fileset = new FileSet();
+fileset.setDir(baseDir);
+fileset.setProject(getProject());
+// enroll each of the artifact files into the fileset
+for (final ArtifactDownloadReport artifactDownloadReport : 
artifactDownloadReports) {
+if (artifactDownloadReport.getLocalFile() == null) {
+continue;
 }
+final NameEntry ne = fileset.createInclude();
+ne.setName(getPath(baseDir, 
artifactDownloadReport.getLocalFile()));
 }
+getProject().addReference(setid, fileset);
+} catch (Exception ex) {
+throw new BuildException("impossible to build ivy cache fileset: " 
+ ex, ex);
+}
+}
 
-FileSet fileset;
+/**
+ * Returns a common base directory, determined from the {@link 

ant-ivy git commit: IVY-1561 Take into account environment variable and system properties while evaluating property references in Maven pom.xml

[jhm]

Repository: ant-ivy
Updated Branches:
  refs/heads/master 4c6450f45 -> c07d659cf


IVY-1561 Take into account environment variable and system properties while 
evaluating property references in Maven pom.xml


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

Branch: refs/heads/master
Commit: c07d659cf8f7b16452472da6052a1de326bcb6a4
Parents: 4c6450f
Author: Jaikiran Pai 
Authored: Tue Jun 13 10:57:53 2017 +0530
Committer: Jaikiran Pai 
Committed: Tue Jun 13 11:03:14 2017 +0530

--
 .../apache/ivy/plugins/parser/m2/PomReader.java | 17 +++-
 .../m2/PomModuleDescriptorParserTest.java   | 81 
 .../parser/m2/test-system-properties.pom| 58 ++
 3 files changed, 154 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c07d659c/src/java/org/apache/ivy/plugins/parser/m2/PomReader.java
--
diff --git a/src/java/org/apache/ivy/plugins/parser/m2/PomReader.java 
b/src/java/org/apache/ivy/plugins/parser/m2/PomReader.java
index 93d128b..25745e6 100644
--- a/src/java/org/apache/ivy/plugins/parser/m2/PomReader.java
+++ b/src/java/org/apache/ivy/plugins/parser/m2/PomReader.java
@@ -30,6 +30,7 @@ import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Properties;
 
 import org.apache.ivy.core.IvyPatternHelper;
 import org.apache.ivy.core.module.descriptor.License;
@@ -110,13 +111,13 @@ public class PomReader {
 
 private static final String PROFILE = "profile";
 
-private HashMap properties = new HashMap();
+private final Map properties = new HashMap();
 
 private final Element projectElement;
 
 private final Element parentElement;
 
-public PomReader(URL descriptorURL, Resource res) throws IOException, 
SAXException {
+public PomReader(final URL descriptorURL, final Resource res) throws 
IOException, SAXException {
 InputStream stream = new AddDTDFilterInputStream(
 URLHandlerRegistry.getDefault().openStream(descriptorURL));
 InputSource source = new InputSource(stream);
@@ -146,6 +147,18 @@ public class PomReader {
 // ignore
 }
 }
+// Both environment and system properties take precedence over 
properties set in
+// pom.xml. So we pre-populate our properties with the environment and 
system properties
+// here
+for (final Map.Entry envEntry : 
System.getenv().entrySet()) {
+// Maven let's users use "env." prefix for environment variables
+this.setProperty("env." + envEntry.getKey(), envEntry.getValue());
+}
+// add system properties
+final Properties sysProps = System.getProperties();
+for (final String sysProp : sysProps.stringPropertyNames()) {
+this.setProperty(sysProp, sysProps.getProperty(sysProp));
+}
 }
 
 public boolean hasParent() {

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/c07d659c/test/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParserTest.java
--
diff --git 
a/test/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParserTest.java 
b/test/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParserTest.java
index ad80cf8..44c77e8 100644
--- 
a/test/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParserTest.java
+++ 
b/test/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParserTest.java
@@ -25,11 +25,18 @@ import static org.junit.Assert.assertTrue;
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
+import java.nio.charset.Charset;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.text.ParseException;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import org.apache.ivy.core.module.descriptor.Artifact;
 import org.apache.ivy.core.module.descriptor.DefaultModuleDescriptor;
@@ -54,6 +61,7 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
+import org.junit.rules.TemporaryFolder;
 
 public class PomModuleDescriptorParserTest extends 
AbstractModuleDescriptorParserTester {
 
@@ -79,6 +87,9 @@ public class PomModuleDescriptorParserTest 

[2/5] ant-ivy git commit: Whitespace cleanup

[jhm]

Whitespace cleanup


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

Branch: refs/heads/master
Commit: a2fdfe6737e67935779ea26bbf2d4650e5d77dc4
Parents: 147fe0e
Author: twogee 
Authored: Mon Jun 5 22:37:14 2017 +0200
Committer: twogee 
Committed: Mon Jun 5 22:37:14 2017 +0200

--
 build-for-bin-distrib.xml   |  29 +-
 build-release.xml   |  60 ++--
 src/example/bintray/build.xml   |   6 +-
 src/example/build-a-ivy-repository/build.xml| 118 +++
 src/example/chained-resolvers/build.xml |  30 +-
 .../chainedresolvers-project/build.xml  |  74 ++---
 .../configurations/jdbc-example/build.xml   | 101 +++---
 .../multi-projects/filter-framework/build.xml   | 195 ++--
 .../multi-projects/myapp/build.xml  |  87 +++---
 src/example/dependence/build.xml|  32 +-
 src/example/dependence/dependee/build.xml   |  98 +++---
 src/example/dependence/depender/build.xml   |  82 ++---
 src/example/dual/build.xml  |  30 +-
 src/example/dual/project/build.xml  |  74 ++---
 src/example/go-ivy/build.xml| 171 +-
 src/example/hello-ivy/build.xml |  70 ++---
 src/example/multi-project/build.xml |  89 +++---
 src/example/multi-project/common/common.xml | 313 +--
 src/java/org/apache/ivy/ant/antlib.xml  |  16 +-
 test/java/org/apache/ivy/TestHelper.java|   2 +-
 20 files changed, 835 insertions(+), 842 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/a2fdfe67/build-for-bin-distrib.xml
--
diff --git a/build-for-bin-distrib.xml b/build-for-bin-distrib.xml
index efac7b2..e6a5f23 100644
--- a/build-for-bin-distrib.xml
+++ b/build-for-bin-distrib.xml
@@ -14,22 +14,19 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied.  See the License for the
specific language governing permissions and limitations
-   under the License.
+   under the License.
 -->
-
 


-   
-   
-   
-   
+   uri="antlib:org.apache.ivy.ant"
+   classpath="ivy.jar"/>

-   
+

-   
+   

 ===
 Dependencies retrieved in lib directory
@@ -37,22 +34,22 @@ Dependency report generated in report directory
 ===


-   
+

-   
+   

 ===
 Please enter configuration (or comma separated list of configurations).
 Available configurations are: ${ivy.configurations}


-   
+   

-   
+

-   
-   
+   
+   

-
\ No newline at end of file
+

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/a2fdfe67/build-release.xml
--
diff --git a/build-release.xml b/build-release.xml
index 379655f..2364091 100644
--- a/build-release.xml
+++ b/build-release.xml
@@ -17,10 +17,10 @@
under the License.
 -->
 
+ xmlns:ivy="antlib:org.apache.ivy.ant"
+ xmlns:ivy2="antlib:org.apache.ivy.ant_2"
+ xmlns:xooki="antlib:xooki"
+ xmlns:openpgp="antlib:org.apache.commons.openpgp.ant">
 
 
 
@@ -63,7 +63,7 @@
 
 
 
-
+
 
 
 
@@ -176,12 +176,12 @@
 
 
 
-  
+
 
 
 
 
-
+
 
 
 
@@ -216,13 +216,13 @@
  xookidir="${doc.src.dir}/xooki"/>
 
 
-
+
 
 
 
 
 
-
+
 
 
 
 
+ compression="gzip" longfile="gnu">
 
 
 
 
-
+
 
 
 
@@ -266,12 +266,12 @@
 
 
 
+ compression="gzip" longfile="gnu">
 
 
 
 
-
+
 
 
 
@@ -297,15 +297,14 @@
 
 
 
+

[4/5] ant-ivy git commit: Remove main() in tests, optimise target dependencies in build.xml and address diverse Checkstyle warnings

[jhm]

Remove main() in tests, optimise target dependencies in build.xml and address 
diverse Checkstyle 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/a9880a18
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/a9880a18
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/a9880a18

Branch: refs/heads/master
Commit: a9880a18fe1c30ede7b409093dbc4b5c24042d33
Parents: 7d45286
Author: twogee 
Authored: Mon Jun 5 23:05:35 2017 +0200
Committer: twogee 
Committed: Mon Jun 5 23:05:35 2017 +0200

--
 build.xml  | 13 +
 .../org/apache/ivy/plugins/lock/DeleteOnExitHook.java  |  2 +-
 src/java/org/apache/ivy/util/DateUtil.java |  2 +-
 src/java/org/apache/ivy/util/EncryptedProperties.java  |  1 +
 src/java/org/apache/ivy/util/EncrytedProperties.java   |  2 +-
 test/java/org/apache/ivy/core/TestPerformance.java |  7 ---
 .../descriptor/DefaultDependencyDescriptorTest.java|  5 -
 .../ivy/core/settings/XmlSettingsParserTest.java   |  9 +
 8 files changed, 18 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/a9880a18/build.xml
--
diff --git a/build.xml b/build.xml
index 1f14e05..4529899 100644
--- a/build.xml
+++ b/build.xml
@@ -49,13 +49,13 @@
 
 
 
-
 
 
 
 
-
 
 
@@ -262,7 +262,7 @@
 todir="${ant.classes.build.dir}/fr/jayasoft/ivy/ant"/>
 
 
-
+
 
 
 
+
+
+
+
 
@@ -550,7 +555,7 @@
 
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/a9880a18/src/java/org/apache/ivy/plugins/lock/DeleteOnExitHook.java
--
diff --git a/src/java/org/apache/ivy/plugins/lock/DeleteOnExitHook.java 
b/src/java/org/apache/ivy/plugins/lock/DeleteOnExitHook.java
index bb86970..ea3fe40 100644
--- a/src/java/org/apache/ivy/plugins/lock/DeleteOnExitHook.java
+++ b/src/java/org/apache/ivy/plugins/lock/DeleteOnExitHook.java
@@ -21,7 +21,7 @@ import java.io.File;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
 
-class DeleteOnExitHook {
+final class DeleteOnExitHook {
 
 static {
 Runtime.getRuntime().addShutdownHook(new Thread() {

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/a9880a18/src/java/org/apache/ivy/util/DateUtil.java
--
diff --git a/src/java/org/apache/ivy/util/DateUtil.java 
b/src/java/org/apache/ivy/util/DateUtil.java
index fe66e1d..1190b6b 100644
--- a/src/java/org/apache/ivy/util/DateUtil.java
+++ b/src/java/org/apache/ivy/util/DateUtil.java
@@ -21,7 +21,7 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-public class DateUtil {
+public final class DateUtil {
 
 private DateUtil() {
 // Utility class

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/a9880a18/src/java/org/apache/ivy/util/EncryptedProperties.java
--
diff --git a/src/java/org/apache/ivy/util/EncryptedProperties.java 
b/src/java/org/apache/ivy/util/EncryptedProperties.java
index cbed952..2644372 100644
--- a/src/java/org/apache/ivy/util/EncryptedProperties.java
+++ b/src/java/org/apache/ivy/util/EncryptedProperties.java
@@ -29,6 +29,7 @@ import java.util.Properties;
  * putAll puts given values without encrypting them. It this thus recommended 
to void using them,
  * use setProperty and getProperty instead.
  */
+@SuppressWarnings("serial")
 public class EncryptedProperties extends Properties {
 
 public EncryptedProperties() {

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/a9880a18/src/java/org/apache/ivy/util/EncrytedProperties.java
--
diff --git a/src/java/org/apache/ivy/util/EncrytedProperties.java 
b/src/java/org/apache/ivy/util/EncrytedProperties.java
index 3242de5..a2a998d 100644
--- a/src/java/org/apache/ivy/util/EncrytedProperties.java
+++ b/src/java/org/apache/ivy/util/EncrytedProperties.java
@@ -17,10 +17,10 @@
  */
 package org.apache.ivy.util;
 
-
 /**
  * Deprecated because of renaming due spell check.
  */
+@SuppressWarnings("serial")
 @Deprecated
 public class EncrytedProperties extends EncryptedProperties {
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/a9880a18/test/java/org/apache/ivy/core/TestPerformance.java
--
diff --git 

[3/5] ant-ivy git commit: Adjust Eclipse settings for Java 7

[jhm]

Adjust Eclipse settings for Java 7

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

Branch: refs/heads/master
Commit: 7d4528639ca56fa2e9eb826d5ba3118261c86d22
Parents: a2fdfe6
Author: twogee 
Authored: Mon Jun 5 22:37:39 2017 +0200
Committer: twogee 
Committed: Mon Jun 5 22:37:39 2017 +0200

--
 .settings/org.eclipse.jdt.core.prefs | 49 +--
 .settings/org.eclipse.jdt.ui.prefs   | 11 +--
 2 files changed, 55 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/7d452863/.settings/org.eclipse.jdt.core.prefs
--
diff --git a/.settings/org.eclipse.jdt.core.prefs 
b/.settings/org.eclipse.jdt.core.prefs
index 767786f..1c8ff0a 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -19,17 +19,19 @@
 # ***
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.7
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
 
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=20
@@ -40,15 +42,18 @@ org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
 
org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
 
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
 
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
 
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
 
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
 
org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
 
org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
 org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
 org.eclipse.jdt.core.formatter.blank_lines_after_package=1
 org.eclipse.jdt.core.formatter.blank_lines_before_field=1
@@ -58,6 +63,7 @@ 
org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
 org.eclipse.jdt.core.formatter.blank_lines_before_method=1
 org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
 org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
 org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
 
org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
 
org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
@@ -67,21 +73,33 @@ 
org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
 
org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

[1/5] ant-ivy git commit: Whitespace cleanup

[jhm]

Repository: ant-ivy
Updated Branches:
  refs/heads/master 147fe0eb2 -> 4c6450f45


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/a2fdfe67/src/example/multi-project/common/common.xml
--
diff --git a/src/example/multi-project/common/common.xml 
b/src/example/multi-project/common/common.xml
index 89cd508..cdbd0da 100644
--- a/src/example/multi-project/common/common.xml
+++ b/src/example/multi-project/common/common.xml
@@ -14,192 +14,187 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied.  See the License for the
specific language governing permissions and limitations
-   under the License.
+   under the License.
 -->
-
-   
-   
-   
-   
-   
-   
-
-   
+
+
+
+
+
+
+
 
-   
-   
-   
-   
-   
-   
-
+
+
+
+
+
+
+
 
 
-
+
 
 
-
-
+
+
 
 
-
-   
-   
-   
+
+
+
 
-   
 
-   
-
 
  
-   
-   
-   
-   
+
+
+
+
 
-
-
 
 
 
-
-
 
-
+
 
 
-
-
 
 
 
 
-   
-   
-   
-   
-   
-   
-   
-   
-
-
-   
-   
-   
-
-
-   
-   
-   
-
-   
-
-   
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-   
-
-
-
-
-
-   
-
-
-
-   
-   
-   
-  
-   
-
-   
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/a2fdfe67/src/java/org/apache/ivy/ant/antlib.xml
--
diff --git a/src/java/org/apache/ivy/ant/antlib.xml 
b/src/java/org/apache/ivy/ant/antlib.xml
index 0111f78..c93be30 100644
--- a/src/java/org/apache/ivy/ant/antlib.xml
+++ b/src/java/org/apache/ivy/ant/antlib.xml
@@ -18,8 +18,8 @@
under the License.
 -->
 
-
-
+   
+   



@@ -44,10 +44,10 @@



-
-
-
-
-
-
+   
+   
+   
+   
+   
+   
 

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/a2fdfe67/test/java/org/apache/ivy/TestHelper.java
--
diff --git a/test/java/org/apache/ivy/TestHelper.java 
b/test/java/org/apache/ivy/TestHelper.java
index 72d216b..7963407 100644
--- a/test/java/org/apache/ivy/TestHelper.java
+++ b/test/java/org/apache/ivy/TestHelper.java
@@ -131,7 +131,7 @@ public class TestHelper {
 }
 
 /**
- * Parses a string represenation of a module descriptor in micro ivy 
format.
+ * Parses a string representation of a module descriptor in micro ivy 
format.
  * 
  * Examples:
  * 

[5/5] ant-ivy git commit: Upgrade Checkstyle to 7.8.1

[jhm]

Upgrade Checkstyle to 7.8.1

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

Branch: refs/heads/master
Commit: 4c6450f4582763c81aec93f69a2d485f469da25a
Parents: a9880a1
Author: twogee 
Authored: Mon Jun 5 23:18:12 2017 +0200
Committer: twogee 
Committed: Mon Jun 5 23:18:12 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4c6450f4/build.xml
--
diff --git a/build.xml b/build.xml
index 4529899..4c2b198 100644
--- a/build.xml
+++ b/build.xml
@@ -550,7 +550,7 @@
 
 
 
-
 

[09/11] ant-ivy git commit: Merge GitHub master

[jhm]

Merge GitHub master


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

Branch: refs/heads/master
Commit: ee08c00b4dc65f1263c2e4ec256befcf661767b6
Parents: 4a361b8 57ee0f2
Author: twogee 
Authored: Sat Jun 3 17:25:02 2017 +0200
Committer: twogee 
Committed: Sat Jun 3 17:25:02 2017 +0200

--

--

[02/11] ant-ivy git commit: first batch of SVG replacements

[jhm]

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/cc35c2b1/doc/images/main-tasks.svg
--
diff --git a/doc/images/main-tasks.svg b/doc/images/main-tasks.svg
new file mode 100644
index 000..6fbcf52
--- /dev/null
+++ b/doc/images/main-tasks.svg
@@ -0,0 +1,21 @@
+
+
+
+http://www.w3.org/1999/02/22-rdf-syntax-ns#; 
xmlns="http://www.w3.org/2000/svg; xml:space="preserve" viewBox="0 0 647.669 
503.39903" version="1.2" y="0px" x="0px" 
xmlns:cc="http://creativecommons.org/ns#; 
xmlns:dc="http://purl.org/dc/elements/1.1/;>

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/cc35c2b1/doc/printTemplate.html
--
diff --git a/doc/printTemplate.html b/doc/printTemplate.html
index fd29b36..52a60a2 100644
--- a/doc/printTemplate.html
+++ b/doc/printTemplate.html
@@ -33,7 +33,7 @@
cellpadding="0" cellspacing="0" width="100%">

 http://ant.apache.org/;
-title="Apache Ant">
 
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/cc35c2b1/doc/template.html
--
diff --git a/doc/template.html b/doc/template.html
index f7a4dd1..dbb74a3 100644
--- a/doc/template.html
+++ b/doc/template.html
@@ -37,7 +37,7 @@
cellpadding="0" cellspacing="0" width="100%">

http://ant.apache.org/;
-   title="Apache Ant">
 

[06/11] ant-ivy git commit: first batch of SVG replacements

[jhm]

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/cc35c2b1/doc/images/ant-project-logo.svg
--
diff --git a/doc/images/ant-project-logo.svg b/doc/images/ant-project-logo.svg
new file mode 100644
index 000..fb9558b
--- /dev/null
+++ b/doc/images/ant-project-logo.svg
@@ -0,0 +1,21 @@
+
+
+
+http://www.w3.org/1999/02/22-rdf-syntax-ns#; 
xmlns="http://www.w3.org/2000/svg; enable-background="new 0 0 697.32 518.74" 
xml:space="preserve" viewBox="0 0 680.49139 191.48885" version="1.1" y="0px" 
x="0px" xmlns:cc="http://creativecommons.org/ns#; 
xmlns:dc="http://purl.org/dc/elements/1.1/;><
 path d="m133.61 67.139 0.932 0.312 1.392 0.608 1.706 0.625 1.867 0.768 2.014 
0.772 2.025 0.619 1.867 0.615 1.688 0.461 0.622-4.026 0.77-3.884 0.778-3.726 
1.078-3.56 1.086-3.409 1.397-3.259 1.388-3.109 1.714-3.111 1.703-2.789 
1.856-2.795 2.009-2.795 2.325-2.474 2.326-2.331 2.481-2.325 2.628-2.334 
2.79-2.017-3.57-3.555-3.412-2.022-3.575-0.616-3.564 0.616-3.412 1.723-3.248 
2.631-3.102 3.415-2.953 4.034-2.784 4.501-2.473 4.804-2.315 4.973-2.025 
5.118-1.534 4.965-1.234 4.656-0.785 4.192-0.459 3.718 0.003 0.011z" 
stroke-width="0.254" fill="url(#ag)"/>stroke-width="0.254" fill="url(#q)"/>gradientUnits="userSpaceOnUse" x2="-3454.9" gradientTransform="matrix(-.5318 
 >.0004 -.0004 -.5318 -1376.5 2061.7)" y1="3641.9" x1="-3354">stop-color="#512A7C" offset="0"/>offset=".0701"/>stop-color="#C21F4B" offset=".3368"/>offset=".4512"/>stop-color="#ED1B35" offset=".6158"/><
 stop stop-color="#F6EE61" 

[11/11] ant-ivy git commit: Merge GitHub master

[jhm]

Merge GitHub master


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

Branch: refs/heads/master
Commit: 147fe0eb2756a1ceeae344028bc9cab6eb608387
Parents: 4c9a31c ee08c00
Author: twogee 
Authored: Sat Jun 3 18:21:52 2017 +0200
Committer: twogee 
Committed: Sat Jun 3 18:21:52 2017 +0200

--

--

[10/11] ant-ivy git commit: Correct file permissions

[jhm]

Correct file permissions

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

Branch: refs/heads/master
Commit: 4c9a31c79f76b104df55248ab0a819f148292341
Parents: a267723
Author: twogee 
Authored: Sat Jun 3 17:10:02 2017 +0200
Committer: twogee 
Committed: Sat Jun 3 18:21:06 2017 +0200

--
 test/repositories/1/IVY-644/M1/ivys/ivy-1.0.xml| 0
 test/repositories/1/IVY-644/M2/ivys/ivy-1.0.xml| 0
 test/repositories/1/IVY-644/M3/ivys/ivy-1.0.xml| 0
 test/repositories/1/IVY-644/M4/ivys/ivy-1.0.xml| 0
 test/repositories/1/IVY-644/M4/ivys/ivy-1.1.xml| 0
 test/repositories/1/IVY-644/M4/ivys/ivy-1.2.xml| 0
 test/repositories/2/mod17.1/ivy-1.0.xml| 0
 test/repositories/2/modpom-dbunit/ivy-2.2.xml  | 0
 test/repositories/2/modpom-junit/ivy-3.8.1.xml | 0
 test/repositories/2/modpom-junit/ivy-3.8.2.xml | 0
 test/repositories/m2/org/relocated/test3/1.0/test3-1.0.pom | 0
 test/repositories/m2/org/relocated/test3full/1.1/test3full-1.1.pom | 0
 12 files changed, 0 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4c9a31c7/test/repositories/1/IVY-644/M1/ivys/ivy-1.0.xml
--
diff --git a/test/repositories/1/IVY-644/M1/ivys/ivy-1.0.xml 
b/test/repositories/1/IVY-644/M1/ivys/ivy-1.0.xml
old mode 100755
new mode 100644

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4c9a31c7/test/repositories/1/IVY-644/M2/ivys/ivy-1.0.xml
--
diff --git a/test/repositories/1/IVY-644/M2/ivys/ivy-1.0.xml 
b/test/repositories/1/IVY-644/M2/ivys/ivy-1.0.xml
old mode 100755
new mode 100644

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4c9a31c7/test/repositories/1/IVY-644/M3/ivys/ivy-1.0.xml
--
diff --git a/test/repositories/1/IVY-644/M3/ivys/ivy-1.0.xml 
b/test/repositories/1/IVY-644/M3/ivys/ivy-1.0.xml
old mode 100755
new mode 100644

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4c9a31c7/test/repositories/1/IVY-644/M4/ivys/ivy-1.0.xml
--
diff --git a/test/repositories/1/IVY-644/M4/ivys/ivy-1.0.xml 
b/test/repositories/1/IVY-644/M4/ivys/ivy-1.0.xml
old mode 100755
new mode 100644

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4c9a31c7/test/repositories/1/IVY-644/M4/ivys/ivy-1.1.xml
--
diff --git a/test/repositories/1/IVY-644/M4/ivys/ivy-1.1.xml 
b/test/repositories/1/IVY-644/M4/ivys/ivy-1.1.xml
old mode 100755
new mode 100644

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4c9a31c7/test/repositories/1/IVY-644/M4/ivys/ivy-1.2.xml
--
diff --git a/test/repositories/1/IVY-644/M4/ivys/ivy-1.2.xml 
b/test/repositories/1/IVY-644/M4/ivys/ivy-1.2.xml
old mode 100755
new mode 100644

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4c9a31c7/test/repositories/2/mod17.1/ivy-1.0.xml
--
diff --git a/test/repositories/2/mod17.1/ivy-1.0.xml 
b/test/repositories/2/mod17.1/ivy-1.0.xml
old mode 100755
new mode 100644

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4c9a31c7/test/repositories/2/modpom-dbunit/ivy-2.2.xml
--
diff --git a/test/repositories/2/modpom-dbunit/ivy-2.2.xml 
b/test/repositories/2/modpom-dbunit/ivy-2.2.xml
old mode 100755
new mode 100644

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4c9a31c7/test/repositories/2/modpom-junit/ivy-3.8.1.xml
--
diff --git a/test/repositories/2/modpom-junit/ivy-3.8.1.xml 
b/test/repositories/2/modpom-junit/ivy-3.8.1.xml
old mode 100755
new mode 100644

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4c9a31c7/test/repositories/2/modpom-junit/ivy-3.8.2.xml
--
diff --git a/test/repositories/2/modpom-junit/ivy-3.8.2.xml 
b/test/repositories/2/modpom-junit/ivy-3.8.2.xml
old mode 100755
new mode 100644

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4c9a31c7/test/repositories/m2/org/relocated/test3/1.0/test3-1.0.pom

[07/11] ant-ivy git commit: first batch of SVG replacements

[jhm]

first batch of SVG replacements

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

Branch: refs/heads/master
Commit: cc35c2b114eb025c6201debb07345804f03b6560
Parents: 95a524e
Author: twogee 
Authored: Fri Jun 2 17:37:04 2017 +0200
Committer: twogee 
Committed: Sat Jun 3 17:09:12 2017 +0200

--
 doc/images/ant-group-logo.gif   | Bin 7577 -> 0 bytes
 doc/images/ant-project-logo.gif | Bin 0 -> 7577 bytes
 doc/images/ant-project-logo.svg |  21 +
 doc/images/apache-incubator.svg |  21 +
 doc/images/hibgraph.svg |  55 +++
 doc/images/ivy-publish-fc.svg   |  20 +
 doc/images/ivy-terminology.odg  | Bin 20840 -> 22331 bytes
 doc/images/ivy-terminology.svg  |  20 +
 doc/images/main-tasks.odg   | Bin 0 -> 12386 bytes
 doc/images/main-tasks.svg   |  21 +
 doc/printTemplate.html  |   2 +-
 doc/template.html   |   2 +-
 12 files changed, 160 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/cc35c2b1/doc/images/ant-group-logo.gif
--
diff --git a/doc/images/ant-group-logo.gif b/doc/images/ant-group-logo.gif
deleted file mode 100644
index de57d34..000
Binary files a/doc/images/ant-group-logo.gif and /dev/null differ

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/cc35c2b1/doc/images/ant-project-logo.gif
--
diff --git a/doc/images/ant-project-logo.gif b/doc/images/ant-project-logo.gif
new file mode 100644
index 000..de57d34
Binary files /dev/null and b/doc/images/ant-project-logo.gif differ

[03/11] ant-ivy git commit: first batch of SVG replacements

[jhm]

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/cc35c2b1/doc/images/ivy-terminology.svg
--
diff --git a/doc/images/ivy-terminology.svg b/doc/images/ivy-terminology.svg
new file mode 100644
index 000..826706c
--- /dev/null
+++ b/doc/images/ivy-terminology.svg
@@ -0,0 +1,20 @@
+
+
+http://www.w3.org/1999/02/22-rdf-syntax-ns#; 
xmlns="http://www.w3.org/2000/svg; xml:space="preserve" viewBox="0 0 363.33 
643.59" version="1.2" y="0px" x="0px" xmlns:cc="http://creativecommons.org/ns#; 
xmlns:dc="http://purl.org/dc/elements/1.1/;>http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/cc35c2b1/doc/images/main-tasks.odg
--
diff --git a/doc/images/main-tasks.odg b/doc/images/main-tasks.odg
new file mode 100644
index 000..2e75d56
Binary files /dev/null and b/doc/images/main-tasks.odg differ

[08/11] ant-ivy git commit: Correct file permissions

[jhm]

Correct file permissions

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

Branch: refs/heads/master
Commit: 4a361b89d9dca22481466d2dbfe78f442c18932c
Parents: 5e590e5
Author: twogee 
Authored: Sat Jun 3 17:10:02 2017 +0200
Committer: twogee 
Committed: Sat Jun 3 17:17:21 2017 +0200

--
 test/repositories/1/IVY-644/M1/ivys/ivy-1.0.xml| 0
 test/repositories/1/IVY-644/M2/ivys/ivy-1.0.xml| 0
 test/repositories/1/IVY-644/M3/ivys/ivy-1.0.xml| 0
 test/repositories/1/IVY-644/M4/ivys/ivy-1.0.xml| 0
 test/repositories/1/IVY-644/M4/ivys/ivy-1.1.xml| 0
 test/repositories/1/IVY-644/M4/ivys/ivy-1.2.xml| 0
 test/repositories/2/mod17.1/ivy-1.0.xml| 0
 test/repositories/2/modpom-dbunit/ivy-2.2.xml  | 0
 test/repositories/2/modpom-junit/ivy-3.8.1.xml | 0
 test/repositories/2/modpom-junit/ivy-3.8.2.xml | 0
 test/repositories/m2/org/relocated/test3/1.0/test3-1.0.pom | 0
 test/repositories/m2/org/relocated/test3full/1.1/test3full-1.1.pom | 0
 12 files changed, 0 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4a361b89/test/repositories/1/IVY-644/M1/ivys/ivy-1.0.xml
--
diff --git a/test/repositories/1/IVY-644/M1/ivys/ivy-1.0.xml 
b/test/repositories/1/IVY-644/M1/ivys/ivy-1.0.xml
old mode 100755
new mode 100644

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4a361b89/test/repositories/1/IVY-644/M2/ivys/ivy-1.0.xml
--
diff --git a/test/repositories/1/IVY-644/M2/ivys/ivy-1.0.xml 
b/test/repositories/1/IVY-644/M2/ivys/ivy-1.0.xml
old mode 100755
new mode 100644

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4a361b89/test/repositories/1/IVY-644/M3/ivys/ivy-1.0.xml
--
diff --git a/test/repositories/1/IVY-644/M3/ivys/ivy-1.0.xml 
b/test/repositories/1/IVY-644/M3/ivys/ivy-1.0.xml
old mode 100755
new mode 100644

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4a361b89/test/repositories/1/IVY-644/M4/ivys/ivy-1.0.xml
--
diff --git a/test/repositories/1/IVY-644/M4/ivys/ivy-1.0.xml 
b/test/repositories/1/IVY-644/M4/ivys/ivy-1.0.xml
old mode 100755
new mode 100644

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4a361b89/test/repositories/1/IVY-644/M4/ivys/ivy-1.1.xml
--
diff --git a/test/repositories/1/IVY-644/M4/ivys/ivy-1.1.xml 
b/test/repositories/1/IVY-644/M4/ivys/ivy-1.1.xml
old mode 100755
new mode 100644

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4a361b89/test/repositories/1/IVY-644/M4/ivys/ivy-1.2.xml
--
diff --git a/test/repositories/1/IVY-644/M4/ivys/ivy-1.2.xml 
b/test/repositories/1/IVY-644/M4/ivys/ivy-1.2.xml
old mode 100755
new mode 100644

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4a361b89/test/repositories/2/mod17.1/ivy-1.0.xml
--
diff --git a/test/repositories/2/mod17.1/ivy-1.0.xml 
b/test/repositories/2/mod17.1/ivy-1.0.xml
old mode 100755
new mode 100644

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4a361b89/test/repositories/2/modpom-dbunit/ivy-2.2.xml
--
diff --git a/test/repositories/2/modpom-dbunit/ivy-2.2.xml 
b/test/repositories/2/modpom-dbunit/ivy-2.2.xml
old mode 100755
new mode 100644

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4a361b89/test/repositories/2/modpom-junit/ivy-3.8.1.xml
--
diff --git a/test/repositories/2/modpom-junit/ivy-3.8.1.xml 
b/test/repositories/2/modpom-junit/ivy-3.8.1.xml
old mode 100755
new mode 100644

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4a361b89/test/repositories/2/modpom-junit/ivy-3.8.2.xml
--
diff --git a/test/repositories/2/modpom-junit/ivy-3.8.2.xml 
b/test/repositories/2/modpom-junit/ivy-3.8.2.xml
old mode 100755
new mode 100644

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4a361b89/test/repositories/m2/org/relocated/test3/1.0/test3-1.0.pom

[05/11] ant-ivy git commit: first batch of SVG replacements

[jhm]

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/cc35c2b1/doc/images/apache-incubator.svg
--
diff --git a/doc/images/apache-incubator.svg b/doc/images/apache-incubator.svg
new file mode 100644
index 000..7f53236
--- /dev/null
+++ b/doc/images/apache-incubator.svg
@@ -0,0 +1,21 @@
+
+
+
+http://www.w3.org/1999/02/22-rdf-syntax-ns#; 
xmlns="http://www.w3.org/2000/svg; enable-background="new 0 0 697.32 518.74" 
xml:space="preserve" viewBox="0 0 638.90594 148.79584" version="1.1" y="0px" 
x="0px" xmlns:cc="http://creativecommons.org/ns#; 
xmlns:dc="http://purl.org/dc/elements/1.1/;>

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/cc35c2b1/doc/images/hibgraph.svg
--
diff --git a/doc/images/hibgraph.svg b/doc/images/hibgraph.svg
new file mode 100644
index 000..bbaf802
--- /dev/null
+++ b/doc/images/hibgraph.svg
@@ -0,0 +1,55 @@
+
+
+
+http://www.w3.org/1999/02/22-rdf-syntax-ns#; 
xmlns="http://www.w3.org/2000/svg; xml:space="preserve" viewBox="0 0 549.56701 
519.84498" version="1.2" y="0px" x="0px" 
xmlns:cc="http://creativecommons.org/ns#; 
xmlns:dc="http://purl.org/dc/elements/1.1/;>hibernate
+3.2.6.ga
+commons-collections
+2.1.1
+2.1 (evicted)
+cglib
+2.1_3
+asm
+1.5.3
+antlr
+2.7.6
+dom4j
+1.6.1
+asm-attrs
+1.5.3
+jta
+1.0.1B
+ehcache
+1.2.3
+commons-logging
+1.0.4
+3.2.6.ga
+2.1.1
+2.1_3
+1.5.3
+1.5.3
+2.7.6
+1.6.1
+1.5.3
+1.0.1B
+1.2.3
+2.1
+1.0.4
+1.0.4
+

[04/11] ant-ivy git commit: first batch of SVG replacements

[jhm]

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/cc35c2b1/doc/images/ivy-publish-fc.svg
--
diff --git a/doc/images/ivy-publish-fc.svg b/doc/images/ivy-publish-fc.svg
new file mode 100644
index 000..c98f08f
--- /dev/null
+++ b/doc/images/ivy-publish-fc.svg
@@ -0,0 +1,20 @@
+
+
+http://www.w3.org/1999/02/22-rdf-syntax-ns#; 
xmlns="http://www.w3.org/2000/svg; xml:space="preserve" viewBox="0 0 485 638" 
version="1.2" y="0px" x="0px" xmlns:cc="http://creativecommons.org/ns#; 
xmlns:dc="http://purl.org/dc/elements/1.1/;>
 http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/cc35c2b1/doc/images/ivy-terminology.odg
--
diff --git a/doc/images/ivy-terminology.odg b/doc/images/ivy-terminology.odg
index 445d7e7..9e4f92d 100644
Binary files a/doc/images/ivy-terminology.odg and 
b/doc/images/ivy-terminology.odg differ

[01/11] ant-ivy git commit: Inline warning icon

[jhm]

Repository: ant-ivy
Updated Branches:
  refs/heads/master a267723e6 -> 147fe0eb2


Inline warning icon

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

Branch: refs/heads/master
Commit: 5e590e57dc73f487dc6541888c9efcf08138de40
Parents: cc35c2b
Author: twogee 
Authored: Sat Jun 3 09:58:10 2017 +0200
Committer: twogee 
Committed: Sat Jun 3 17:09:12 2017 +0200

--
 doc/osgi.html | 4 +---
 doc/osgi/eclipse-plugin.html  | 2 +-
 doc/osgi/standard-osgi.html   | 2 +-
 doc/osgi/target-platform.html | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/5e590e57/doc/osgi.html
--
diff --git a/doc/osgi.html b/doc/osgi.html
index 80ca878..6783ec5 100644
--- a/doc/osgi.html
+++ b/doc/osgi.html
@@ -25,12 +25,11 @@
 
 

-
 Since Apache Ivy 2.3, some support for OSGi dependency management 
has been introduced.
 
 
   
-
+http://www.w3.org/2000/svg; 
xml:space="preserve" width="1em" version="1.1" y="0px" x="0px" viewBox="0 0 
980.02045 886.1">
 
 Note that this feature is considered as experimental. It should 
work with simple configuration but may not in complex ones. If you have any 
issue with that feature, you are welcomed to come discussed your use case on 
the http://ant.apache.org/ivy/mailing-lists.html;>ivy-user mailing 
list, or discuss about implementation issues or improvement you may have found 
on http://ant.apache.org/ivy/mailing-lists.html;>ant-dev.
 
@@ -59,7 +58,6 @@ Here are different use case of using the OSGi capabilities of 
Ivy:
 building a standard OSGi 
bundle
 managing a "target" 
platform
 
-

 xooki.postProcess();
 

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/5e590e57/doc/osgi/eclipse-plugin.html
--
diff --git a/doc/osgi/eclipse-plugin.html b/doc/osgi/eclipse-plugin.html
index 28c59c4..3b24d92 100644
--- a/doc/osgi/eclipse-plugin.html
+++ b/doc/osgi/eclipse-plugin.html
@@ -28,7 +28,7 @@
 
 
   
-
+http://www.w3.org/2000/svg; 
xml:space="preserve" width="1em" version="1.1" y="0px" x="0px" viewBox="0 0 
980.02045 886.1">
 
 Note that this feature is considered as experimental. It should 
work with simple configuration but may not in complex ones. If you have any 
issue with that feature, you are welcomed to come discussed your use case on 
the http://ant.apache.org/ivy/mailing-lists.html;>ivy-user mailing 
list, or discuss about implementation issues or improvement you may have found 
on http://ant.apache.org/ivy/mailing-lists.html;>ant-dev.
 

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/5e590e57/doc/osgi/standard-osgi.html
--
diff --git a/doc/osgi/standard-osgi.html b/doc/osgi/standard-osgi.html
index 81687b6..755affc 100644
--- a/doc/osgi/standard-osgi.html
+++ b/doc/osgi/standard-osgi.html
@@ -28,7 +28,7 @@
 
 
   
-
+http://www.w3.org/2000/svg; 
xml:space="preserve" width="1em" version="1.1" y="0px" x="0px" viewBox="0 0 
980.02045 886.1">
 
 Note that this feature is considered as experimental. It should 
work with simple configuration but may not in complex ones. If you have any 
issue with that feature, you are welcomed to come discussed your use case on 
the http://ant.apache.org/ivy/mailing-lists.html;>ivy-user mailing 
list, or discuss about implementation issues or improvement you may have found 
on http://ant.apache.org/ivy/mailing-lists.html;>ant-dev.
 

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/5e590e57/doc/osgi/target-platform.html
--
diff --git a/doc/osgi/target-platform.html b/doc/osgi/target-platform.html
index 1f64644..863df9d 100644
--- a/doc/osgi/target-platform.html
+++ b/doc/osgi/target-platform.html
@@ -28,7 +28,7 @@
 
 
   
-
+http://www.w3.org/2000/svg; 
xml:space="preserve" width="1em" version="1.1" y="0px" x="0px" viewBox="0 0 
980.02045 886.1">
 
 Note that this feature is considered as experimental. It should 
work with simple configuration but may not in complex ones. If you have any 
issue with that feature, you are welcomed to come discussed your use case on 
the http://ant.apache.org/ivy/mailing-lists.html;>ivy-user mailing 
list, or discuss about implementation issues or improvement you may have found 
on http://ant.apache.org/ivy/mailing-lists.html;>ant-dev.
 

[04/18] ant-ivy git commit: first batch of SVG replacements

[jhm]

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/838aa1bd/doc/images/apache-incubator.svg
--
diff --git a/doc/images/apache-incubator.svg b/doc/images/apache-incubator.svg
new file mode 100644
index 000..7f53236
--- /dev/null
+++ b/doc/images/apache-incubator.svg
@@ -0,0 +1,21 @@
+
+
+
+http://www.w3.org/1999/02/22-rdf-syntax-ns#; 
xmlns="http://www.w3.org/2000/svg; enable-background="new 0 0 697.32 518.74" 
xml:space="preserve" viewBox="0 0 638.90594 148.79584" version="1.1" y="0px" 
x="0px" xmlns:cc="http://creativecommons.org/ns#; 
xmlns:dc="http://purl.org/dc/elements/1.1/;>

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/838aa1bd/doc/images/hibgraph.svg
--
diff --git a/doc/images/hibgraph.svg b/doc/images/hibgraph.svg
new file mode 100644
index 000..bbaf802
--- /dev/null
+++ b/doc/images/hibgraph.svg
@@ -0,0 +1,55 @@
+
+
+
+http://www.w3.org/1999/02/22-rdf-syntax-ns#; 
xmlns="http://www.w3.org/2000/svg; xml:space="preserve" viewBox="0 0 549.56701 
519.84498" version="1.2" y="0px" x="0px" 
xmlns:cc="http://creativecommons.org/ns#; 
xmlns:dc="http://purl.org/dc/elements/1.1/;>hibernate
+3.2.6.ga
+commons-collections
+2.1.1
+2.1 (evicted)
+cglib
+2.1_3
+asm
+1.5.3
+antlr
+2.7.6
+dom4j
+1.6.1
+asm-attrs
+1.5.3
+jta
+1.0.1B
+ehcache
+1.2.3
+commons-logging
+1.0.4
+3.2.6.ga
+2.1.1
+2.1_3
+1.5.3
+1.5.3
+2.7.6
+1.6.1
+1.5.3
+1.0.1B
+1.2.3
+2.1
+1.0.4
+1.0.4
+

[13/18] ant-ivy git commit: svg: remove generator comments, format xml code

[jhm]

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/7dc1b936/doc/images/ivy-publish-fc.svg
--
diff --git a/doc/images/ivy-publish-fc.svg b/doc/images/ivy-publish-fc.svg
index c98f08f..0640267 100644
--- a/doc/images/ivy-publish-fc.svg
+++ b/doc/images/ivy-publish-fc.svg
@@ -17,4 +17,321 @@
specific language governing permissions and limitations
under the License.
 -->
-http://www.w3.org/1999/02/22-rdf-syntax-ns#; 
xmlns="http://www.w3.org/2000/svg; xml:space="preserve" viewBox="0 0 485 638" 
version="1.2" y="0px" x="0px" xmlns:cc="http://creativecommons.org/ns#; 
xmlns:dc="http://purl.org/dc/elements/1.1/;>
 

[14/18] ant-ivy git commit: svg: remove generator comments, format xml code

[jhm]

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/7dc1b936/doc/images/apache-incubator.svg
--
diff --git a/doc/images/apache-incubator.svg b/doc/images/apache-incubator.svg
index 7f53236..41e5d86 100644
--- a/doc/images/apache-incubator.svg
+++ b/doc/images/apache-incubator.svg
@@ -1,5 +1,4 @@
 
-
 
-http://www.w3.org/1999/02/22-rdf-syntax-ns#; 
xmlns="http://www.w3.org/2000/svg; enable-background="new 0 0 697.32 518.74" 
xml:space="preserve" viewBox="0 0 638.90594 148.79584" version="1.1" y="0px" 
x="0px" xmlns:cc="http://creativecommons.org/ns#; 
xmlns:dc="http://purl.org/dc/elements/1.1/;>
+http://www.w3.org/1999/02/22-rdf-syntax-ns#; 
xmlns="http://www.w3.org/2000/svg; enable-background="new 0 0 697.32 518.74" 
xml:space="preserve" viewBox="0 0 638.90594 148.79584" version="1.1" y="0px" 
x="0px" xmlns:cc="http://creativecommons.org/ns#; 
xmlns:dc="http://purl.org/dc/elements/1.1/;>
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  
+  
+
+
+
+  
+  
+
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/7dc1b936/doc/images/hibgraph.svg
--
diff --git a/doc/images/hibgraph.svg b/doc/images/hibgraph.svg
index bbaf802..bdc8bd7 100644
--- a/doc/images/hibgraph.svg
+++ b/doc/images/hibgraph.svg
@@ -1,5 +1,4 @@
 
-
 
-http://www.w3.org/1999/02/22-rdf-syntax-ns#; 
xmlns="http://www.w3.org/2000/svg; xml:space="preserve" viewBox="0 0 549.56701 
519.84498" version="1.2" y="0px" x="0px" 
xmlns:cc="http://creativecommons.org/ns#; 
xmlns:dc="http://purl.org/dc/elements/1.1/;>hibernate
-3.2.6.ga
-commons-collections
-2.1.1
-2.1 (evicted)
-cglib
-2.1_3
-asm
-1.5.3
-antlr
-2.7.6
-dom4j
-1.6.1
-asm-attrs
-1.5.3
-jta
-1.0.1B
-ehcache
-1.2.3
-commons-logging
-1.0.4
-3.2.6.ga
-2.1.1
-2.1_3
-1.5.3
-1.5.3
-2.7.6
-1.6.1
-1.5.3
-1.0.1B
-1.2.3
-2.1
-1.0.4
-1.0.4
-
+http://www.w3.org/1999/02/22-rdf-syntax-ns#; 
xmlns="http://www.w3.org/2000/svg; xml:space="preserve" viewBox="0 0 549.56701 
519.84498" version="1.2" y="0px" x="0px" 
xmlns:cc="http://creativecommons.org/ns#; 
xmlns:dc="http://purl.org/dc/elements/1.1/;>
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  
+  
+  hibernate
+  
+  3.2.6.ga
+  
+  
+  
+  
+commons-collections
+
+2.1.1
+
+2.1 (evicted)
+
+  
+  
+  
+  cglib
+  
+  2.1_3
+  
+  
+  
+  asm
+  
+  1.5.3
+  
+  
+  
+  antlr
+  
+  2.7.6
+  
+  
+  
+  dom4j
+  
+  1.6.1
+  
+  
+  
+  asm-attrs
+  
+  1.5.3
+  
+  
+  
+  jta
+  
+  1.0.1B
+  
+  
+  
+  ehcache
+  
+  1.2.3
+  
+  
+  
+  commons-logging
+  
+  1.0.4
+  
+  
+  
+  
+  3.2.6.ga
+  
+  
+  
+  2.1.1
+  
+  
+  
+  2.1_3
+  
+  
+  
+  1.5.3
+  
+  
+  
+  1.5.3
+  
+  
+  
+  2.7.6
+  
+  
+  
+  1.6.1
+  
+  
+  
+  1.5.3
+  
+  
+  
+  1.0.1B
+  
+  
+  
+  1.2.3
+  
+  
+  
+  2.1
+  
+  
+  
+  1.0.4
+  
+  
+  
+  1.0.4
+  
+
\ No newline at end of file

[05/18] ant-ivy git commit: first batch of SVG replacements

[jhm]

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/838aa1bd/doc/images/ant-project-logo.svg
--
diff --git a/doc/images/ant-project-logo.svg b/doc/images/ant-project-logo.svg
new file mode 100644
index 000..fb9558b
--- /dev/null
+++ b/doc/images/ant-project-logo.svg
@@ -0,0 +1,21 @@
+
+
+
+http://www.w3.org/1999/02/22-rdf-syntax-ns#; 
xmlns="http://www.w3.org/2000/svg; enable-background="new 0 0 697.32 518.74" 
xml:space="preserve" viewBox="0 0 680.49139 191.48885" version="1.1" y="0px" 
x="0px" xmlns:cc="http://creativecommons.org/ns#; 
xmlns:dc="http://purl.org/dc/elements/1.1/;><
 path d="m133.61 67.139 0.932 0.312 1.392 0.608 1.706 0.625 1.867 0.768 2.014 
0.772 2.025 0.619 1.867 0.615 1.688 0.461 0.622-4.026 0.77-3.884 0.778-3.726 
1.078-3.56 1.086-3.409 1.397-3.259 1.388-3.109 1.714-3.111 1.703-2.789 
1.856-2.795 2.009-2.795 2.325-2.474 2.326-2.331 2.481-2.325 2.628-2.334 
2.79-2.017-3.57-3.555-3.412-2.022-3.575-0.616-3.564 0.616-3.412 1.723-3.248 
2.631-3.102 3.415-2.953 4.034-2.784 4.501-2.473 4.804-2.315 4.973-2.025 
5.118-1.534 4.965-1.234 4.656-0.785 4.192-0.459 3.718 0.003 0.011z" 
stroke-width="0.254" fill="url(#ag)"/>stroke-width="0.254" fill="url(#q)"/>gradientUnits="userSpaceOnUse" x2="-3454.9" gradientTransform="matrix(-.5318 
 >.0004 -.0004 -.5318 -1376.5 2061.7)" y1="3641.9" x1="-3354">stop-color="#512A7C" offset="0"/>offset=".0701"/>stop-color="#C21F4B" offset=".3368"/>offset=".4512"/>stop-color="#ED1B35" offset=".6158"/><
 stop stop-color="#F6EE61" 

[07/18] ant-ivy git commit: Inline warning icon

[jhm]

Inline warning icon

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

Branch: refs/heads/master
Commit: 57ee0f2d15768efd10c15c7ef14da8a7db94deaa
Parents: 838aa1b
Author: twogee 
Authored: Sat Jun 3 09:58:10 2017 +0200
Committer: twogee 
Committed: Sat Jun 3 09:58:10 2017 +0200

--
 doc/osgi.html | 4 +---
 doc/osgi/eclipse-plugin.html  | 2 +-
 doc/osgi/standard-osgi.html   | 2 +-
 doc/osgi/target-platform.html | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/57ee0f2d/doc/osgi.html
--
diff --git a/doc/osgi.html b/doc/osgi.html
index 80ca878..6783ec5 100644
--- a/doc/osgi.html
+++ b/doc/osgi.html
@@ -25,12 +25,11 @@
 
 

-
 Since Apache Ivy 2.3, some support for OSGi dependency management 
has been introduced.
 
 
   
-
+http://www.w3.org/2000/svg; 
xml:space="preserve" width="1em" version="1.1" y="0px" x="0px" viewBox="0 0 
980.02045 886.1">
 
 Note that this feature is considered as experimental. It should 
work with simple configuration but may not in complex ones. If you have any 
issue with that feature, you are welcomed to come discussed your use case on 
the http://ant.apache.org/ivy/mailing-lists.html;>ivy-user mailing 
list, or discuss about implementation issues or improvement you may have found 
on http://ant.apache.org/ivy/mailing-lists.html;>ant-dev.
 
@@ -59,7 +58,6 @@ Here are different use case of using the OSGi capabilities of 
Ivy:
 building a standard OSGi 
bundle
 managing a "target" 
platform
 
-

 xooki.postProcess();
 

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/57ee0f2d/doc/osgi/eclipse-plugin.html
--
diff --git a/doc/osgi/eclipse-plugin.html b/doc/osgi/eclipse-plugin.html
index 28c59c4..3b24d92 100644
--- a/doc/osgi/eclipse-plugin.html
+++ b/doc/osgi/eclipse-plugin.html
@@ -28,7 +28,7 @@
 
 
   
-
+http://www.w3.org/2000/svg; 
xml:space="preserve" width="1em" version="1.1" y="0px" x="0px" viewBox="0 0 
980.02045 886.1">
 
 Note that this feature is considered as experimental. It should 
work with simple configuration but may not in complex ones. If you have any 
issue with that feature, you are welcomed to come discussed your use case on 
the http://ant.apache.org/ivy/mailing-lists.html;>ivy-user mailing 
list, or discuss about implementation issues or improvement you may have found 
on http://ant.apache.org/ivy/mailing-lists.html;>ant-dev.
 

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/57ee0f2d/doc/osgi/standard-osgi.html
--
diff --git a/doc/osgi/standard-osgi.html b/doc/osgi/standard-osgi.html
index 81687b6..755affc 100644
--- a/doc/osgi/standard-osgi.html
+++ b/doc/osgi/standard-osgi.html
@@ -28,7 +28,7 @@
 
 
   
-
+http://www.w3.org/2000/svg; 
xml:space="preserve" width="1em" version="1.1" y="0px" x="0px" viewBox="0 0 
980.02045 886.1">
 
 Note that this feature is considered as experimental. It should 
work with simple configuration but may not in complex ones. If you have any 
issue with that feature, you are welcomed to come discussed your use case on 
the http://ant.apache.org/ivy/mailing-lists.html;>ivy-user mailing 
list, or discuss about implementation issues or improvement you may have found 
on http://ant.apache.org/ivy/mailing-lists.html;>ant-dev.
 

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/57ee0f2d/doc/osgi/target-platform.html
--
diff --git a/doc/osgi/target-platform.html b/doc/osgi/target-platform.html
index 1f64644..863df9d 100644
--- a/doc/osgi/target-platform.html
+++ b/doc/osgi/target-platform.html
@@ -28,7 +28,7 @@
 
 
   
-
+http://www.w3.org/2000/svg; 
xml:space="preserve" width="1em" version="1.1" y="0px" x="0px" viewBox="0 0 
980.02045 886.1">
 
 Note that this feature is considered as experimental. It should 
work with simple configuration but may not in complex ones. If you have any 
issue with that feature, you are welcomed to come discussed your use case on 
the http://ant.apache.org/ivy/mailing-lists.html;>ivy-user mailing 
list, or discuss about implementation issues or improvement you may have found 
on http://ant.apache.org/ivy/mailing-lists.html;>ant-dev.
 

[17/18] ant-ivy git commit: Merge branch 'PR-41'

[jhm]

Merge branch 'PR-41'


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

Branch: refs/heads/master
Commit: 59a7dfa3d6b1647e737acc648dbfd8c49e6ebd2a
Parents: 95a524e 7dc1b93
Author: Jan Matèrne 
Authored: Sat Jun 3 18:14:19 2017 +0200
Committer: Jan Matèrne 
Committed: Sat Jun 3 18:14:19 2017 +0200

--
 build-release.xml   | 266 +++---
 doc/images/ant-group-logo.gif   | Bin 7577 -> 0 bytes
 doc/images/ant-project-logo.gif | Bin 0 -> 7577 bytes
 doc/images/ant-project-logo.svg | 951 +++
 doc/images/apache-incubator.svg |  44 +
 doc/images/hibgraph.svg | 173 
 doc/images/ivy-publish-fc.svg   | 337 +++
 doc/images/ivy-terminology.odg  | Bin 20840 -> 22331 bytes
 doc/images/ivy-terminology.svg  | 419 
 doc/images/main-tasks.odg   | Bin 0 -> 12386 bytes
 doc/images/main-tasks.svg   |  82 ++
 doc/osgi.html   |   4 +-
 doc/osgi/eclipse-plugin.html|   2 +-
 doc/osgi/standard-osgi.html |   2 +-
 doc/osgi/target-platform.html   |   2 +-
 doc/printTemplate.html  |   2 +-
 doc/template.html   |   2 +-
 .../src/example/Hello.java  |   8 +-
 .../src/example/ConfigurationsExample.java  |   8 +-
 .../src/filter/FilterProvider.java  |   4 +-
 .../src/filter/ccimpl/CCFilter.java |   2 +-
 .../src/filter/hmimpl/HMFilter.java |   2 +-
 .../test/filter/AbstractTestFilter.java |   4 +-
 .../multi-projects/myapp/src/myapp/Main.java|   4 +-
 .../dependee/src/standalone/Main.java   |   8 +-
 .../dependence/depender/src/depending/Main.java |   6 +-
 src/example/dual/project/src/example/Hello.java |  14 +-
 src/example/hello-ivy/src/example/Hello.java|  10 +-
 .../projects/console/src/console/Main.java  |  10 +-
 .../projects/find/src/find/FindFile.java|   8 +-
 .../projects/find/src/find/Main.java|  14 +-
 .../projects/list/src/list/ListFile.java|   8 +-
 .../projects/list/src/list/Main.java|  14 +-
 .../projects/size/src/size/FileSize.java|   6 +-
 .../projects/sizewhere/src/sizewhere/Main.java  |  14 +-
 .../sizewhere/src/sizewhere/SizeWhere.java  |   4 +-
 .../projects/version/src/version/Version.java   |   6 +-
 src/java/org/apache/ivy/Main.java   |   2 +-
 src/java/org/apache/ivy/ant/AntCallTrigger.java |   6 +-
 .../org/apache/ivy/ant/AntMessageLogger.java|   4 +-
 .../apache/ivy/ant/IvyAntVariableContainer.java |   4 +-
 .../org/apache/ivy/ant/IvyCacheFileset.java |   4 +-
 src/java/org/apache/ivy/ant/IvyCheck.java   |   2 +-
 src/java/org/apache/ivy/ant/IvyCleanCache.java  |   4 +-
 src/java/org/apache/ivy/core/IvyThread.java |   2 +-
 .../apache/ivy/core/cache/ArtifactOrigin.java   |   4 +-
 .../org/apache/ivy/core/cache/CacheUtil.java|   4 +-
 .../cache/DefaultResolutionCacheManager.java|   4 +-
 .../core/cache/ModuleDescriptorMemoryCache.java |   2 +-
 .../ivy/core/cache/RepositoryCacheManager.java  |  65 +-
 .../PublishingDependencyRevisionResolver.java   |   2 +-
 .../event/publish/EndArtifactPublishEvent.java  |   2 +-
 .../ivy/core/event/publish/PublishEvent.java|   2 +-
 .../publish/StartArtifactPublishEvent.java  |   2 +-
 .../resolve/EndResolveDependencyEvent.java  |   2 +-
 .../core/event/retrieve/EndRetrieveEvent.java   |   8 +-
 .../descriptor/AbstractIncludeExcludeRule.java  |   2 +-
 .../ivy/core/module/descriptor/Artifact.java|  18 +-
 .../core/module/descriptor/Configuration.java   |   6 +-
 .../module/descriptor/ConfigurationAware.java   |   4 +-
 .../module/descriptor/ConfigurationGroup.java   |   4 +-
 .../descriptor/ConfigurationIntersection.java   |   4 +-
 .../DefaultDependencyArtifactDescriptor.java|   2 +-
 .../descriptor/DefaultDependencyDescriptor.java |  11 +-
 .../descriptor/DefaultModuleDescriptor.java |   5 +-
 .../DependencyDescriptorMediator.java   |   2 +-
 .../ivy/core/module/descriptor/ExcludeRule.java |   6 +-
 .../ivy/core/module/descriptor/IncludeRule.java |   6 +-
 .../core/module/descriptor/InheritableItem.java |   2 +-
 .../module/descriptor/ModuleDescriptor.java |  10 +-
 .../OverrideDependencyDescriptorMediator.java   |   6 +-
 .../ivy/core/module/id/ArtifactRevisionId.java  |   2 +-
 .../org/apache/ivy/core/module/id/ModuleId.java |  22 +-
 .../ivy/core/module/id/ModuleRevisionId.java

[16/18] ant-ivy git commit: svg: remove generator comments, format xml code

[jhm]

svg: remove generator comments, format xml code


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

Branch: refs/heads/master
Commit: 7dc1b936548c90f0eb88dc384406f2ebf39b4d31
Parents: ef719ac
Author: Jan Matèrne 
Authored: Sat Jun 3 18:13:46 2017 +0200
Committer: Jan Matèrne 
Committed: Sat Jun 3 18:13:46 2017 +0200

--
 doc/images/ant-project-logo.svg | 934 ++-
 doc/images/apache-incubator.svg |  27 +-
 doc/images/hibgraph.svg | 190 +--
 doc/images/ivy-publish-fc.svg   | 319 +++-
 doc/images/ivy-terminology.svg  | 401 ++-
 doc/images/main-tasks.svg   |  65 ++-
 6 files changed, 1892 insertions(+), 44 deletions(-)
--

[08/18] ant-ivy git commit: Checkstyle-driven cleanup (whitespace, javadoc, JLS)

[jhm]

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/ef719aca/src/java/org/apache/ivy/plugins/repository/vfs/VfsRepository.java
--
diff --git a/src/java/org/apache/ivy/plugins/repository/vfs/VfsRepository.java 
b/src/java/org/apache/ivy/plugins/repository/vfs/VfsRepository.java
index 914757f..f086822 100644
--- a/src/java/org/apache/ivy/plugins/repository/vfs/VfsRepository.java
+++ b/src/java/org/apache/ivy/plugins/repository/vfs/VfsRepository.java
@@ -120,6 +120,7 @@ public class VfsRepository extends AbstractRepository {
  *
  * @param vfsURI
  *a String identifying a VFS Resource
+ * @return Resource
  * @throws IOException on failure
  * @see "Supported File Systems in the jakarta-commons-vfs documentation"
  */
@@ -162,6 +163,7 @@ public class VfsRepository extends AbstractRepository {
  *
  * @param vfsURI
  *providing identifying a VFS provided resource
+ * @return List
  * @throws IOException
  * on failure.
  * @see "Supported File Systems in the jakarta-commons-vfs documentation"

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/ef719aca/src/java/org/apache/ivy/plugins/resolver/AbstractPatternsBasedResolver.java
--
diff --git 
a/src/java/org/apache/ivy/plugins/resolver/AbstractPatternsBasedResolver.java 
b/src/java/org/apache/ivy/plugins/resolver/AbstractPatternsBasedResolver.java
index ff99b8e..e493cce 100644
--- 
a/src/java/org/apache/ivy/plugins/resolver/AbstractPatternsBasedResolver.java
+++ 
b/src/java/org/apache/ivy/plugins/resolver/AbstractPatternsBasedResolver.java
@@ -272,7 +272,7 @@ public abstract class AbstractPatternsBasedResolver extends 
BasicResolver {
 
 /**
  * example of pattern : ~/Workspace/[module]/[module].ivy.xml
- * 
+ *
  * @param pattern String
  */
 public void addIvyPattern(String pattern) {

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/ef719aca/src/java/org/apache/ivy/plugins/resolver/AbstractResolver.java
--
diff --git a/src/java/org/apache/ivy/plugins/resolver/AbstractResolver.java 
b/src/java/org/apache/ivy/plugins/resolver/AbstractResolver.java
index b310ed8..ed8a3d9 100644
--- a/src/java/org/apache/ivy/plugins/resolver/AbstractResolver.java
+++ b/src/java/org/apache/ivy/plugins/resolver/AbstractResolver.java
@@ -133,7 +133,7 @@ public abstract class AbstractResolver implements 
DependencyResolver, HasLatestS
 
 /**
  * this method should remove sensitive information from a location to be 
displayed in a log
- * 
+ *
  * @param name
  *location
  * @return location with sensitive data replaced by stars
@@ -206,6 +206,10 @@ public abstract class AbstractResolver implements 
DependencyResolver, HasLatestS
 
 /**
  * Default implementation downloads the artifact without taking advantage 
of its location
+ *
+ * @param artifact ArtifactOrigin
+ * @param options DownloadOptions
+ * @return ArtifactDownloadReport
  */
 public ArtifactDownloadReport download(ArtifactOrigin artifact, 
DownloadOptions options) {
 DownloadReport r = download(new Artifact[] {artifact.getArtifact()}, 
options);
@@ -219,6 +223,9 @@ public abstract class AbstractResolver implements 
DependencyResolver, HasLatestS
 /**
  * Default implementation actually download the artifact Subclasses should 
overwrite this to
  * avoid the download
+ *
+ * @param artifact ArtifactOrigin
+ * @return ArtifactOrigin
  */
 public ArtifactOrigin locate(Artifact artifact) {
 DownloadReport dr = download(new Artifact[] {artifact}, new 
DownloadOptions());
@@ -498,7 +505,7 @@ public abstract class AbstractResolver implements 
DependencyResolver, HasLatestS
 /**
  * Returns true if rmr1 is after rmr2, using the latest strategy to 
determine which is the
  * latest
- * 
+ *
  * @param rmr1 ResolvedModuleRevision
  * @param rmr2 ResolvedModuleRevision
  * @param date Date

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/ef719aca/src/java/org/apache/ivy/plugins/resolver/AbstractWorkspaceResolver.java
--
diff --git 
a/src/java/org/apache/ivy/plugins/resolver/AbstractWorkspaceResolver.java 
b/src/java/org/apache/ivy/plugins/resolver/AbstractWorkspaceResolver.java
index 5444ab0..016bd99 100644
--- a/src/java/org/apache/ivy/plugins/resolver/AbstractWorkspaceResolver.java
+++ b/src/java/org/apache/ivy/plugins/resolver/AbstractWorkspaceResolver.java
@@ -226,7 +226,7 @@ public abstract class AbstractWorkspaceResolver extends 
AbstractResolver {
 return newMd;
 }
 
-abstract protected List 
createWorkspaceArtifacts(ModuleDescriptor md);
+protected abstract List 

[02/18] ant-ivy git commit: first batch of SVG replacements

[jhm]

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/838aa1bd/doc/images/ivy-terminology.svg
--
diff --git a/doc/images/ivy-terminology.svg b/doc/images/ivy-terminology.svg
new file mode 100644
index 000..826706c
--- /dev/null
+++ b/doc/images/ivy-terminology.svg
@@ -0,0 +1,20 @@
+
+
+http://www.w3.org/1999/02/22-rdf-syntax-ns#; 
xmlns="http://www.w3.org/2000/svg; xml:space="preserve" viewBox="0 0 363.33 
643.59" version="1.2" y="0px" x="0px" xmlns:cc="http://creativecommons.org/ns#; 
xmlns:dc="http://purl.org/dc/elements/1.1/;>http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/838aa1bd/doc/images/main-tasks.odg
--
diff --git a/doc/images/main-tasks.odg b/doc/images/main-tasks.odg
new file mode 100644
index 000..2e75d56
Binary files /dev/null and b/doc/images/main-tasks.odg differ

[12/18] ant-ivy git commit: svg: remove generator comments, format xml code

[jhm]

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/7dc1b936/doc/images/ivy-terminology.svg
--
diff --git a/doc/images/ivy-terminology.svg b/doc/images/ivy-terminology.svg
index 826706c..f0d2d9e 100644
--- a/doc/images/ivy-terminology.svg
+++ b/doc/images/ivy-terminology.svg
@@ -17,4 +17,403 @@
specific language governing permissions and limitations
under the License.
 -->
-http://www.w3.org/1999/02/22-rdf-syntax-ns#; 
xmlns="http://www.w3.org/2000/svg; xml:space="preserve" viewBox="0 0 363.33 
643.59" version="1.2" y="0px" x="0px" xmlns:cc="http://creativecommons.org/ns#; 

[09/18] ant-ivy git commit: Checkstyle-driven cleanup (whitespace, javadoc, JLS)

[jhm]

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/ef719aca/src/java/org/apache/ivy/core/event/resolve/EndResolveDependencyEvent.java
--
diff --git 
a/src/java/org/apache/ivy/core/event/resolve/EndResolveDependencyEvent.java 
b/src/java/org/apache/ivy/core/event/resolve/EndResolveDependencyEvent.java
index 3f01d10..66a8843 100644
--- a/src/java/org/apache/ivy/core/event/resolve/EndResolveDependencyEvent.java
+++ b/src/java/org/apache/ivy/core/event/resolve/EndResolveDependencyEvent.java
@@ -65,7 +65,7 @@ public class EndResolveDependencyEvent extends 
ResolveDependencyEvent {
  * dependency management. It's basically the time elapsed since the 
corresponding
  * {@link StartResolveDependencyEvent}
  * 
- * 
+ *
  * @return the time elapsed to resolve the dependency.
  */
 public long getDuration() {

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/ef719aca/src/java/org/apache/ivy/core/event/retrieve/EndRetrieveEvent.java
--
diff --git a/src/java/org/apache/ivy/core/event/retrieve/EndRetrieveEvent.java 
b/src/java/org/apache/ivy/core/event/retrieve/EndRetrieveEvent.java
index ad0514b..b38781f 100644
--- a/src/java/org/apache/ivy/core/event/retrieve/EndRetrieveEvent.java
+++ b/src/java/org/apache/ivy/core/event/retrieve/EndRetrieveEvent.java
@@ -47,7 +47,7 @@ public class EndRetrieveEvent extends RetrieveEvent {
 
 /**
  * Duration of the retrieve operation, in ms.
- * 
+ *
  * @return Duration of the retrieve operation, in ms.
  */
 public long getDuration() {
@@ -56,7 +56,7 @@ public class EndRetrieveEvent extends RetrieveEvent {
 
 /**
  * Number of artifacts which were copied (or symlinked) during the retrieve
- * 
+ *
  * @return Number of artifacts which were copied during the retrieve.
  */
 public int getNbCopied() {
@@ -65,7 +65,7 @@ public class EndRetrieveEvent extends RetrieveEvent {
 
 /**
  * Number of artifacts which were not copied since they were already 
present and up to date.
- * 
+ *
  * @return Number of artifacts which were not copied since they were 
already present and up to
  * date.
  */
@@ -75,7 +75,7 @@ public class EndRetrieveEvent extends RetrieveEvent {
 
 /**
  * Total size of all copied (or symlinked) artifacts, in bytes.
- * 
+ *
  * @return Total size of all copied (or symlinked) artifacts, in bytes.
  */
 public long getTotalCopiedSize() {

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/ef719aca/src/java/org/apache/ivy/core/module/descriptor/AbstractIncludeExcludeRule.java
--
diff --git 
a/src/java/org/apache/ivy/core/module/descriptor/AbstractIncludeExcludeRule.java
 
b/src/java/org/apache/ivy/core/module/descriptor/AbstractIncludeExcludeRule.java
index 607690c..6c29ad2 100644
--- 
a/src/java/org/apache/ivy/core/module/descriptor/AbstractIncludeExcludeRule.java
+++ 
b/src/java/org/apache/ivy/core/module/descriptor/AbstractIncludeExcludeRule.java
@@ -69,7 +69,7 @@ public abstract class AbstractIncludeExcludeRule extends 
UnmodifiableExtendableI
 
 /**
  * Add a configuration for this rule
- * 
+ *
  * @param conf String
  */
 public void addConfiguration(String conf) {

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/ef719aca/src/java/org/apache/ivy/core/module/descriptor/Artifact.java
--
diff --git a/src/java/org/apache/ivy/core/module/descriptor/Artifact.java 
b/src/java/org/apache/ivy/core/module/descriptor/Artifact.java
index 3797839..648e374 100644
--- a/src/java/org/apache/ivy/core/module/descriptor/Artifact.java
+++ b/src/java/org/apache/ivy/core/module/descriptor/Artifact.java
@@ -33,28 +33,28 @@ public interface Artifact extends ExtendableItem {
 
 /**
  * Returns the resolved module revision id for this artifact
- * 
+ *
  * @return the resolved module revision id.
  */
 ModuleRevisionId getModuleRevisionId();
 
 /**
  * Returns the resolved publication date for this artifact
- * 
+ *
  * @return the resolved publication date. Never null.
  */
 Date getPublicationDate();
 
 /**
  * Return the name of the artifact, generally 'part' of the basename of 
the file.
- * 
+ *
  * @return the name of the artifact. Never null.
  */
 String getName();
 
 /**
  * Returns the type of the artifact, typically 'jar', 'source', 'javadoc', 
'debian', ...
- * 
+ *
  * @return the type of the artifact. Never null.
  */
 String getType();
@@ -62,7 +62,7 @@ public interface Artifact extends ExtendableItem {
 /**
  * Retrieve the extension of the artifact. The extension is without dot 
(ie. 'jar' and not

[06/18] ant-ivy git commit: first batch of SVG replacements

[jhm]

first batch of SVG replacements

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

Branch: refs/heads/master
Commit: 838aa1bd37ff2f60a51c60969204964839937eb9
Parents: 990eb75
Author: twogee 
Authored: Fri Jun 2 17:37:04 2017 +0200
Committer: twogee 
Committed: Fri Jun 2 18:27:23 2017 +0200

--
 doc/images/ant-group-logo.gif   | Bin 7577 -> 0 bytes
 doc/images/ant-project-logo.gif | Bin 0 -> 7577 bytes
 doc/images/ant-project-logo.svg |  21 +
 doc/images/apache-incubator.svg |  21 +
 doc/images/hibgraph.svg |  55 +++
 doc/images/ivy-publish-fc.svg   |  20 +
 doc/images/ivy-terminology.odg  | Bin 20840 -> 22331 bytes
 doc/images/ivy-terminology.svg  |  20 +
 doc/images/main-tasks.odg   | Bin 0 -> 12386 bytes
 doc/images/main-tasks.svg   |  21 +
 doc/printTemplate.html  |   2 +-
 doc/template.html   |   2 +-
 12 files changed, 160 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/838aa1bd/doc/images/ant-group-logo.gif
--
diff --git a/doc/images/ant-group-logo.gif b/doc/images/ant-group-logo.gif
deleted file mode 100644
index de57d34..000
Binary files a/doc/images/ant-group-logo.gif and /dev/null differ

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/838aa1bd/doc/images/ant-project-logo.gif
--
diff --git a/doc/images/ant-project-logo.gif b/doc/images/ant-project-logo.gif
new file mode 100644
index 000..de57d34
Binary files /dev/null and b/doc/images/ant-project-logo.gif differ

[10/18] ant-ivy git commit: Checkstyle-driven cleanup (whitespace, javadoc, JLS)

[jhm]

Checkstyle-driven cleanup (whitespace, javadoc, JLS)

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

Branch: refs/heads/master
Commit: ef719acab90fdda24427d058d5d8aa15d13c7ced
Parents: 57ee0f2
Author: twogee 
Authored: Sat Jun 3 11:42:00 2017 +0200
Committer: twogee 
Committed: Sat Jun 3 11:47:51 2017 +0200

--
 build-release.xml   | 266 +--
 .../src/example/Hello.java  |   8 +-
 .../src/example/ConfigurationsExample.java  |   8 +-
 .../src/filter/FilterProvider.java  |   4 +-
 .../src/filter/ccimpl/CCFilter.java |   2 +-
 .../src/filter/hmimpl/HMFilter.java |   2 +-
 .../test/filter/AbstractTestFilter.java |   4 +-
 .../multi-projects/myapp/src/myapp/Main.java|   4 +-
 .../dependee/src/standalone/Main.java   |   8 +-
 .../dependence/depender/src/depending/Main.java |   6 +-
 src/example/dual/project/src/example/Hello.java |  14 +-
 src/example/hello-ivy/src/example/Hello.java|  10 +-
 .../projects/console/src/console/Main.java  |  10 +-
 .../projects/find/src/find/FindFile.java|   8 +-
 .../projects/find/src/find/Main.java|  14 +-
 .../projects/list/src/list/ListFile.java|   8 +-
 .../projects/list/src/list/Main.java|  14 +-
 .../projects/size/src/size/FileSize.java|   6 +-
 .../projects/sizewhere/src/sizewhere/Main.java  |  14 +-
 .../sizewhere/src/sizewhere/SizeWhere.java  |   4 +-
 .../projects/version/src/version/Version.java   |   6 +-
 src/java/org/apache/ivy/Main.java   |   2 +-
 src/java/org/apache/ivy/ant/AntCallTrigger.java |   6 +-
 .../org/apache/ivy/ant/AntMessageLogger.java|   4 +-
 .../apache/ivy/ant/IvyAntVariableContainer.java |   4 +-
 .../org/apache/ivy/ant/IvyCacheFileset.java |   4 +-
 src/java/org/apache/ivy/ant/IvyCheck.java   |   2 +-
 src/java/org/apache/ivy/ant/IvyCleanCache.java  |   4 +-
 src/java/org/apache/ivy/core/IvyThread.java |   2 +-
 .../apache/ivy/core/cache/ArtifactOrigin.java   |   4 +-
 .../org/apache/ivy/core/cache/CacheUtil.java|   4 +-
 .../cache/DefaultResolutionCacheManager.java|   4 +-
 .../core/cache/ModuleDescriptorMemoryCache.java |   2 +-
 .../ivy/core/cache/RepositoryCacheManager.java  |  65 +++--
 .../PublishingDependencyRevisionResolver.java   |   2 +-
 .../event/publish/EndArtifactPublishEvent.java  |   2 +-
 .../ivy/core/event/publish/PublishEvent.java|   2 +-
 .../publish/StartArtifactPublishEvent.java  |   2 +-
 .../resolve/EndResolveDependencyEvent.java  |   2 +-
 .../core/event/retrieve/EndRetrieveEvent.java   |   8 +-
 .../descriptor/AbstractIncludeExcludeRule.java  |   2 +-
 .../ivy/core/module/descriptor/Artifact.java|  18 +-
 .../core/module/descriptor/Configuration.java   |   6 +-
 .../module/descriptor/ConfigurationAware.java   |   4 +-
 .../module/descriptor/ConfigurationGroup.java   |   4 +-
 .../descriptor/ConfigurationIntersection.java   |   4 +-
 .../DefaultDependencyArtifactDescriptor.java|   2 +-
 .../descriptor/DefaultDependencyDescriptor.java |  11 +-
 .../descriptor/DefaultModuleDescriptor.java |   5 +-
 .../DependencyDescriptorMediator.java   |   2 +-
 .../ivy/core/module/descriptor/ExcludeRule.java |   6 +-
 .../ivy/core/module/descriptor/IncludeRule.java |   6 +-
 .../core/module/descriptor/InheritableItem.java |   2 +-
 .../module/descriptor/ModuleDescriptor.java |  10 +-
 .../OverrideDependencyDescriptorMediator.java   |   6 +-
 .../ivy/core/module/id/ArtifactRevisionId.java  |   2 +-
 .../org/apache/ivy/core/module/id/ModuleId.java |  22 +-
 .../ivy/core/module/id/ModuleRevisionId.java|   8 +-
 .../apache/ivy/core/module/id/ModuleRules.java  |  20 +-
 .../apache/ivy/core/publish/PublishOptions.java |   2 +-
 .../ivy/core/report/ArtifactDownloadReport.java |   4 +-
 .../report/MetadataArtifactDownloadReport.java  |   4 +-
 .../repository/RepositoryManagementEngine.java  |   8 +-
 .../apache/ivy/core/resolve/ResolveData.java|  10 +-
 .../core/resolve/ResolvedModuleRevision.java|  14 +-
 .../ivy/core/retrieve/RetrieveOptions.java  |   2 +-
 .../apache/ivy/core/settings/IvySettings.java   |   4 +
 .../ivy/core/settings/IvyVariableContainer.java |   2 +-
 .../core/settings/IvyVariableContainerImpl.java |   4 +-
 .../apache/ivy/core/settings/Validatable.java   |   2 +-
 .../org/apache/ivy/core/sort/ModuleInSort.java  |  10 +-
 .../core/sort/NonMatchingVersionReporter.java   |   2 +-
 .../org/apache/ivy/core/sort/SortEngine.java|   4 +-
 .../org/apache/ivy/osgi/core/BundleInfo.java|   4 +-
 

[11/18] ant-ivy git commit: svg: remove generator comments, format xml code

[jhm]

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/7dc1b936/doc/images/main-tasks.svg
--
diff --git a/doc/images/main-tasks.svg b/doc/images/main-tasks.svg
index 6fbcf52..6334ddd 100644
--- a/doc/images/main-tasks.svg
+++ b/doc/images/main-tasks.svg
@@ -1,5 +1,4 @@
 
-
 
-http://www.w3.org/1999/02/22-rdf-syntax-ns#; 
xmlns="http://www.w3.org/2000/svg; xml:space="preserve" viewBox="0 0 647.669 
503.39903" version="1.2" y="0px" x="0px" 
xmlns:cc="http://creativecommons.org/ns#; 
xmlns:dc="http://purl.org/dc/elements/1.1/;>
+http://www.w3.org/1999/02/22-rdf-syntax-ns#; 
xmlns="http://www.w3.org/2000/svg; xml:space="preserve" viewBox="0 0 647.669 
503.39903" version="1.2" y="0px" x="0px" 
xmlns:cc="http://creativecommons.org/ns#; 
xmlns:dc="http://purl.org/dc/elements/1.1/;>
+  
+  
+
+
+
+  
+  
+  
+  
+  
+
+
+
+  
+  
+  
+  
+  
+
+
+
+  
+  
+  
+  
+
+
+
+  
+  
+  
+  
+  
+
+
+
+  
+  
+  
+
+
+
+  
+  
+  
+
+
+
+  
+  
+  
+
+
+
+  
+  
+
+
+
+
+  
+
\ No newline at end of file

[01/18] ant-ivy git commit: first batch of SVG replacements

[jhm]

Repository: ant-ivy
Updated Branches:
  refs/heads/master 95a524ea0 -> a267723e6


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/838aa1bd/doc/images/main-tasks.svg
--
diff --git a/doc/images/main-tasks.svg b/doc/images/main-tasks.svg
new file mode 100644
index 000..6fbcf52
--- /dev/null
+++ b/doc/images/main-tasks.svg
@@ -0,0 +1,21 @@
+
+
+
+http://www.w3.org/1999/02/22-rdf-syntax-ns#; 
xmlns="http://www.w3.org/2000/svg; xml:space="preserve" viewBox="0 0 647.669 
503.39903" version="1.2" y="0px" x="0px" 
xmlns:cc="http://creativecommons.org/ns#; 
xmlns:dc="http://purl.org/dc/elements/1.1/;>

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/838aa1bd/doc/printTemplate.html
--
diff --git a/doc/printTemplate.html b/doc/printTemplate.html
index fd29b36..52a60a2 100644
--- a/doc/printTemplate.html
+++ b/doc/printTemplate.html
@@ -33,7 +33,7 @@
cellpadding="0" cellspacing="0" width="100%">

 http://ant.apache.org/;
-title="Apache Ant">
 
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/838aa1bd/doc/template.html
--
diff --git a/doc/template.html b/doc/template.html
index f7a4dd1..dbb74a3 100644
--- a/doc/template.html
+++ b/doc/template.html
@@ -37,7 +37,7 @@
cellpadding="0" cellspacing="0" width="100%">

http://ant.apache.org/;
-   title="Apache Ant">
 

[15/18] ant-ivy git commit: svg: remove generator comments, format xml code

[jhm]

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/7dc1b936/doc/images/ant-project-logo.svg
--
diff --git a/doc/images/ant-project-logo.svg b/doc/images/ant-project-logo.svg
index fb9558b..3f876c3 100644
--- a/doc/images/ant-project-logo.svg
+++ b/doc/images/ant-project-logo.svg
@@ -1,5 +1,4 @@
 
-
 
-http://www.w3.org/1999/02/22-rdf-syntax-ns#; 
xmlns="http://www.w3.org/2000/svg; enable-background="new 0 0 697.32 518.74" 
xml:space="preserve" viewBox="0 0 680.49139 191.48885" version="1.1" y="0px" 
x="0px" xmlns:cc="http://creativecommons.org/ns#; 
xmlns:dc="http://purl.org/dc/elements/1.1/;><
 path d="m133.61 67.139 0.932 0.312 1.392 0.608 1.706 0.625 1.867 0.768 2.014 
0.772 2.025 0.619 1.867 0.615 1.688 0.461 0.622-4.026 0.77-3.884 0.778-3.726 
1.078-3.56 1.086-3.409 1.397-3.259 1.388-3.109 1.714-3.111 1.703-2.789 
1.856-2.795 2.009-2.795 2.325-2.474 2.326-2.331 2.481-2.325 2.628-2.334 
2.79-2.017-3.57-3.555-3.412-2.022-3.575-0.616-3.564 0.616-3.412 1.723-3.248 
2.631-3.102 3.415-2.953 4.034-2.784 4.501-2.473 4.804-2.315 4.973-2.025 
5.118-1.534 4.965-1.234 4.656-0.785 4.192-0.459 3.718 0.003 0.011z" 
stroke-width="0.254" fill="url(#ag)"/>stroke-width="0.254" fill="url(#q)"/>gradientUnits="userSpaceOnUse" x2="-3454.9" gradientTransform="matrix(-.5318 
 >.0004 -.0004 -.5318 -1376.5 2061.7)" y1="3641.9" x1="-3354">stop-color="#512A7C" offset="0"/>offset=".0701"/>stop-color="#C21F4B" offset=".3368"/>offset=".4512"/>stop-color="#ED1B35" offset=".6158"/><
 stop stop-color="#F6EE61" 

[18/18] ant-ivy git commit: remove my test target (accidently commited)

[jhm]

remove my test target (accidently commited)


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

Branch: refs/heads/master
Commit: a267723e62261e956c49af91680338c8933790f6
Parents: 59a7dfa
Author: Jan Matèrne 
Authored: Sat Jun 3 18:15:24 2017 +0200
Committer: Jan Matèrne 
Committed: Sat Jun 3 18:15:24 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/a267723e/build.xml
--
diff --git a/build.xml b/build.xml
index b91f33d..1f14e05 100644
--- a/build.xml
+++ b/build.xml
@@ -456,16 +456,6 @@
   message="At least one test has failed. See logs (in 
${test.xml.dir}) for details (use the target test-report to run the test with a 
report)"/>
 
 
-
-
-
-
-
-
-
-
-
-
 

[03/18] ant-ivy git commit: first batch of SVG replacements

[jhm]

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/838aa1bd/doc/images/ivy-publish-fc.svg
--
diff --git a/doc/images/ivy-publish-fc.svg b/doc/images/ivy-publish-fc.svg
new file mode 100644
index 000..c98f08f
--- /dev/null
+++ b/doc/images/ivy-publish-fc.svg
@@ -0,0 +1,20 @@
+
+
+http://www.w3.org/1999/02/22-rdf-syntax-ns#; 
xmlns="http://www.w3.org/2000/svg; xml:space="preserve" viewBox="0 0 485 638" 
version="1.2" y="0px" x="0px" xmlns:cc="http://creativecommons.org/ns#; 
xmlns:dc="http://purl.org/dc/elements/1.1/;>
 http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/838aa1bd/doc/images/ivy-terminology.odg
--
diff --git a/doc/images/ivy-terminology.odg b/doc/images/ivy-terminology.odg
index 445d7e7..9e4f92d 100644
Binary files a/doc/images/ivy-terminology.odg and 
b/doc/images/ivy-terminology.odg differ

ant-ivy git commit: Fix regression in tutorials

[jhm]

Repository: ant-ivy
Updated Branches:
  refs/heads/master 990eb7500 -> 95a524ea0


Fix regression in tutorials


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

Branch: refs/heads/master
Commit: 95a524ea06e546330ec3d95b9c139b7edc599b86
Parents: 990eb75
Author: Jaikiran Pai 
Authored: Sat Jun 3 07:34:44 2017 +0530
Committer: Jaikiran Pai 
Committed: Sat Jun 3 07:34:44 2017 +0530

--
 src/example/configurations/jdbc-example/ivy.xml| 2 +-
 .../configurations/multi-projects/filter-framework/ivy.xml | 2 +-
 .../filter-framework/test/filter/AbstractTestFilter.java   | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/95a524ea/src/example/configurations/jdbc-example/ivy.xml
--
diff --git a/src/example/configurations/jdbc-example/ivy.xml 
b/src/example/configurations/jdbc-example/ivy.xml
index 41f080e..8e42350 100644
--- a/src/example/configurations/jdbc-example/ivy.xml
+++ b/src/example/configurations/jdbc-example/ivy.xml
@@ -39,6 +39,6 @@
 
  
 
- 
+ 
 
 

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/95a524ea/src/example/configurations/multi-projects/filter-framework/ivy.xml
--
diff --git a/src/example/configurations/multi-projects/filter-framework/ivy.xml 
b/src/example/configurations/multi-projects/filter-framework/ivy.xml
index 952f577..fc5e6de 100644
--- a/src/example/configurations/multi-projects/filter-framework/ivy.xml
+++ b/src/example/configurations/multi-projects/filter-framework/ivy.xml
@@ -31,6 +31,6 @@
 
 
 
-
+
 
 

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/95a524ea/src/example/configurations/multi-projects/filter-framework/test/filter/AbstractTestFilter.java
--
diff --git 
a/src/example/configurations/multi-projects/filter-framework/test/filter/AbstractTestFilter.java
 
b/src/example/configurations/multi-projects/filter-framework/test/filter/AbstractTestFilter.java
index 5d7e133..11bce97 100644
--- 
a/src/example/configurations/multi-projects/filter-framework/test/filter/AbstractTestFilter.java
+++ 
b/src/example/configurations/multi-projects/filter-framework/test/filter/AbstractTestFilter.java
@@ -29,17 +29,17 @@ public abstract class AbstractTestFilter {
  */
 public abstract IFilter getIFilter();
 
-@Test(expected = NullPointerException.class)
+@Test
 public void testFilterNull() {
 getIFilter().filter(null, null);
 }
 
-@Test(expected = NullPointerException.class)
+@Test
 public void testFilterNullValues() {
 getIFilter().filter(null, "test");
 }
 
-@Test(expected = NullPointerException.class)
+@Test
 public void testFilterNullPrefix() {
 getIFilter().filter(new String[]{"test"}, null);
 } 

[2/3] ant-ivy git commit: delete jacoco.data before run so later report generation will work

[jhm]

delete jacoco.data before run so later report generation will work


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

Branch: refs/heads/master
Commit: bf23be1285970102f0f7189004d5d10bd9b9d4df
Parents: f8962c6
Author: Jan Matèrne 
Authored: Fri Jun 2 14:26:56 2017 +0200
Committer: Jan Matèrne 
Committed: Fri Jun 2 14:26:56 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/bf23be12/build.xml
--
diff --git a/build.xml b/build.xml
index ab74a8a..b91f33d 100644
--- a/build.xml
+++ b/build.xml
@@ -415,6 +415,8 @@
 
 
 
+
+
 
 

[1/3] ant-ivy git commit: Replace emma with jacoco; upgrade checkstyle and sync its config with Apache Ant; run all documentation targets

[jhm]

Repository: ant-ivy
Updated Branches:
  refs/heads/master 1493fda3d -> 990eb7500


Replace emma with jacoco; upgrade checkstyle and sync its config with Apache 
Ant; run all documentation targets

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

Branch: refs/heads/master
Commit: f8962c6aa412c778ebd01d2a68725c36099ba1be
Parents: 1493fda
Author: twogee 
Authored: Mon May 29 21:08:43 2017 +0200
Committer: twogee 
Committed: Thu Jun 1 18:14:53 2017 +0200

--
 build-release.xml|   2 +-
 build.properties |   1 +
 build.xml| 239 +---
 src/etc/checkstyle/checkstyle-config | 305 +-
 src/etc/checkstyle/checkstyle-frames.xsl |   2 +-
 5 files changed, 265 insertions(+), 284 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/f8962c6a/build-release.xml
--
diff --git a/build-release.xml b/build-release.xml
index 752e8d2..0fa4a9c 100644
--- a/build-release.xml
+++ b/build-release.xml
@@ -510,7 +510,7 @@
 
 
 
+depends="/localivy, clean-ivy-home, clean, clean-lib, 
snapshot-version, install, clean-examples, test-report"/>
 

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/f8962c6a/build.properties
--
diff --git a/build.properties b/build.properties
index 5b28e22..673aac5 100644
--- a/build.properties
+++ b/build.properties
@@ -33,6 +33,7 @@ distrib.dir=${basedir}/build/distrib
 doc.build.dir=${basedir}/build/doc
 reports.dir=${doc.build.dir}/reports
 test.xml.dir=${build.dir}/test-report
+jacoco.log=${build.dir}/jacoco.data
 test.report.dir=${reports.dir}/test
 coverage.report.dir=${reports.dir}/coverage
 javadoc.build.dir=${reports.dir}/api

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/f8962c6a/build.xml
--
diff --git a/build.xml b/build.xml
index 54064c3..ab74a8a 100644
--- a/build.xml
+++ b/build.xml
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
 -->
-
+
 
 
 
@@ -58,7 +58,7 @@
 
 
-  
+
 
 
 
@@ -115,13 +115,13 @@
 
 
 
-
 
 
 
 
 
 
+
 
 
 
@@ -345,6 +345,22 @@
 
+
+
+
+
+
+
+
+
+
 
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-  
-
-
-
-
-
-  
-
-
-
-
-  
-  
-
-
-
-
-
-
-
-
-
-
-
-
 
 
 
@@ -441,48 +405,55 @@
 
 
 
-
+
+
+
+
+
+
 
 
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
 
-
+
 
 
 
@@ -493,41 +464,44 @@
 
 
 
-
-
-
-
 
-
+
 
 
 
 
 
 
-
-
 
-
 
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
-
-
- 
- 
+
 
 
+
+
 
+
 
 
 
@@ -578,16 +552,19 @@
 excludes="${eol.native.excludes}"/>
 
 
+
+
+
+
+
  

[3/3] ant-ivy git commit: multiple runs of 'generation-bundle' without knowing what is done is annoying ...

[jhm]

multiple runs of 'generation-bundle' without knowing what is done is annoying 
...


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

Branch: refs/heads/master
Commit: 990eb75005369505fd395d4ff4a3f2a2f55a4619
Parents: bf23be1
Author: Jan Matèrne 
Authored: Fri Jun 2 14:28:35 2017 +0200
Committer: Jan Matèrne 
Committed: Fri Jun 2 14:28:35 2017 +0200

--
 test/test-repo/build.xml | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/990eb750/test/test-repo/build.xml
--
diff --git a/test/test-repo/build.xml b/test/test-repo/build.xml
index 3d7dce2..e9a8d6f 100644
--- a/test/test-repo/build.xml
+++ b/test/test-repo/build.xml
@@ -38,6 +38,7 @@
 
 
 
+
 
 
 

ant-ivy git commit: IVY-1528 Don't ignore the "classifier" when creating pom module descriptor from ivy module descriptor, in makepom task

[jhm]

Repository: ant-ivy
Updated Branches:
  refs/heads/master 5601c44f6 -> 1f0c99d0e


IVY-1528 Don't ignore the "classifier" when creating pom module descriptor from 
ivy module descriptor, in makepom task


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

Branch: refs/heads/master
Commit: 1f0c99d0e012d84863e6a818facb143c9f03fac3
Parents: 5601c44
Author: Jaikiran Pai 
Authored: Sun May 28 09:49:27 2017 +0530
Committer: Jaikiran Pai 
Committed: Tue May 30 09:43:45 2017 +0530

--
 .../parser/m2/PomModuleDescriptorWriter.java|   3 +-
 .../core/module/descriptor/IvyMakePomTest.java  | 194 +++
 .../module/descriptor/ivy-to-pom-classifier.xml |  23 +++
 .../java/org/apache/ivy/util/TestXmlHelper.java |  74 +++
 4 files changed, 293 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/1f0c99d0/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriter.java
--
diff --git 
a/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriter.java 
b/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriter.java
index e2f72c0..3c22254 100644
--- a/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriter.java
+++ b/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriter.java
@@ -261,8 +261,9 @@ public final class PomModuleDescriptorWriter {
 } else {
 String scope = 
mapping.getScope(dds[i].getModuleConfigurations());
 boolean optional = 
mapping.isOptional(dds[i].getModuleConfigurations());
+final String classifier = 
dds[i].getExtraAttribute("classifier");
 printDependency(out, indent, mrid.getOrganisation(), 
mrid.getName(),
-mrid.getRevision(), null, null, scope, optional, 
dds[i].isTransitive(),
+mrid.getRevision(), null, classifier, scope, optional, 
dds[i].isTransitive(),
 excludes);
 }
 }

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/1f0c99d0/test/java/org/apache/ivy/core/module/descriptor/IvyMakePomTest.java
--
diff --git 
a/test/java/org/apache/ivy/core/module/descriptor/IvyMakePomTest.java 
b/test/java/org/apache/ivy/core/module/descriptor/IvyMakePomTest.java
new file mode 100644
index 000..d962e8d
--- /dev/null
+++ b/test/java/org/apache/ivy/core/module/descriptor/IvyMakePomTest.java
@@ -0,0 +1,194 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ivy.core.module.descriptor;
+
+import org.apache.ivy.TestHelper;
+import org.apache.ivy.ant.IvyMakePom;
+import org.apache.ivy.util.TestXmlHelper;
+import org.apache.tools.ant.Project;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import javax.xml.xpath.XPathConstants;
+import java.io.File;
+import java.util.HashSet;
+import java.util.Set;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Tests {@link IvyMakePom}
+ */
+public class IvyMakePomTest {
+
+private Project project;
+
+@Rule
+public TemporaryFolder workdir = new TemporaryFolder();
+
+@Before
+public void beforeTest() throws Exception {
+this.project = TestHelper.newProject();
+}
+
+/**
+ * Tests that a Ivy file containing a classifier 
extra-attribute in its dependency, when converted to a
+ * POM file through {@link IvyMakePom}, retains the 
classifier in the generated POM
+ *
+ *