update commons-compress

GitOrigin-RevId: 3a5aa8c7ca0b85235c980b57c356c8b20cdf07fe
This commit is contained in:
Vladimir Krivosheev
2024-03-07 21:15:17 +00:00
committed by intellij-monorepo-bot
parent 87c69e4ff1
commit 05c38fd0ad
7 changed files with 45 additions and 31 deletions
+5 -5
View File
@@ -1,18 +1,18 @@
<component name="libraryTable">
<library name="commons-codec" type="repository">
<properties maven-id="commons-codec:commons-codec:1.16.0">
<properties maven-id="commons-codec:commons-codec:1.16.1">
<verification>
<artifact url="file://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.16.0/commons-codec-1.16.0.jar">
<sha256sum>56595fb20b0b85bc91d0d503dad50bb7f1b9afc0eed5dffa6cbb25929000484d</sha256sum>
<artifact url="file://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.16.1/commons-codec-1.16.1.jar">
<sha256sum>ec87bfb55f22cbd1b21e2190eeda28b2b312ed2a431ee49fbdcc01812d04a5e4</sha256sum>
</artifact>
</verification>
</properties>
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.16.0/commons-codec-1.16.0.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.16.1/commons-codec-1.16.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.16.0/commons-codec-1.16.0-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.16.1/commons-codec-1.16.1-sources.jar!/" />
</SOURCES>
</library>
</component>
+13 -5
View File
@@ -1,18 +1,26 @@
<component name="libraryTable">
<library name="commons-compress" type="repository">
<properties include-transitive-deps="false" maven-id="org.apache.commons:commons-compress:1.25.0">
<properties maven-id="org.apache.commons:commons-compress:1.26.0">
<verification>
<artifact url="file://$MAVEN_REPOSITORY$/org/apache/commons/commons-compress/1.25.0/commons-compress-1.25.0.jar">
<sha256sum>d0ec8014ebbb0749f471803122b21796afddf2e98e194e4374622e5fbaf69f49</sha256sum>
<artifact url="file://$MAVEN_REPOSITORY$/org/apache/commons/commons-compress/1.26.0/commons-compress-1.26.0.jar">
<sha256sum>051aceb8bbcc62d0f5b2b8ac72c53767f9c59bfbd050151e65bef6f51c8ed9c9</sha256sum>
</artifact>
<artifact url="file://$MAVEN_REPOSITORY$/commons-io/commons-io/2.15.1/commons-io-2.15.1.jar">
<sha256sum>a58af12ee1b68cfd2ebb0c27caef164f084381a00ec81a48cc275fd7ea54e154</sha256sum>
</artifact>
</verification>
<exclude>
<dependency maven-id="org.apache.commons:commons-lang3" />
</exclude>
</properties>
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-compress/1.25.0/commons-compress-1.25.0.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-compress/1.26.0/commons-compress-1.26.0.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.15.1/commons-io-2.15.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-compress/1.25.0/commons-compress-1.25.0-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-compress/1.26.0/commons-compress-1.26.0-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.15.1/commons-io-2.15.1-sources.jar!/" />
</SOURCES>
</library>
</component>
+5 -5
View File
@@ -1,18 +1,18 @@
<component name="libraryTable">
<library name="commons-io" type="repository">
<properties maven-id="commons-io:commons-io:2.15.0">
<properties maven-id="commons-io:commons-io:2.15.1">
<verification>
<artifact url="file://$MAVEN_REPOSITORY$/commons-io/commons-io/2.15.0/commons-io-2.15.0.jar">
<sha256sum>a328dad730921d197b6a9b195dffa00e41c974c2dac8fe37e84d31706bca7792</sha256sum>
<artifact url="file://$MAVEN_REPOSITORY$/commons-io/commons-io/2.15.1/commons-io-2.15.1.jar">
<sha256sum>a58af12ee1b68cfd2ebb0c27caef164f084381a00ec81a48cc275fd7ea54e154</sha256sum>
</artifact>
</verification>
</properties>
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.15.0/commons-io-2.15.0.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.15.1/commons-io-2.15.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.15.0/commons-io-2.15.0-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.15.1/commons-io-2.15.1-sources.jar!/" />
</SOURCES>
</library>
</component>
+5 -5
View File
@@ -1,18 +1,18 @@
<component name="libraryTable">
<library name="compile-testing" type="repository">
<properties include-transitive-deps="false" maven-id="com.google.testing.compile:compile-testing:0.16">
<properties include-transitive-deps="false" maven-id="com.google.testing.compile:compile-testing:0.21.0">
<verification>
<artifact url="file://$MAVEN_REPOSITORY$/com/google/testing/compile/compile-testing/0.16/compile-testing-0.16.jar">
<sha256sum>55746fa706fb051a53f61d205eb66ee31e33ed1936d92b323c7001df18ad3acb</sha256sum>
<artifact url="file://$MAVEN_REPOSITORY$/com/google/testing/compile/compile-testing/0.21.0/compile-testing-0.21.0.jar">
<sha256sum>da42c0b350c0e5717df91a7e554ee5acbf07f4b87d4d2240589521070b4bce72</sha256sum>
</artifact>
</verification>
</properties>
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/testing/compile/compile-testing/0.16/compile-testing-0.16.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/google/testing/compile/compile-testing/0.21.0/compile-testing-0.21.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/testing/compile/compile-testing/0.16/compile-testing-0.16-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/google/testing/compile/compile-testing/0.21.0/compile-testing-0.21.0-sources.jar!/" />
</SOURCES>
</library>
</component>
+2 -2
View File
@@ -43,7 +43,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.25.0</version>
<version>1.26.0</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
@@ -53,7 +53,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.15.0</version>
<version>2.15.1</version>
</dependency>
<dependency>
<groupId>io.ktor</groupId>
@@ -1,4 +1,4 @@
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.apache.sanselan.util;
import com.intellij.openapi.util.io.FileUtil;
@@ -13,7 +13,7 @@ import java.io.*;
*
* @deprecated For plugin compatibility only, DO NOT USE.
*/
@Deprecated
@Deprecated(forRemoval = true)
public final class IOUtils {
public static byte[] getInputStreamBytes(InputStream is) throws IOException {
@@ -2,7 +2,7 @@
package com.intellij.util.io;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.util.SystemInfoRt;
import com.intellij.openapi.util.io.*;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.util.ArrayUtil;
@@ -19,8 +19,14 @@ import java.io.*;
import java.nio.file.*;
import java.nio.file.attribute.DosFileAttributeView;
import java.nio.file.attribute.PosixFileAttributeView;
import java.util.*;
import java.util.function.*;
import java.util.ArrayDeque;
import java.util.Deque;
import java.util.Enumeration;
import java.util.List;
import java.util.function.BiConsumer;
import java.util.function.BiFunction;
import java.util.function.Consumer;
import java.util.function.Predicate;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
@@ -71,7 +77,7 @@ public abstract class Decompressor {
|| te.isDirectory()
|| te.isSymbolicLink())) /* skipping unsupported */;
if (te == null) return null;
if (!SystemInfo.isWindows) return new Entry(te.getName(), type(te), te.getMode(), te.getLinkName(), te.getSize());
if (!SystemInfoRt.isWindows) return new Entry(te.getName(), type(te), te.getMode(), te.getLinkName(), te.getSize());
// UNIX permissions are ignored on Windows
if (te.isSymbolicLink()) return new Entry(te.getName(), Entry.Type.SYMLINK, 0, te.getLinkName(), te.getSize());
return new Entry(te.getName(), te.isDirectory(), te.getSize());
@@ -162,7 +168,7 @@ public abstract class Decompressor {
@Override
protected void openStream() throws IOException {
myZip = new org.apache.commons.compress.archivers.zip.ZipFile(Files.newByteChannel(mySource));
myZip = new org.apache.commons.compress.archivers.zip.ZipFile.Builder().setSeekableByteChannel(Files.newByteChannel(mySource)).get();
myEntries = myZip.getEntries();
}
@@ -171,7 +177,7 @@ public abstract class Decompressor {
myEntry = myEntries.hasMoreElements() ? myEntries.nextElement() : null;
if (myEntry == null) return null;
int platform = myEntry.getPlatform();
if (SystemInfo.isWindows) {
if (SystemInfoRt.isWindows) {
// UNIX permissions are ignored on Windows
if (platform == ZipArchiveEntry.PLATFORM_UNIX) {
return new Entry(myEntry.getName(), type(myEntry), 0, myZip.getUnixSymlink(myEntry), myEntry.getSize());
@@ -497,7 +503,7 @@ public abstract class Decompressor {
}
private static void setAttributes(int mode, Path outputFile) throws IOException {
if (SystemInfo.isWindows) {
if (SystemInfoRt.isWindows) {
DosFileAttributeView attrs = Files.getFileAttributeView(outputFile, DosFileAttributeView.class);
if (attrs != null) {
if ((mode & Entry.DOS_READ_ONLY) != 0) attrs.setReadOnly(true);