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 2021/09/25 11:18:07 UTC
[ant] branch master updated (0a20cdc -> 9379bf4)
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 0a20cdc "default" is no longer a valid alias for charset starting JDK 18+ which implemented JEP400 (https://openjdk.java.net/jeps/400)
add c38fbc1 TarEntry: make linkFlag accessible
add 304b3d7 TarResource: make linkName and linkFlag accessible
add 5034c2c Refactoring Tar: extract getCanonicalPrefix()
add 2e2ed8a Tar: preserve symlinks from <tarfileset> sources
new 2d0b468 Merge branch 'feature/tarfileset-preserve-symlinks' of https://github.com/mstrap/ant into mstrap-feature/tarfileset-preserve-symlinks
new 16be5c0 record tar symlink change of #142
add 0f110ea Merge branch 'feature/tarfileset-preserve-symlinks' of https://github.com/mstrap/ant into mstrap-feature/tarfileset-preserve-symlinks
new 9379bf4 Merge branch '1.9.x'
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:
WHATSNEW | 3 +++
src/etc/testcases/taskdefs/tar.xml | 8 ++++++
src/etc/testcases/testtarwithsymlinks.tar.gz | Bin 0 -> 199 bytes
src/main/org/apache/tools/ant/taskdefs/Tar.java | 24 +++++++++++++-----
.../tools/ant/types/resources/TarResource.java | 21 ++++++++++++++++
src/main/org/apache/tools/tar/TarEntry.java | 20 +++++++++++++++
.../org/apache/tools/ant/taskdefs/TarTest.java | 27 +++++++++++++++++++++
7 files changed, 97 insertions(+), 6 deletions(-)
create mode 100644 src/etc/testcases/testtarwithsymlinks.tar.gz
[ant] 01/03: Merge branch 'feature/tarfileset-preserve-symlinks' of
https://github.com/mstrap/ant into
mstrap-feature/tarfileset-preserve-symlinks
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 2d0b468ee834cb2626a15abf4342076516331717
Merge: 0a20cdc 2e2ed8a
Author: Stefan Bodewig <bo...@apache.org>
AuthorDate: Sat Sep 25 12:45:23 2021 +0200
Merge branch 'feature/tarfileset-preserve-symlinks' of https://github.com/mstrap/ant into mstrap-feature/tarfileset-preserve-symlinks
src/etc/testcases/taskdefs/tar.xml | 8 ++++++
src/etc/testcases/testtarwithsymlinks.tar.gz | Bin 0 -> 199 bytes
src/main/org/apache/tools/ant/taskdefs/Tar.java | 24 +++++++++++++-----
.../tools/ant/types/resources/TarResource.java | 21 ++++++++++++++++
src/main/org/apache/tools/tar/TarEntry.java | 18 +++++++++++++
.../org/apache/tools/ant/taskdefs/TarTest.java | 28 +++++++++++++++++++++
6 files changed, 93 insertions(+), 6 deletions(-)
[ant] 02/03: record tar symlink change of #142
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 16be5c00c0cba00589b8a272999cb6fca720ce32
Author: Stefan Bodewig <bo...@apache.org>
AuthorDate: Sat Sep 25 13:12:43 2021 +0200
record tar symlink change of #142
---
WHATSNEW | 3 +++
src/main/org/apache/tools/ant/types/resources/TarResource.java | 4 ++--
src/main/org/apache/tools/tar/TarEntry.java | 2 ++
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/WHATSNEW b/WHATSNEW
index 4c82517..5898c65 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -30,6 +30,9 @@ Other changes:
* javadoc task will now look for warning messages in the STDERR stream too
when "failonwarning" is set to true to account for changes in JDK 17+
+ * The tar task now preserves symlinks of nested tarfilesets.
+ Github Pull Request #142
+
Changes from Ant 1.10.10 TO Ant 1.10.11
=======================================
diff --git a/src/main/org/apache/tools/ant/types/resources/TarResource.java b/src/main/org/apache/tools/ant/types/resources/TarResource.java
index 96db041..2c44401 100644
--- a/src/main/org/apache/tools/ant/types/resources/TarResource.java
+++ b/src/main/org/apache/tools/ant/types/resources/TarResource.java
@@ -177,7 +177,7 @@ public class TarResource extends ArchiveResource {
/**
* @return the link "name" (=path) of this entry; an empty string if this is no link
- * @since 1.10.10
+ * @since 1.10.12
*/
public String getLinkName() {
return linkName;
@@ -185,7 +185,7 @@ public class TarResource extends ArchiveResource {
/**
* @return the link "flag" (=type) of this entry
- * @since 1.10.10
+ * @since 1.10.12
*/
public byte getLinkFlag() {
return linkFlag;
diff --git a/src/main/org/apache/tools/tar/TarEntry.java b/src/main/org/apache/tools/tar/TarEntry.java
index ab02120..a47b256 100644
--- a/src/main/org/apache/tools/tar/TarEntry.java
+++ b/src/main/org/apache/tools/tar/TarEntry.java
@@ -399,6 +399,7 @@ public class TarEntry implements TarConstants {
* Get this entry's link flag.
*
* @return This entry's link flag.
+ * @since 1.10.12
*/
public byte getLinkFlag() {
return linkFlag;
@@ -408,6 +409,7 @@ public class TarEntry implements TarConstants {
* Set this entry's link flag.
*
* @param link the link flag to use.
+ * @since 1.10.12
*/
public void setLinkFlag(byte linkFlag) {
this.linkFlag = linkFlag;
[ant] 03/03: 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 9379bf4ffc845361e1d68110952ce83828328623
Merge: 16be5c0 0f110ea
Author: Stefan Bodewig <bo...@apache.org>
AuthorDate: Sat Sep 25 13:17:52 2021 +0200
Merge branch '1.9.x'
src/tests/junit/org/apache/tools/ant/taskdefs/TarTest.java | 1 -
1 file changed, 1 deletion(-)
diff --cc src/tests/junit/org/apache/tools/ant/taskdefs/TarTest.java
index 86a6d9b,f747c42..249022b
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/TarTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/TarTest.java
@@@ -18,10 -18,9 +18,9 @@@
package org.apache.tools.ant.taskdefs;
-import java.io.IOException;
import java.io.File;
import java.io.FileInputStream;
- import java.io.FileNotFoundException;
+import java.io.IOException;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.BuildFileRule;