You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by bo...@apache.org on 2019/01/12 16:18:42 UTC
[ant] branch master updated (25de4f2 -> a0c161a)
This is an automated email from the ASF dual-hosted git repository.
bodewig pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/ant.git.
from 25de4f2 Merge 1.9.x branch into master
add d106673 the task does not extend ExecTask (anymore?)
add 9d63d7e respect failOnError when running ls checkout - Bugzilla 63071
new a0c161a Merge branch '1.9.x'
The 1 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:
WHATSNEW | 7 +++++++
.../ant/taskdefs/optional/clearcase/CCCheckout.java | 2 +-
.../ant/taskdefs/optional/clearcase/ClearCase.java | 20 +++++++++++++++++---
3 files changed, 25 insertions(+), 4 deletions(-)
[ant] 01/01: Merge branch '1.9.x'
Posted by bo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bodewig pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ant.git
commit a0c161ad2aa9c6b9424a8f06d98c2ecbbd57e51a
Merge: 25de4f2 9d63d7e
Author: Stefan Bodewig <bo...@apache.org>
AuthorDate: Sat Jan 12 17:18:30 2019 +0100
Merge branch '1.9.x'
WHATSNEW | 7 +++++++
.../ant/taskdefs/optional/clearcase/CCCheckout.java | 2 +-
.../ant/taskdefs/optional/clearcase/ClearCase.java | 20 +++++++++++++++++---
3 files changed, 25 insertions(+), 4 deletions(-)
diff --cc WHATSNEW
index ff72cbf,cadeec0..6a6f302
--- a/WHATSNEW
+++ b/WHATSNEW
@@@ -4,17 -4,10 +4,21 @@@ Changes from Ant 1.10.5 TO Ant 1.10.
Changes that could break older environments:
-------------------------------------------
+ * image task no longer works on Java 9+ because internal classes
+ supporting Java Advanced Imaging are removed; imageio task (based on
+ ImageIO and AWT) is provided as a replacement.
+
+ * junitlauncher task has changed the class names and package names of
+ the task as well as some of the supporting classes of that task. If
+ any code depended on these class or package names, they will have to
+ be updated to reference these newly named classes. This however,
+ doesn't impact build scripts if their reference to junitlauncher task
+ was merely through the use of the <junitlauncher> element.
+
+ * ClearCase#runS has been augmented by a two arg-version and the
+ one-arg version will no longer be called. This may affect
+ subclasses that have overridden runS.
+
Fixed bugs:
-----------
@@@ -34,16 -23,9 +38,19 @@@
an incorrect compression level for a zip entry. This is now fixed.
Bugzilla Report 62686
+ * sync task, in some cases on case insensitive file systems, would consider
+ a file in a destination directory to be orphaned and would delete it.
+ This task has now been fixed to infer the case sensitivity of the filesystem
+ of the destination directory.
+ Bugzilla Report 62890
+
+ * Fixes a potential java.util.ConcurrentModificationException in
+ org.apache.tools.ant.Project#getCopyOfReferences.
+ Github Pull Request #81
+
+ * cccheckout would ignore an error of the "ls checkout" command even
+ if failOnError was set to false.
+ Bugzilla Report 63071
Other changes:
--------------
diff --cc src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckout.java
index a251094,4489b7b..6ca7c67
--- a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckout.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckout.java
@@@ -217,11 -168,12 +217,11 @@@ public class CCCheckout extends ClearCa
// viewpath
cmdl.createArgument().setValue(getViewPath());
- String result = runS(cmdl);
- result = runS(cmdl, getFailOnErr());
-
- // System.out.println( "lsCheckout: " + result );
++ String result = runS(cmdl, getFailOnErr());
- return (result != null && result.length() > 0) ? true : false;
+ return result != null && !result.isEmpty();
}
+
/**
* Check the command line options.
*/
diff --cc src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java
index 5771a0d,6eecc8a..98777bc
--- a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java
@@@ -205,8 -144,21 +205,21 @@@ public abstract class ClearCase extend
* Execute the given command, and return it's output
* @param cmdline command line to execute
* @return output of the command line
+ * @deprecated use the two arg version instead
*/
+ @Deprecated
protected String runS(Commandline cmdline) {
+ return runS(cmdline, false);
+ }
+
+ /**
+ * Execute the given command, and return it's output
+ * @param cmdline command line to execute
+ * @param failOnError whether to fail the build if the command fails
+ * @return output of the command line
- * @since Ant 1.9.14
++ * @since Ant 1.10.6
+ */
+ protected String runS(Commandline cmdline, boolean failOnError) {
String outV = "opts.cc.runS.output" + pcnt++;
ExecTask exe = new ExecTask(this);
Commandline.Argument arg = exe.createArg();