Andrius Merkys pushed to branch master at Debian Java Maintainers / jarchivelib
Commits: f87e738c by Andrius Merkys at 2021-08-20T01:25:54-04:00 New upstream version 1.2.0 - - - - - 790c4f20 by Andrius Merkys at 2021-08-20T01:25:58-04:00 Update upstream source from tag 'upstream/1.2.0' Update to upstream version '1.2.0' with Debian dir d27600d8382db9d4a769512a0b085cc150040efd - - - - - 158c2203 by Andrius Merkys at 2021-08-20T01:26:46-04:00 Update changelog for 1.2.0-1 release - - - - - 14 changed files: - debian/changelog - pom.xml - src/main/java/org/rauschig/jarchivelib/CommonsArchiver.java - src/test/java/org/rauschig/jarchivelib/AbstractArchiverTest.java - src/test/resources/Makefile - src/test/resources/archive.7z - src/test/resources/archive.cpio - src/test/resources/archive.jar - src/test/resources/archive.tar - src/test/resources/archive.tar.bz2 - src/test/resources/archive.tar.gz - src/test/resources/archive.zip - + src/test/resources/archive/looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_filename.txt - src/test/resources/compress.txt.gz Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,9 @@ +jarchivelib (1.2.0-1) unstable; urgency=medium + + * New upstream version 1.2.0 + + -- Andrius Merkys <[email protected]> Fri, 20 Aug 2021 01:26:44 -0400 + jarchivelib (1.1.0-1) unstable; urgency=medium * New upstream version 1.1.0 ===================================== pom.xml ===================================== @@ -26,7 +26,7 @@ <groupId>org.rauschig</groupId> <artifactId>jarchivelib</artifactId> - <version>1.1.0</version> + <version>1.2.0</version> <packaging>bundle</packaging> @@ -45,7 +45,7 @@ <url>https://github.com/thrau/jarchivelib</url> <connection>scm:git:git://[email protected]:thrau/jarchivelib.git</connection> <developerConnection>scm:git:[email protected]:thrau/jarchivelib.git</developerConnection> - <tag>v1.1.0</tag> + <tag>v1.2.0</tag> </scm> <developers> @@ -57,9 +57,9 @@ </developers> <properties> - <commons.compress.version>1.20</commons.compress.version> + <commons.compress.version>1.21</commons.compress.version> <xz.version>1.8</xz.version> - <junit.version>4.11</junit.version> + <junit.version>4.13.1</junit.version> <bundle.name>${project.groupId} :: ${project.artifactId} :: ${project.name}</bundle.name> <bundle.symbolicName>${project.groupId}.${project.artifactId}</bundle.symbolicName> ===================================== src/main/java/org/rauschig/jarchivelib/CommonsArchiver.java ===================================== @@ -26,6 +26,7 @@ import org.apache.commons.compress.archivers.ArchiveException; import org.apache.commons.compress.archivers.ArchiveInputStream; import org.apache.commons.compress.archivers.ArchiveOutputStream; import org.apache.commons.compress.archivers.ArchiveStreamFactory; +import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream; /** * Implementation of an {@link Archiver} that uses {@link ArchiveStreamFactory} to generate archive streams by a given @@ -159,7 +160,13 @@ class CommonsArchiver implements Archiver { */ protected ArchiveOutputStream createArchiveOutputStream(File archiveFile) throws IOException { try { - return CommonsStreamFactory.createArchiveOutputStream(this, archiveFile); + ArchiveOutputStream archiveOutputStream = CommonsStreamFactory.createArchiveOutputStream(this, archiveFile); + + if (archiveOutputStream instanceof TarArchiveOutputStream) { + ((TarArchiveOutputStream) archiveOutputStream).setLongFileMode(TarArchiveOutputStream.LONGFILE_POSIX); + } + + return archiveOutputStream; } catch (ArchiveException e) { throw new IOException(e); } ===================================== src/test/java/org/rauschig/jarchivelib/AbstractArchiverTest.java ===================================== @@ -167,8 +167,9 @@ public abstract class AbstractArchiverTest extends AbstractResourceTest { entries.add(entry.getName().replaceAll("/$", "")); // remove trailing slashes for test compatibility } - assertEquals(11, entries.size()); + assertEquals(12, entries.size()); assertTrue(entries.contains("file.txt")); + assertTrue(entries.contains("looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_filename.txt")); assertTrue(entries.contains("folder")); assertTrue(entries.contains("folder/folder_file.txt")); assertTrue(entries.contains("folder/subfolder/subfolder_file.txt")); ===================================== src/test/resources/Makefile ===================================== @@ -1,7 +1,17 @@ +.PHONY = permissions archives compress clean + CPF = compress.txt AR = archive -all: archives compress +all: permissions archives compress + +permissions: + cd $(AR); \ + chmod 755 permissions/executable_file.txt; \ + chmod 700 permissions/private_executable_file.txt; \ + chmod 444 permissions/readonly_file.txt; \ + chmod 700 permissions/private_folder; \ + chmod 600 permissions/private_folder/private_file.txt; ## archives ## TODO: separate ===================================== src/test/resources/archive.7z ===================================== Binary files a/src/test/resources/archive.7z and b/src/test/resources/archive.7z differ ===================================== src/test/resources/archive.cpio ===================================== Binary files a/src/test/resources/archive.cpio and b/src/test/resources/archive.cpio differ ===================================== src/test/resources/archive.jar ===================================== Binary files a/src/test/resources/archive.jar and b/src/test/resources/archive.jar differ ===================================== src/test/resources/archive.tar ===================================== Binary files a/src/test/resources/archive.tar and b/src/test/resources/archive.tar differ ===================================== src/test/resources/archive.tar.bz2 ===================================== Binary files a/src/test/resources/archive.tar.bz2 and b/src/test/resources/archive.tar.bz2 differ ===================================== src/test/resources/archive.tar.gz ===================================== Binary files a/src/test/resources/archive.tar.gz and b/src/test/resources/archive.tar.gz differ ===================================== src/test/resources/archive.zip ===================================== Binary files a/src/test/resources/archive.zip and b/src/test/resources/archive.zip differ ===================================== src/test/resources/archive/looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_filename.txt ===================================== @@ -0,0 +1 @@ +looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_filenae.txt ===================================== src/test/resources/compress.txt.gz ===================================== Binary files a/src/test/resources/compress.txt.gz and b/src/test/resources/compress.txt.gz differ View it on GitLab: https://salsa.debian.org/java-team/jarchivelib/-/compare/293079a5653dd2a35604e13226e82e09a658339c...158c2203ed651edc47629396c8d9ac155040f6b8 -- View it on GitLab: https://salsa.debian.org/java-team/jarchivelib/-/compare/293079a5653dd2a35604e13226e82e09a658339c...158c2203ed651edc47629396c8d9ac155040f6b8 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
