Skip to content

Update commons-compress to 1.26.0 #1476

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 27, 2024
Merged

Update commons-compress to 1.26.0 #1476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
057fe89
Update commons-compress to 1.26.0
akurtakov Feb 27, 2024
1811d23
Version bump for the new stream
akurtakov Feb 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions org.eclipse.wildwebdeveloper.embedder.node/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Manager for embedded Node.js
Bundle-SymbolicName: org.eclipse.wildwebdeveloper.embedder.node
Bundle-Version: 1.0.3.qualifier
Bundle-Version: 1.0.4.qualifier
Bundle-Vendor: Eclipse Wild Web Developer
Automatic-Module-Name: org.eclipse.wildwebdeveloper.embedder.node
Bundle-RequiredExecutionEnvironment: JavaSE-17
Expand All @@ -17,7 +17,8 @@ Import-Package: org.apache.commons.compress.archivers;version="1.22",
org.apache.commons.compress.archivers.zip,
org.apache.commons.compress.compressors.gzip,
org.apache.commons.compress.compressors.xz,
org.apache.commons.compress.utils
org.apache.commons.compress.utils,
org.apache.commons.io
Bundle-ActivationPolicy: lazy
Bundle-Activator: org.eclipse.wildwebdeveloper.embedder.node.Activator
Export-Package: org.eclipse.wildwebdeveloper.embedder.node
3 changes: 1 addition & 2 deletions org.eclipse.wildwebdeveloper.embedder.node/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,13 @@
<version>1.0.0-SNAPSHOT</version>
</parent>
<packaging>eclipse-plugin</packaging>
<version>1.0.3-SNAPSHOT</version>
<version>1.0.4-SNAPSHOT</version>

<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-packaging-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<jgit.ignore>
pom.xml
Expand Down
138 changes: 69 additions & 69 deletions ...developer.embedder.node/src/org/eclipse/wildwebdeveloper/embedder/node/CompressUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,75 +28,75 @@
import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream;
import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream;
import org.apache.commons.compress.compressors.xz.XZCompressorInputStream;
import org.apache.commons.compress.utils.IOUtils;
import org.apache.commons.io.IOUtils;

public class CompressUtils {
public static void unarchive(URL archiveURL, File baseDir) throws IOException {
if (archiveURL == null || baseDir == null) {
return;
}
ArchiveInputStream archive = null;
try (InputStream input = archiveURL.openStream()) {
if (archiveURL.getFile().endsWith(".tar.gz")) { //$NON-NLS-1$
InputStream gz = new GzipCompressorInputStream(input);
archive = new TarArchiveInputStream(gz);
} else if (archiveURL.getFile().endsWith(".tar.xz")) { //$NON-NLS-1$
InputStream xz = new XZCompressorInputStream(input);
archive = new TarArchiveInputStream(xz);
} else if (archiveURL.getFile().endsWith(".zip")) { //$NON-NLS-1$
archive = new ZipArchiveInputStream(input);
} else {
throw new UnsupportedCompressionAlgorithmException("Unsupported archive file extension: " + archive); //$NON-NLS-1$
}
try {
extractArchive(archive, baseDir);
} finally {
IOUtils.closeQuietly(archive);
}
}
}
/**
* Extract zip/tar.gz/tar.xz file to destination folder.
* Sets up 'executable' permission for TarAchiveEntry representing an
* executable file.
*
* @param in
* Zip/Tar Archive Input Stream to extract
* @param destination
* destination folder
*/
private static void extractArchive(ArchiveInputStream in, File destination) throws IOException {
ArchiveEntry entry = null;
while ((entry = in.getNextEntry()) != null) {
if (!in.canReadEntryData(entry)) {
// log something?
continue;
}
File f = new File(destination, entry.getName());
f.delete();
boolean symlink = entry instanceof TarArchiveEntry tarEntry && tarEntry.isSymbolicLink();
if (entry.isDirectory()) {
if (!f.isDirectory() && !f.mkdirs()) {
throw new IOException("failed to create directory " + f);
}
} else {
File parent = f.getParentFile();
if (!parent.isDirectory() && !parent.mkdirs()) {
throw new IOException("failed to create directory " + parent);
}
if (symlink) {
String linkName = ((TarArchiveEntry)entry).getLinkName();
Files.createSymbolicLink(f.toPath(), Paths.get(linkName));
} else {
try (OutputStream o = Files.newOutputStream(f.toPath())) {
IOUtils.copy(in, o);
}
}
if (entry instanceof TarArchiveEntry tarEntry) {
f.setExecutable((tarEntry.getMode() & 256) != 0);
}
}
}
}
public static void unarchive(URL archiveURL, File baseDir) throws IOException {
if (archiveURL == null || baseDir == null) {
return;
}
ArchiveInputStream archive = null;
try (InputStream input = archiveURL.openStream()) {
if (archiveURL.getFile().endsWith(".tar.gz")) { //$NON-NLS-1$
InputStream gz = new GzipCompressorInputStream(input);
archive = new TarArchiveInputStream(gz);
} else if (archiveURL.getFile().endsWith(".tar.xz")) { //$NON-NLS-1$
InputStream xz = new XZCompressorInputStream(input);
archive = new TarArchiveInputStream(xz);
} else if (archiveURL.getFile().endsWith(".zip")) { //$NON-NLS-1$
archive = new ZipArchiveInputStream(input);
} else {
throw new UnsupportedCompressionAlgorithmException("Unsupported archive file extension: " + archive); //$NON-NLS-1$
}
try {
extractArchive(archive, baseDir);
} finally {
IOUtils.closeQuietly(archive);
}
}
}

/**
* Extract zip/tar.gz/tar.xz file to destination folder.
* Sets up 'executable' permission for TarAchiveEntry representing an
* executable file.
*
* @param in
* Zip/Tar Archive Input Stream to extract
* @param destination
* destination folder
*/
private static void extractArchive(ArchiveInputStream in, File destination) throws IOException {
ArchiveEntry entry = null;
while ((entry = in.getNextEntry()) != null) {
if (!in.canReadEntryData(entry)) {
// log something?
continue;
}
File f = new File(destination, entry.getName());
f.delete();
boolean symlink = entry instanceof TarArchiveEntry tarEntry && tarEntry.isSymbolicLink();
if (entry.isDirectory()) {
if (!f.isDirectory() && !f.mkdirs()) {
throw new IOException("failed to create directory " + f);
}
} else {
File parent = f.getParentFile();
if (!parent.isDirectory() && !parent.mkdirs()) {
throw new IOException("failed to create directory " + parent);
}
if (symlink) {
String linkName = ((TarArchiveEntry) entry).getLinkName();
Files.createSymbolicLink(f.toPath(), Paths.get(linkName));
} else {
try (OutputStream o = Files.newOutputStream(f.toPath())) {
IOUtils.copy(in, o);
}
}
if (entry instanceof TarArchiveEntry tarEntry) {
f.setExecutable((tarEntry.getMode() & 256) != 0);
}
}
}
}
}
2 changes: 1 addition & 1 deletion target-platform/target-platform.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.25.0</version>
<version>1.26.0</version>
<type>jar</type>
</dependency>
</dependencies>
Expand Down