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 2017/01/11 21:20:48 UTC
[1/5] ant git commit: xzresource task - PR 60350
Repository: ant
Updated Branches:
refs/heads/master c8dde69e2 -> 14ad5c43c
xzresource task - PR 60350
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/fe327c78
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/fe327c78
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/fe327c78
Branch: refs/heads/master
Commit: fe327c78c4aa6a279bf1a04fb5890c7e2f7e6ebf
Parents: c8dde69
Author: Stefan Bodewig <bo...@apache.org>
Authored: Wed Jan 11 21:51:03 2017 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Wed Jan 11 21:51:03 2017 +0100
----------------------------------------------------------------------
build.xml | 1 +
src/etc/poms/ant-xz/pom.xml | 1 +
src/etc/poms/ant/pom.xml | 1 +
.../apache/tools/ant/types/defaults.properties | 1 +
.../tools/ant/types/optional/xz/XzResource.java | 77 ++++++++++++++++++++
.../types/optional/xz/xzresource-test.xml | 37 ++++++++++
6 files changed, 118 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/fe327c78/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index fcfe50f..61737c5 100644
--- a/build.xml
+++ b/build.xml
@@ -295,6 +295,7 @@
<selector id="needs.xz">
<or>
<filename name="${optional.package}/xz/"/>
+ <filename name="${type.package}/optional/xz/"/>
</or>
</selector>
http://git-wip-us.apache.org/repos/asf/ant/blob/fe327c78/src/etc/poms/ant-xz/pom.xml
----------------------------------------------------------------------
diff --git a/src/etc/poms/ant-xz/pom.xml b/src/etc/poms/ant-xz/pom.xml
index 4aedaa5..f7b1c2f 100644
--- a/src/etc/poms/ant-xz/pom.xml
+++ b/src/etc/poms/ant-xz/pom.xml
@@ -57,6 +57,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
<configuration>
<includes>
<include>org/apache/tools/ant/taskdefs/optional/xz/*</include>
+ <include>org/apache/tools/ant/types/optional/xz/*</include>
</includes>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/ant/blob/fe327c78/src/etc/poms/ant/pom.xml
----------------------------------------------------------------------
diff --git a/src/etc/poms/ant/pom.xml b/src/etc/poms/ant/pom.xml
index de566c4..20abc59 100644
--- a/src/etc/poms/ant/pom.xml
+++ b/src/etc/poms/ant/pom.xml
@@ -98,6 +98,7 @@
<configuration>
<excludes>
<exclude>org/apache/tools/ant/filters/util/JavaClassHelper*</exclude>
+ <exclude>org/apache/tools/ant/types/optional/xz/*</exclude>
<exclude>org/apache/tools/ant/types/resolver/**</exclude>
<exclude>org/apache/tools/ant/listener/Log4jListener*</exclude>
<exclude>org/apache/tools/ant/listener/CommonsLoggingListener*</exclude>
http://git-wip-us.apache.org/repos/asf/ant/blob/fe327c78/src/main/org/apache/tools/ant/types/defaults.properties
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/defaults.properties b/src/main/org/apache/tools/ant/types/defaults.properties
index 29771db..160c7a7 100644
--- a/src/main/org/apache/tools/ant/types/defaults.properties
+++ b/src/main/org/apache/tools/ant/types/defaults.properties
@@ -94,6 +94,7 @@ bzip2resource=org.apache.tools.ant.types.resources.BZip2Resource
javaresource=org.apache.tools.ant.types.resources.JavaResource
multirootfileset=org.apache.tools.ant.types.resources.MultiRootFileSet
javaconstant=org.apache.tools.ant.types.resources.JavaConstantResource
+xzresource=org.apache.tools.ant.types.optional.xz.XzResource
#tokenizer implementations
linetokenizer=org.apache.tools.ant.util.LineTokenizer
http://git-wip-us.apache.org/repos/asf/ant/blob/fe327c78/src/main/org/apache/tools/ant/types/optional/xz/XzResource.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/optional/xz/XzResource.java b/src/main/org/apache/tools/ant/types/optional/xz/XzResource.java
new file mode 100644
index 0000000..dfd02e7
--- /dev/null
+++ b/src/main/org/apache/tools/ant/types/optional/xz/XzResource.java
@@ -0,0 +1,77 @@
+/*
+ * 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.tools.ant.types.optional.xz;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import org.apache.tools.ant.types.resources.CompressedResource;
+import org.tukaani.xz.LZMA2Options;
+import org.tukaani.xz.XZInputStream;
+import org.tukaani.xz.XZOutputStream;
+
+/**
+ * A XZ compressed resource.
+ *
+ * <p>Wraps around another resource, delegates all queries to that
+ * other resource but uncompresses/compresses streams on the fly.</p>
+ *
+ * @since Ant 1.10.1
+ */
+public class XzResource extends CompressedResource {
+
+ /** A no-arg constructor */
+ public XzResource() {
+ }
+
+ /**
+ * Constructor with another resource to wrap.
+ * @param other the resource to wrap.
+ */
+ public XzResource(org.apache.tools.ant.types.ResourceCollection other) {
+ super(other);
+ }
+
+ /**
+ * Decompress on the fly using java.util.zip.XZInputStream.
+ * @param in the stream to wrap.
+ * @return the wrapped stream.
+ * @throws IOException if there is a problem.
+ */
+ protected InputStream wrapStream(InputStream in) throws IOException {
+ return new XZInputStream(in);
+ }
+
+ /**
+ * Compress on the fly using java.util.zip.XZOutStream.
+ * @param out the stream to wrap.
+ * @return the wrapped stream.
+ * @throws IOException if there is a problem.
+ */
+ protected OutputStream wrapStream(OutputStream out) throws IOException {
+ return new XZOutputStream(out, new LZMA2Options());
+ }
+
+ /**
+ * Get the name of the compression method.
+ * @return the string "XZ".
+ */
+ protected String getCompressionName() {
+ return "XZ";
+ }
+}
http://git-wip-us.apache.org/repos/asf/ant/blob/fe327c78/src/tests/antunit/types/optional/xz/xzresource-test.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/types/optional/xz/xzresource-test.xml b/src/tests/antunit/types/optional/xz/xzresource-test.xml
new file mode 100644
index 0000000..20855d6
--- /dev/null
+++ b/src/tests/antunit/types/optional/xz/xzresource-test.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+<project xmlns:au="antlib:org.apache.ant.antunit" default="antunit">
+
+ <import file="../../../antunit-base.xml" />
+
+ <target name="setup">
+ <mkdir dir="${output}"/>
+ <available property="xz.present" classname="org.tukaani.xz.XZOutputStream"/>
+ </target>
+
+ <target name="testDocumentationClaimsOnCopy">
+ <copy todir="${output}">
+ <xzresource>
+ <file file="../../../../../etc/testcases/taskdefs/expected/asf-logo.gif.xz"/>
+ </xzresource>
+ <mapper type="glob" from="*.xz" to="*"/>
+ </copy>
+ <au:assertFilesMatch expected="../../../../../etc/testcases/asf-logo.gif"
+ actual="${output}/asf-logo.gif"/>
+ </target>
+</project>
[2/5] ant git commit: alphasort
Posted by bo...@apache.org.
alphasort
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/d7fd0563
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/d7fd0563
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/d7fd0563
Branch: refs/heads/master
Commit: d7fd05639452f35b4adacecabcb0c9ff29ea17e8
Parents: fe327c7
Author: Stefan Bodewig <bo...@apache.org>
Authored: Wed Jan 11 21:52:14 2017 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Wed Jan 11 21:52:14 2017 +0100
----------------------------------------------------------------------
src/etc/poms/ant/pom.xml | 50 +++++++++++++++++++++----------------------
1 file changed, 25 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/d7fd0563/src/etc/poms/ant/pom.xml
----------------------------------------------------------------------
diff --git a/src/etc/poms/ant/pom.xml b/src/etc/poms/ant/pom.xml
index 20abc59..7986cff 100644
--- a/src/etc/poms/ant/pom.xml
+++ b/src/etc/poms/ant/pom.xml
@@ -98,48 +98,48 @@
<configuration>
<excludes>
<exclude>org/apache/tools/ant/filters/util/JavaClassHelper*</exclude>
- <exclude>org/apache/tools/ant/types/optional/xz/*</exclude>
- <exclude>org/apache/tools/ant/types/resolver/**</exclude>
- <exclude>org/apache/tools/ant/listener/Log4jListener*</exclude>
+ <exclude>org/apache/tools/ant/filters/util/JavaClassHelper*</exclude>
+ <exclude>org/apache/tools/ant/launch/**</exclude>
<exclude>org/apache/tools/ant/listener/CommonsLoggingListener*</exclude>
- <exclude>org/apache/tools/ant/util/regexp/JakartaRegexp*</exclude>
- <exclude>org/apache/tools/ant/util/regexp/JakartaOro*</exclude>
+ <exclude>org/apache/tools/ant/listener/Log4jListener*</exclude>
<exclude>org/apache/tools/ant/taskdefs/email/MimeMailer*</exclude>
- <exclude>org/apache/tools/ant/launch/**</exclude>
+ <exclude>org/apache/tools/ant/taskdefs/optional/NetRexxC*</exclude>
+ <exclude>org/apache/tools/ant/taskdefs/optional/Script*</exclude>
+ <exclude>org/apache/tools/ant/taskdefs/optional/Xalan2TraceSupport*</exclude>
+ <exclude>org/apache/tools/ant/taskdefs/optional/image/*</exclude>
+ <exclude>org/apache/tools/ant/taskdefs/optional/jdepend/*</exclude>
+ <exclude>org/apache/tools/ant/taskdefs/optional/junit/*</exclude>
<exclude>org/apache/tools/ant/taskdefs/optional/net/FTP*</exclude>
<exclude>org/apache/tools/ant/taskdefs/optional/net/RExec*</exclude>
<exclude>org/apache/tools/ant/taskdefs/optional/net/TelnetTask*</exclude>
- <exclude>org/apache/tools/ant/taskdefs/optional/junit/*</exclude>
- <exclude>org/apache/tools/ant/taskdefs/optional/ssh/*</exclude>
- <exclude>org/apache/tools/ant/taskdefs/optional/image/*</exclude>
- <exclude>org/apache/tools/ant/types/optional/image/*</exclude>
- <exclude>org/apache/tools/ant/taskdefs/optional/Script*</exclude>
<exclude>org/apache/tools/ant/taskdefs/optional/script/**</exclude>
+ <exclude>org/apache/tools/ant/taskdefs/optional/ssh/*</exclude>
+ <exclude>org/apache/tools/ant/taskdefs/optional/xz/*</exclude>
<exclude>org/apache/tools/ant/types/optional/*Script*</exclude>
+ <exclude>org/apache/tools/ant/types/optional/image/*</exclude>
+ <exclude>org/apache/tools/ant/types/optional/xz/*</exclude>
+ <exclude>org/apache/tools/ant/types/resolver/**</exclude>
<exclude>org/apache/tools/ant/util/ScriptRunner.java</exclude>
- <exclude>org/apache/tools/ant/util/optional/ScriptRunner.java</exclude>
- <exclude>org/apache/tools/ant/filters/util/JavaClassHelper*</exclude>
<exclude>org/apache/tools/ant/util/depend/bcel/*</exclude>
- <exclude>org/apache/tools/ant/taskdefs/optional/NetRexxC*</exclude>
- <exclude>org/apache/tools/ant/taskdefs/optional/Xalan2TraceSupport*</exclude>
- <exclude>org/apache/tools/ant/taskdefs/optional/jdepend/*</exclude>
- <exclude>org/apache/tools/ant/taskdefs/optional/xz/*</exclude>
+ <exclude>org/apache/tools/ant/util/optional/ScriptRunner.java</exclude>
+ <exclude>org/apache/tools/ant/util/regexp/JakartaOro*</exclude>
+ <exclude>org/apache/tools/ant/util/regexp/JakartaRegexp*</exclude>
</excludes>
<testExcludes>
<exclude>org/apache/tools/ant/filters/util/JavaClassHelper*</exclude>
- <exclude>org/apache/tools/ant/types/resolver/**</exclude>
- <exclude>org/apache/tools/ant/util/Script*</exclude>
- <exclude>org/apache/tools/ant/listener/Log4jListener*</exclude>
- <exclude>org/apache/tools/ant/listener/CommonsLoggingListener*</exclude>
- <exclude>org/apache/tools/ant/util/regexp/JakartaRegexp*</exclude>
- <exclude>org/apache/tools/ant/util/regexp/JakartaOro*</exclude>
- <exclude>org/apache/tools/ant/util/regexp/Jdk14Regexp*</exclude>
- <exclude>org/apache/tools/ant/taskdefs/email/MimeMailer*</exclude>
<exclude>org/apache/tools/ant/launch/**</exclude>
+ <exclude>org/apache/tools/ant/listener/CommonsLoggingListener*</exclude>
+ <exclude>org/apache/tools/ant/listener/Log4jListener*</exclude>
<exclude>org/apache/tools/ant/taskdefs/StyleTest*</exclude>
+ <exclude>org/apache/tools/ant/taskdefs/email/MimeMailer*</exclude>
<exclude>org/apache/tools/ant/taskdefs/optional/junit/</exclude>
<exclude>org/apache/tools/ant/taskdefs/optional/net/FTP*</exclude>
<exclude>org/apache/tools/ant/taskdefs/optional/ssh/*</exclude>
+ <exclude>org/apache/tools/ant/types/resolver/**</exclude>
+ <exclude>org/apache/tools/ant/util/Script*</exclude>
+ <exclude>org/apache/tools/ant/util/regexp/JakartaOro*</exclude>
+ <exclude>org/apache/tools/ant/util/regexp/JakartaRegexp*</exclude>
+ <exclude>org/apache/tools/ant/util/regexp/Jdk14Regexp*</exclude>
</testExcludes>
</configuration>
</plugin>
[5/5] ant git commit: xz support in untar - PR 60350
Posted by bo...@apache.org.
xz support in untar - PR 60350
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/14ad5c43
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/14ad5c43
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/14ad5c43
Branch: refs/heads/master
Commit: 14ad5c43cd9daa609aae8a4849362d18b8b69f0a
Parents: 0e3026c
Author: Stefan Bodewig <bo...@apache.org>
Authored: Wed Jan 11 22:20:16 2017 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Wed Jan 11 22:20:16 2017 +0100
----------------------------------------------------------------------
.../org/apache/tools/ant/taskdefs/Untar.java | 32 +++++++++-
src/tests/antunit/taskdefs/untar-test.xml | 61 ++++++++++++++++++++
2 files changed, 92 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/14ad5c43/src/main/org/apache/tools/ant/taskdefs/Untar.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Untar.java b/src/main/org/apache/tools/ant/taskdefs/Untar.java
index 8343aec..8e841c0 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Untar.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Untar.java
@@ -18,6 +18,8 @@
package org.apache.tools.ant.taskdefs;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileInputStream;
@@ -190,6 +192,11 @@ public class Untar extends Expand {
* BZIP2 compression
*/
private static final String BZIP2 = "bzip2";
+ /**
+ * XZ compression
+ * @since 1.10.1
+ */
+ private static final String XZ = "xz";
/**
@@ -206,7 +213,7 @@ public class Untar extends Expand {
* @return valid values
*/
public String[] getValues() {
- return new String[] {NONE, GZIP, BZIP2};
+ return new String[] {NONE, GZIP, BZIP2, XZ};
}
/**
@@ -226,6 +233,8 @@ public class Untar extends Expand {
final String v = getValue();
if (GZIP.equals(v)) {
return new GZIPInputStream(istream);
+ } else if (XZ.equals(v)) {
+ return newXZInputStream(istream);
} else {
if (BZIP2.equals(v)) {
final char[] magic = new char[] {'B', 'Z'};
@@ -240,5 +249,26 @@ public class Untar extends Expand {
}
return istream;
}
+
+ private static InputStream newXZInputStream(InputStream istream)
+ throws BuildException {
+ try {
+ Class<? extends InputStream> clazz =
+ Class.forName("org.tukaani.xz.XZInputStream")
+ .asSubclass(InputStream.class);
+ Constructor<? extends InputStream> c =
+ clazz.getConstructor(InputStream.class);
+ return c.newInstance(istream);
+ } catch (ClassNotFoundException ex) {
+ throw new BuildException("xz uncompression requires the XZ for Java library",
+ ex);
+ } catch (NoSuchMethodException
+ | InstantiationException
+ | IllegalAccessException
+ | InvocationTargetException
+ ex) {
+ throw new BuildException("failed to create XZInputStream", ex);
+ }
+ }
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/14ad5c43/src/tests/antunit/taskdefs/untar-test.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/taskdefs/untar-test.xml b/src/tests/antunit/taskdefs/untar-test.xml
new file mode 100644
index 0000000..4c04bfe
--- /dev/null
+++ b/src/tests/antunit/taskdefs/untar-test.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+
+<project name="untar-test" default="antunit"
+ xmlns:au="antlib:org.apache.ant.antunit">
+ <import file="../antunit-base.xml" />
+
+ <target name="setUp">
+ <mkdir dir="${input}"/>
+ <mkdir dir="${output}/expected" />
+ <mkdir dir="${output}/actual" />
+ <available property="xz.present" classname="org.tukaani.xz.XZOutputStream"/>
+ </target>
+
+ <target name="testGzipCompression" depends="setUp">
+ <untar src="../../../etc/testcases/taskdefs/expected/asf-logo.gif.tar"
+ dest="${output}/expected"/>
+ <untar src="../../../etc/testcases/taskdefs/expected/asf-logo.gif.tar.gz"
+ compression="gzip"
+ dest="${output}/actual"/>
+ <au:assertFilesMatch expected="${output}/expected/asf-logo.gif"
+ actual="${output}/actual/asf-logo.gif"/>
+ </target>
+
+ <target name="testBzip2Compression" depends="setUp">
+ <untar src="../../../etc/testcases/taskdefs/expected/asf-logo.gif.tar"
+ dest="${output}/expected"/>
+ <untar src="../../../etc/testcases/taskdefs/expected/asf-logo.gif.tar.bz2"
+ compression="bzip2"
+ dest="${output}/actual"/>
+ <au:assertFilesMatch expected="${output}/expected/asf-logo.gif"
+ actual="${output}/actual/asf-logo.gif"/>
+ </target>
+
+ <target name="testXZCompression" depends="setUp" if="xz.present">
+ <untar src="../../../etc/testcases/taskdefs/expected/asf-logo.gif.tar"
+ dest="${output}/expected"/>
+ <xz destfile="${input}/asf-logo.gif.tar.xz"
+ src="../../../etc/testcases/taskdefs/expected/asf-logo.gif.tar"/>
+ <untar src="${input}/asf-logo.gif.tar.xz"
+ compression="xz"
+ dest="${output}/actual"/>
+ <au:assertFilesMatch expected="${output}/expected/asf-logo.gif"
+ actual="${output}/actual/asf-logo.gif"/>
+ </target>
+</project>
[4/5] ant git commit: typo
Posted by bo...@apache.org.
typo
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/0e3026cf
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/0e3026cf
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/0e3026cf
Branch: refs/heads/master
Commit: 0e3026cfc5c3b6f5c1e2648f44842705957f493c
Parents: be4c1c5
Author: Stefan Bodewig <bo...@apache.org>
Authored: Wed Jan 11 22:19:59 2017 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Wed Jan 11 22:19:59 2017 +0100
----------------------------------------------------------------------
src/tests/antunit/taskdefs/optional/xz/xz-test.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/0e3026cf/src/tests/antunit/taskdefs/optional/xz/xz-test.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/taskdefs/optional/xz/xz-test.xml b/src/tests/antunit/taskdefs/optional/xz/xz-test.xml
index 5854123..3e4b6a8 100644
--- a/src/tests/antunit/taskdefs/optional/xz/xz-test.xml
+++ b/src/tests/antunit/taskdefs/optional/xz/xz-test.xml
@@ -38,7 +38,7 @@
<target name="testFailTwo" if="xz.present">
<au:expectfailure expectedmessage="xz cannot handle multiple resources at once. (2 resources were selected.)" message="Should have thrown an exception">
- <xz destfile="${output}/file.gz">
+ <xz destfile="${output}/file.xz">
<fileset dir="${output}" />
</xz>
</au:expectfailure>
[3/5] ant git commit: only execute test if XZ for Java is present
Posted by bo...@apache.org.
only execute test if XZ for Java is present
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/be4c1c5a
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/be4c1c5a
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/be4c1c5a
Branch: refs/heads/master
Commit: be4c1c5ad04c8d35d2a04bbd82b78c84495a04d5
Parents: d7fd056
Author: Stefan Bodewig <bo...@apache.org>
Authored: Wed Jan 11 22:08:54 2017 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Wed Jan 11 22:08:54 2017 +0100
----------------------------------------------------------------------
src/tests/antunit/types/optional/xz/xzresource-test.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/be4c1c5a/src/tests/antunit/types/optional/xz/xzresource-test.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/types/optional/xz/xzresource-test.xml b/src/tests/antunit/types/optional/xz/xzresource-test.xml
index 20855d6..56fe66d 100644
--- a/src/tests/antunit/types/optional/xz/xzresource-test.xml
+++ b/src/tests/antunit/types/optional/xz/xzresource-test.xml
@@ -24,7 +24,7 @@
<available property="xz.present" classname="org.tukaani.xz.XZOutputStream"/>
</target>
- <target name="testDocumentationClaimsOnCopy">
+ <target name="testDocumentationClaimsOnCopy" if="xz.present">
<copy todir="${output}">
<xzresource>
<file file="../../../../../etc/testcases/taskdefs/expected/asf-logo.gif.xz"/>