subject:"\[4\/4\] ant git commit\: Merge branch '1.9.x'"

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

2018-09-28 Thread bodewig

Merge branch '1.9.x'


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

Branch: refs/heads/master
Commit: b99b6fa538e857f7f064b943729babe25e2a60f0
Parents: ec5b55d d100b90
Author: Stefan Bodewig 
Authored: Fri Sep 28 18:30:04 2018 +0200
Committer: Stefan Bodewig 
Committed: Fri Sep 28 18:30:04 2018 +0200

--
 WHATSNEW|  8 ++
 manual/Tasks/signjar.html   | 33 +++-
 manual/Tasks/verifyjar.html | 31 
 .../ant/taskdefs/AbstractJarSignerTask.java | 84 +++-
 .../org/apache/tools/ant/types/Commandline.java | 11 +++
 5 files changed, 165 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/b99b6fa5/WHATSNEW
--
diff --cc WHATSNEW
index ff59e63,6cd11da..19b2c0f
--- a/WHATSNEW
+++ b/WHATSNEW
@@@ -35,10 -24,15 +35,18 @@@ Other changes
   * the  selector has a new built-in algorithm 'lastmodified'
 which computes a value based upon the lastmodified time of the file.
  
 + * junitlauncher task now supports forking and can be used with JaCoCo
 +   (see https://github.com/jacoco/jacoco/issues/673).
 +
+  * signjar and verifyjar now support the -providerName, -providerClass
+and -providerArg command line options of keytool via new attributes.
+Bugzilla Report 65234
+ 
+  * signjar and verifyjar now supported nested  elements for
+command line arguments that are not supported explicitly by the
+tasks via attributes.
+ 
 -Changes from Ant 1.9.12 TO Ant 1.9.13
 +Changes from Ant 1.10.4 TO Ant 1.10.5
  =
  
  Fixed bugs:

http://git-wip-us.apache.org/repos/asf/ant/blob/b99b6fa5/manual/Tasks/signjar.html
--
diff --cc manual/Tasks/signjar.html
index 03f9156,88bdb43..bc098e7
--- a/manual/Tasks/signjar.html
+++ b/manual/Tasks/signjar.html
@@@ -45,237 -47,285 +45,268 @@@ place.
  
  Parameters
 -
 +

 -Attribute
 -Description
 -Required
 +Attribute
 +Description
 +Required


 -jar
 -the jar file to sign
 -Yes, unless nested paths have
 -  been used.
 +jar
 +the jar file to sign
 +Yes, unless nested paths have been used


 -alias
 -the alias to sign under
 -Yes.
 +alias
 +the alias to sign under
 +Yes


 -storepass
 -password for keystore integrity. Ant will not use
 +storepass
 +password for keystore integrity. Ant will not use
  the -storepass command line argument but send the
  password to jarsigner when it prompts for it.
 -Yes.
 +Yes


 -keystore
 -keystore location
 -No
 +keystore
 +keystore location
 +No


 -storetype
 -keystore type
 -No
 +storetype
 +keystore type
 +No


 -keypass
 -password for private key (if different)
 -No
 +keypass
 +password for private key (if different)
 +No


 -sigfile
 -name of .SF/.DSA file
 -No
 +sigfile
 +name of .SF/.DSA file
 +No


 -signedjar
 -name of signed JAR file. This can only be set when
 -the jar attribute is set.
 -No.
 +signedjar
 +name of signed JAR file. This can only be set when the jar 
attribute is set.
 +No


 -verbose
 -(true | false) verbose output when signing
 -No; default false
 +verbose
 +(true|false) verbose output when signing
 +No; default false


 -strict
 -(true | false) strict checking when 
signing.since Ant 1.9.1.
 -No; default false
 +strict
 +(true|false) strict checking when signing.since Ant 
1.9.1.
 +No; default false


 -internalsf
 -(true | false) include the .SF file inside the signature
 -block
 -No; default false
 +internalsf
 +(true|false) include the .SF file inside the 
signature block
 +No; default false


 -sectionsonly
 -(true | false) don't compute hash of entire manifest
 -No; default false
 +sectionsonly
 +(true|false) don't compute hash of entire manifest
 +No; default false


 -lazy
 -flag to control whether the presence of a signature
 -  file means a JAR is signed. This is only used when the target JAR matches
 -  the source JAR
 -No; default false
 +lazy
 +flag to control whether the presence of a signature file means a JAR 
is signed. This is only
 +  used when the target JAR matches the source JAR
 +No; default false

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

2018-08-12 Thread bodewig

Merge branch '1.9.x'


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

Branch: refs/heads/master
Commit: b9c135d0eae937cecb58c68f84726e65c202df67
Parents: 18eb262 0949736
Author: Stefan Bodewig 
Authored: Sun Aug 12 17:19:03 2018 +0200
Committer: Stefan Bodewig 
Committed: Sun Aug 12 17:19:03 2018 +0200

--
 CONTRIBUTORS | 1 +
 1 file changed, 1 insertion(+)
--


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

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

2018-06-16 Thread bodewig

Merge branch '1.9.x'


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

Branch: refs/heads/master
Commit: 1ab929e749f18e52fec5715b889a2423893b0bc9
Parents: 6c9e932 9a9647c
Author: Stefan Bodewig 
Authored: Sat Jun 16 20:20:31 2018 +0200
Committer: Stefan Bodewig 
Committed: Sat Jun 16 20:20:31 2018 +0200

--
 WHATSNEW   |  4 
 src/etc/junit-frames-saxon.xsl | 16 
 src/etc/junit-frames.xsl   | 16 
 3 files changed, 36 insertions(+)
--


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

http://git-wip-us.apache.org/repos/asf/ant/blob/1ab929e7/src/etc/junit-frames-saxon.xsl
--
diff --cc src/etc/junit-frames-saxon.xsl
index f8de992,000..233352f
mode 100644,00..100644
--- a/src/etc/junit-frames-saxon.xsl
+++ b/src/etc/junit-frames-saxon.xsl
@@@ -1,971 -1,0 +1,987 @@@
 +
 +http://www.w3.org/1999/XSL/Transform;
 +xmlns:xs="http://www.w3.org/2001/XMLSchema;
 +exclude-result-prefixes="xs"
 +version="2.0">
 +
 +
 +
 +
 +
 +
 +Unit Test Results.
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +.
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +Standard Output from 
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +Standard Error from 
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +Frame Alert
 +
 +This document is designed to be viewed using the 
frames feature. If you see this message, you are using a non-frame-capable web 
client.
 +
 +
 +
 +
 +
 +
 +
 +
 +body {
 +font:normal 68% verdana,arial,helvetica;
 +color:#00;
 +}
 +table tr td, table tr th {
 +font-size: 68%;
 +}
 +table.details tr th{
 +font-weight: bold;
 +text-align:left;
 +background:#a6caf0;
 +}
 +table.details tr td{
 +background:#e0;
 +}
 +
 +p {
 +line-height:1.5em;
 +margin-top:0.5em; margin-bottom:1.0em;
 +}
 +h1 {
 +margin: 0px 0px 5px; font: 165% verdana,arial,helvetica
 +}
 +h2 {
 +margin-top: 1em; margin-bottom: 0.5em; font: bold 125% 
verdana,arial,helvetica
 +}
 +h3 {
 +margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica
 +}
 +h4 {
 +margin-bottom: 0.5em; font: bold 100%

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

2018-05-03 Thread bodewig

Merge branch '1.9.x'


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

Branch: refs/heads/master
Commit: 0b3e006f27c279620fbbd80815f5ec08f1c45a24
Parents: af7f5bb ab2a509
Author: Stefan Bodewig 
Authored: Thu May 3 09:07:43 2018 +0200
Committer: Stefan Bodewig 
Committed: Thu May 3 09:07:43 2018 +0200

--

--

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

2018-04-06 Thread bodewig

Merge branch '1.9.x'


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

Branch: refs/heads/master
Commit: 3742401874db8083c8b6dd04699e89e78ab576ea
Parents: 4b14d85 50a1d4a
Author: Stefan Bodewig 
Authored: Fri Apr 6 10:13:41 2018 +0200
Committer: Stefan Bodewig 
Committed: Fri Apr 6 10:13:41 2018 +0200

--

--

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

2018-03-24 Thread bodewig

Merge branch '1.9.x'


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

Branch: refs/heads/master
Commit: 813da2ad3e50beafd0defebe24cf0b9b1f3c4d0d
Parents: e0ab351 3f1cec6
Author: Stefan Bodewig 
Authored: Sat Mar 24 13:54:46 2018 +0100
Committer: Stefan Bodewig 
Committed: Sat Mar 24 13:54:46 2018 +0100

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


http://git-wip-us.apache.org/repos/asf/ant/blob/813da2ad/ReleaseInstructions
--
diff --cc ReleaseInstructions
index 615640f,762450f..f9f1c19
--- a/ReleaseInstructions
+++ b/ReleaseInstructions
@@@ -38,12 -37,12 +38,12 @@@ Note: This document was adapted from th
  the build with -verbose option and scan for lines beginning with
  "Unable to load...". 
  
- 3.  We don't want tags for failed votes to end up on out branches so
+ 3.  We don't want tags for failed votes to end up on our branches so
  the release is first created from a detached head.
  
 -Checkout the HEAD of the 1.9.x branch as a detached head:
 +Checkout the HEAD of the master branch as a detached head:
  
 -$ git checkout 1.9.x^0
 +$ git checkout master^0
  
  4.  Make sure that your directory tree is clean by running git status.
  Some tests leave behind leftovers which end up in the source

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

2018-03-20 Thread bodewig

Merge branch '1.9.x'


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

Branch: refs/heads/master
Commit: f59ad6edc9dbfd40573fb125571826595acfc461
Parents: 9b9ae5f 360acf5
Author: Stefan Bodewig 
Authored: Tue Mar 20 17:32:13 2018 +0100
Committer: Stefan Bodewig 
Committed: Tue Mar 20 17:32:13 2018 +0100

--
 src/main/org/apache/tools/ant/taskdefs/VerifyJar.java | 6 +-
 src/tests/antunit/taskdefs/signjar-test.xml   | 5 +++--
 2 files changed, 4 insertions(+), 7 deletions(-)
--


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

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

2018-02-09 Thread bodewig

Merge branch '1.9.x'


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

Branch: refs/heads/master
Commit: e90f71193adc819ee27d2067cbd662ce7efacaf4
Parents: 3bb66d9 21b8700
Author: Stefan Bodewig 
Authored: Fri Feb 9 18:49:52 2018 +0100
Committer: Stefan Bodewig 
Committed: Fri Feb 9 18:49:52 2018 +0100

--
 src/main/org/apache/tools/ant/taskdefs/Copy.java| 5 -
 src/main/org/apache/tools/ant/taskdefs/CopyPath.java| 3 +++
 src/main/org/apache/tools/ant/taskdefs/Rmic.java| 3 +++
 .../org/apache/tools/ant/taskdefs/optional/Native2Ascii.java| 5 -
 src/main/org/apache/tools/ant/types/mappers/CutDirsMapper.java  | 3 +++
 src/main/org/apache/tools/ant/types/mappers/FilterMapper.java   | 3 +++
 src/main/org/apache/tools/ant/util/ChainedMapper.java   | 3 +++
 src/main/org/apache/tools/ant/util/FileNameMapper.java  | 4 +++-
 src/main/org/apache/tools/ant/util/FlatFileNameMapper.java  | 2 ++
 src/main/org/apache/tools/ant/util/GlobPatternMapper.java   | 3 +++
 src/main/org/apache/tools/ant/util/RegexpPatternMapper.java | 3 +++
 11 files changed, 34 insertions(+), 3 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/ant/blob/e90f7119/src/main/org/apache/tools/ant/taskdefs/Rmic.java
--
diff --cc src/main/org/apache/tools/ant/taskdefs/Rmic.java
index c42ad41,0a54b3e..aa762b1
--- a/src/main/org/apache/tools/ant/taskdefs/Rmic.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Rmic.java
@@@ -705,8 -709,12 +705,11 @@@ public class Rmic extends MatchingTask 
  String classFileName = classname.replace('.', File.separatorChar)
  + ".class";
  String[] generatedFiles = 
adapter.getMapper().mapFileName(classFileName);
+ if (generatedFiles == null) {
+ return;
+ }
  
 -for (int i = 0; i < generatedFiles.length; i++) {
 -final String generatedFile = generatedFiles[i];
 +for (String generatedFile : generatedFiles) {
  if (!generatedFile.endsWith(".class")) {
  // don't know how to handle that - a IDL file doesn't
  // have a corresponding Java source for example.

http://git-wip-us.apache.org/repos/asf/ant/blob/e90f7119/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java
--

http://git-wip-us.apache.org/repos/asf/ant/blob/e90f7119/src/main/org/apache/tools/ant/types/mappers/CutDirsMapper.java
--

http://git-wip-us.apache.org/repos/asf/ant/blob/e90f7119/src/main/org/apache/tools/ant/types/mappers/FilterMapper.java
--
diff --cc src/main/org/apache/tools/ant/types/mappers/FilterMapper.java
index b4c07e9,9ef922e..3a0109b
--- a/src/main/org/apache/tools/ant/types/mappers/FilterMapper.java
+++ b/src/main/org/apache/tools/ant/types/mappers/FilterMapper.java
@@@ -64,8 -62,10 +64,11 @@@ public class FilterMapper extends Filte
   * @return  a one-element array of converted filenames, or null if
   *  the filterchain returns an empty string.
   */
 +@Override
  public String[] mapFileName(String sourceFileName) {
+ if (sourceFileName == null) {
+ return null;
+ }
  try {
  Reader stringReader = new StringReader(sourceFileName);
  ChainReaderHelper helper = new ChainReaderHelper();

http://git-wip-us.apache.org/repos/asf/ant/blob/e90f7119/src/main/org/apache/tools/ant/util/ChainedMapper.java
--
diff --cc src/main/org/apache/tools/ant/util/ChainedMapper.java
index 8b3e32f,6e07aa6..cec4f2e
--- a/src/main/org/apache/tools/ant/util/ChainedMapper.java
+++ b/src/main/org/apache/tools/ant/util/ChainedMapper.java
@@@ -30,13 -32,32 +30,16 @@@ import java.util.stream.Stream
  public class ChainedMapper extends ContainerMapper {
  
  /** {@inheritDoc}. */
 +@Override
  public String[] mapFileName(String sourceFileName) {
 -List inputs = new ArrayList();
 -List results = new ArrayList();
 -// we do this even if the sourceFileName is null. Some
++// we invoke the chain even if the sourceFileName is null. Some
+ //

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

2018-01-26 Thread bodewig

Merge branch '1.9.x'


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

Branch: refs/heads/master
Commit: 02e72b8ca9749f46375a4c2cd79a55437b11facc
Parents: 21b231f 6fe6914
Author: Stefan Bodewig 
Authored: Fri Jan 26 20:05:06 2018 +0100
Committer: Stefan Bodewig 
Committed: Fri Jan 26 20:05:06 2018 +0100

--
 build.xml   | 1 +
 launch-build.xml| 6 +-
 src/tests/antunit/taskdefs/get-test.xml | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/02e72b8c/build.xml
--

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

2018-01-20 Thread bodewig

Merge branch '1.9.x'


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

Branch: refs/heads/master
Commit: df121b0ec72280e4ca57813235aa42d4b115d719
Parents: 8f0dc57 b9c8198
Author: Stefan Bodewig 
Authored: Sat Jan 20 18:06:48 2018 +0100
Committer: Stefan Bodewig 
Committed: Sat Jan 20 18:06:48 2018 +0100

--

--

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

2017-02-16 Thread bodewig

Merge branch '1.9.x'


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

Branch: refs/heads/master
Commit: 5c9767039b88ea36077fc14a041ad5241a60bd67
Parents: 1ccf198 54f5c5f
Author: Stefan Bodewig 
Authored: Fri Feb 17 06:54:28 2017 +0100
Committer: Stefan Bodewig 
Committed: Fri Feb 17 06:54:28 2017 +0100

--
 CONTRIBUTORS  |  1 +
 WHATSNEW  |  7 +++
 contributors.xml  |  4 
 manual/Tasks/sql.html |  7 +++
 .../org/apache/tools/ant/taskdefs/SQLExec.java| 18 ++
 5 files changed, 33 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/5c976703/WHATSNEW
--
diff --cc WHATSNEW
index 1ce7173,2c10b1e..866080c
--- a/WHATSNEW
+++ b/WHATSNEW
@@@ -1,8 -1,15 +1,15 @@@
 -Changes from Ant 1.9.9 TO Ant 1.9.10
 -
 +Changes from Ant 1.10.1 TO Ant 1.10.2
 +=
  
+ Other changes:
+ --
+ 
+  * Added forceCsvQuoteChar option to  task. When enabled the
+values always get quoted.
+Github Pull Request #32
+ 
 -Changes from Ant 1.9.8 TO Ant 1.9.9
 -===
 +Changes from Ant 1.10.0 TO Ant 1.10.1
 +=
  
  Fixed bugs:
  ---

http://git-wip-us.apache.org/repos/asf/ant/blob/5c976703/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
--

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

2016-12-21 Thread bodewig

Merge branch '1.9.x'


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

Branch: refs/heads/master
Commit: 5db9f3401ef6794c14b86fc548803da21ef2be73
Parents: 451c424 85ff7bf
Author: Stefan Bodewig 
Authored: Wed Dec 21 10:32:36 2016 +0100
Committer: Stefan Bodewig 
Committed: Wed Dec 21 10:32:36 2016 +0100

--
 .../org/apache/tools/ant/IntrospectionHelper.java   | 16 +---
 src/main/org/apache/tools/ant/UnknownElement.java   |  3 ++-
 src/main/org/apache/tools/ant/taskdefs/Javadoc.java |  6 --
 .../apache/tools/ant/taskdefs/MacroInstance.java| 12 +---
 .../org/apache/tools/ant/taskdefs/XmlProperty.java  |  6 --
 .../tools/ant/taskdefs/optional/depend/Depend.java  |  2 +-
 .../ant/taskdefs/optional/jdepend/JDependTask.java  |  2 +-
 .../ant/taskdefs/optional/sound/AntSoundPlayer.java |  4 +++-
 src/main/org/apache/tools/tar/TarEntry.java |  2 +-
 src/main/org/apache/tools/zip/ZipFile.java  |  6 +++---
 10 files changed, 37 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/5db9f340/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java
--

http://git-wip-us.apache.org/repos/asf/ant/blob/5db9f340/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java
--
diff --cc 
src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java
index 47e2014,aef214f..8ca6b9c
--- a/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java
@@@ -133,9 -133,13 +133,11 @@@ public class AntSoundPlayer implements 
  } else {
  playClip(audioClip, loops);
  }
- audioClip.drain();
+ if (audioClip != null) {
+ audioClip.drain();
+ }
  } finally {
 -if (audioClip != null) {
 -audioClip.close();
 -}
 +FileUtils.close(audioClip);
  }
  } else {
  project.log("Can't get data from file " + file.getName());

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

2016-12-06 Thread bodewig

Merge branch '1.9.x'


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

Branch: refs/heads/master
Commit: aa57218c645ffcd10465c719f5669c50020a5b10
Parents: ceb5315 8925f08
Author: Stefan Bodewig 
Authored: Tue Dec 6 17:05:47 2016 +0100
Committer: Stefan Bodewig 
Committed: Tue Dec 6 17:05:47 2016 +0100

--
 WHATSNEW   | 4 
 src/etc/junit-frames.xsl   | 6 +++---
 src/etc/junit-noframes.xsl | 6 +++---
 3 files changed, 10 insertions(+), 6 deletions(-)
--


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

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

2016-07-31 Thread bodewig

Merge branch '1.9.x'


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

Branch: refs/heads/master
Commit: c50b683cfb9c2ae3a1929c38648ec2e492718f34
Parents: 047844b a62d5f9
Author: Stefan Bodewig 
Authored: Sun Jul 31 10:16:52 2016 +0200
Committer: Stefan Bodewig 
Committed: Sun Jul 31 10:16:52 2016 +0200

--
 WHATSNEW|   9 +
 manual/Tasks/touch.html |   6 +-
 manual/Types/resources.html |   5 +-
 manual/Types/selectors.html |   9 +-
 .../org/apache/tools/ant/taskdefs/Touch.java|  34 +-
 .../ant/types/resources/selectors/Date.java |  13 +-
 .../tools/ant/types/selectors/BaseSelector.java |  17 +-
 .../tools/ant/types/selectors/DateSelector.java |  14 +-
 .../ant/taskdefs/optional/TraXLiaisonTest.java  | 258 +--
 .../ant/types/selectors/DateSelectorTest.java   | 458 +--
 10 files changed, 426 insertions(+), 397 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/ant/blob/c50b683c/manual/Types/selectors.html
--

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

2016-07-25 Thread bodewig

Merge branch '1.9.x'


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

Branch: refs/heads/master
Commit: a6d07c6247660f4eedab3c5952dc633c7b42be43
Parents: a10f57e 625d3d3
Author: Stefan Bodewig 
Authored: Mon Jul 25 12:26:27 2016 +0200
Committer: Stefan Bodewig 
Committed: Mon Jul 25 12:26:27 2016 +0200

--
 WHATSNEW|  3 +
 build.xml   |  4 +-
 manual/Tasks/javac.html |  3 +-
 manual/properties.html  |  6 +-
 .../org/apache/tools/ant/taskdefs/Javac.java| 14 ++--
 .../compilers/CompilerAdapterFactory.java   |  3 +-
 .../compilers/DefaultCompilerAdapter.java   | 33 +---
 .../org/apache/tools/ant/util/JavaEnvUtils.java | 83 +---
 src/tests/antunit/antunit-base.xml  |  4 +-
 src/tests/antunit/taskdefs/javac-test.xml   | 20 ++---
 .../taskdefs/optional/native2ascii-test.xml |  4 +-
 .../compilers/DefaultCompilerAdapterTest.java   | 31 
 .../apache/tools/ant/util/JavaEnvUtilsTest.java |  5 +-
 13 files changed, 138 insertions(+), 75 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/a6d07c62/WHATSNEW
--
diff --cc WHATSNEW
index 0974de2,3e4e90b..d37e547
--- a/WHATSNEW
+++ b/WHATSNEW
@@@ -15,9 -9,9 +15,12 @@@ Changes that could break older environm
 same instance. This will now cause the build to fail.
 Bugzilla Report 59402
  
 + *  will default to the buitin implementation on Java8
 +   as well (sun isn't available for Java9+ anyway).
 +
+  * The ant.java.version property will now hold the value "9" rather
+than "1.9" if running on Java 9.
+ 
  Fixed bugs:
  ---
  

http://git-wip-us.apache.org/repos/asf/ant/blob/a6d07c62/build.xml
--
diff --cc build.xml
index 02f6c9a,eba9fc8..9e8cc1f
--- a/build.xml
+++ b/build.xml
@@@ -373,9 -375,10 +373,7 @@@

  
  
- 
-   
- 
 -
 -
 -
+ 
  
  

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

http://git-wip-us.apache.org/repos/asf/ant/blob/a6d07c62/src/tests/antunit/antunit-base.xml
--
diff --cc src/tests/antunit/antunit-base.xml
index da39305,9863f3f..e8b3529
--- a/src/tests/antunit/antunit-base.xml
+++ b/src/tests/antunit/antunit-base.xml
@@@ -27,9 -27,11 +27,7 @@@



-   
- 
-   
+   
 -  
 -  
 -  
 -  

  


http://git-wip-us.apache.org/repos/asf/ant/blob/a6d07c62/src/tests/antunit/taskdefs/javac-test.xml
--
diff --cc src/tests/antunit/taskdefs/javac-test.xml
index 566c417,de193ea..a3ffc82
--- a/src/tests/antunit/taskdefs/javac-test.xml
+++ b/src/tests/antunit/taskdefs/javac-test.xml
@@@ -250,7 -271,35 +250,7 @@@ public class Adapter implements Compile

  
  
- 
+ 
 -  JDK 1.4+
 -  
 -  
 -  
 -
 -
 -
 -  JDK 1.5+
 -  
 -  
 -  
 -
 -
 -
 -  JDK 1.6+
 -  
 -  
 -  
 -
 -
 -
 -  JDK 1.7+
 -  
 -  
 -  
 -
 -
 -
JDK 1.8+



http://git-wip-us.apache.org/repos/asf/ant/blob/a6d07c62/src/tests/junit/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapterTest.java
--

http://git-wip-us.apache.org/repos/asf/ant/blob/a6d07c62/src/tests/junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java
--
diff --cc src/tests/junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java
index d153d63,aef4f1b..8bd229f
--- a/src/tests/junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java
+++ b/src/tests/junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java
@@@ -115,11 -115,12 +115,11 @@@ public class JavaEnvUtilsTest 
  assertTrue(j+" is normalized and in the JDK dir",
 j.startsWith(javaHomeParent));
  
- if (JavaEnvUtils.isAtLeastJavaVersion(JavaEnvUtils.JAVA_1_9)) {
 -if ((Os.isFamily("mac") && JavaEnvUtils.getJavaVersionNumber() <= 
JavaEnvUtils.VERSION_1_6)
 -|| JavaEnvUtils.isAtLeastJavaVersion(JavaEnvUtils.JAVA_9)) {
 -assertTrue(j+" is normalized and in the JRE dir",
++

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

2016-05-22 Thread bodewig

Merge branch '1.9.x'


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

Branch: refs/heads/master
Commit: d5f2b0c0b9ac2d1ec1f6475ed4c59562d6c09175
Parents: 440021d e982f01
Author: Stefan Bodewig 
Authored: Sun May 22 18:39:40 2016 +0200
Committer: Stefan Bodewig 
Committed: Sun May 22 18:39:40 2016 +0200

--
 CONTRIBUTORS|   1 +
 WHATSNEW|   4 +
 contributors.xml|   4 +
 .../optional/junit/JUnitTestRunner.java |   1 +
 .../optional/junit/JUnitTestRunnerTest.java | 462 ++-
 5 files changed, 255 insertions(+), 217 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/d5f2b0c0/WHATSNEW
--
diff --cc WHATSNEW
index d91c476,cddd662..729644e
--- a/WHATSNEW
+++ b/WHATSNEW
@@@ -33,11 -27,10 +33,15 @@@ Fixed bugs
  Other changes:
  --
  
 + * New file selectors ,  and .
 +
 + * New task  that provides the ability to set POSIX
 +   compatible permssions via NIO's PosixFilePermission
 +
+  *  now initializes the cause of the AssertionFailedError when
+converting from AssertionError.
+Bugzilla Report 58982
+ 
  Changes from Ant 1.9.6 TO Ant 1.9.7
  ===

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

2016-03-29 Thread bodewig

Merge branch '1.9.x'


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

Branch: refs/heads/master
Commit: 5024dcf97bdad134de3eba5f8134f7223082ba5e
Parents: d1736c7 356972a
Author: Stefan Bodewig 
Authored: Tue Mar 29 14:51:27 2016 +0200
Committer: Stefan Bodewig 
Committed: Tue Mar 29 14:51:27 2016 +0200

--
 CONTRIBUTORS|  1 +
 WHATSNEW|  5 ++
 contributors.xml|  4 ++
 manual/Tasks/scp.html   | 17 +++
 manual/Tasks/sshexec.html   | 17 +++
 .../ant/taskdefs/optional/ssh/SSHBase.java  | 48 
 6 files changed, 92 insertions(+)
--


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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

17 matches

Site Navigation

Mail list logo

Footer information