This is an automated email from the ASF dual-hosted git repository.
pepness pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new e7df0170da Upgrade commons compress from 1.21 to 1.23.0
new f5ad8d22d5 Merge pull request #5705 from pepness/compress-1.23
e7df0170da is described below
commit e7df0170da4282faac617cd3a70c6414a2d5a4f0
Author: José Contreras <[email protected]>
AuthorDate: Thu Mar 23 19:30:09 2023 -0600
Upgrade commons compress from 1.21 to 1.23.0
---
ide/db.dataview/nbproject/project.properties | 2 +-
ide/libs.commons_compress/external/binaries-list | 2 +-
...-compress-1.21-license.txt => commons-compress-1.23.0-license.txt} | 2 +-
...ns-compress-1.21-notice.txt => commons-compress-1.23.0-notice.txt} | 0
ide/libs.commons_compress/nbproject/project.properties | 2 +-
ide/libs.commons_compress/nbproject/project.xml | 4 ++--
.../src/org/netbeans/libs/commons_compress/mf-layer.xml | 2 +-
nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ide/db.dataview/nbproject/project.properties
b/ide/db.dataview/nbproject/project.properties
index cb75622b81..b25e67e223 100644
--- a/ide/db.dataview/nbproject/project.properties
+++ b/ide/db.dataview/nbproject/project.properties
@@ -26,7 +26,7 @@ test.unit.cp.extra=\
${basedir}/external/ooxml-schemas-1.4.jar:\
${basedir}/external/xmlbeans-3.1.0.jar:\
${basedir}/external/commons-collections4-4.4.jar:\
- ${nb_all}/ide/libs.commons_compress/external/commons-compress-1.21.jar
+
${nb_all}/ide/libs.commons_compress/external/commons-compress-1.23.0.jar
test.config.stableBTD.includes=**/*Test.class
test.config.stableBTD.excludes=\
diff --git a/ide/libs.commons_compress/external/binaries-list
b/ide/libs.commons_compress/external/binaries-list
index 47ecf32ea5..312658f68a 100644
--- a/ide/libs.commons_compress/external/binaries-list
+++ b/ide/libs.commons_compress/external/binaries-list
@@ -14,4 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-4EC95B60D4E86B5C95A0E919CB172A0AF98011EF
org.apache.commons:commons-compress:1.21
+4AF2060EA9B0C8B74F1854C6CAFE4D43CFC161FC
org.apache.commons:commons-compress:1.23.0
diff --git
a/ide/libs.commons_compress/external/commons-compress-1.21-license.txt
b/ide/libs.commons_compress/external/commons-compress-1.23.0-license.txt
similarity index 99%
rename from ide/libs.commons_compress/external/commons-compress-1.21-license.txt
rename to ide/libs.commons_compress/external/commons-compress-1.23.0-license.txt
index 5429e1fb1e..55d972a4e5 100644
--- a/ide/libs.commons_compress/external/commons-compress-1.21-license.txt
+++ b/ide/libs.commons_compress/external/commons-compress-1.23.0-license.txt
@@ -1,5 +1,5 @@
Name: Commons Compress
-Version: 1.21
+Version: 1.23.0
OSR: 19203
Description: The Apache Commons Compress library defines an API for working
with ar, cpio, Unix dump, tar, zip, gzip, XZ, Pack200, bzip2, 7z, arj, lzma,
snappy, DEFLATE, lz4, Brotli, Zstandard, DEFLATE64 and Z files.
Origin: https://commons.apache.org/proper/commons-compress/index.html
diff --git
a/ide/libs.commons_compress/external/commons-compress-1.21-notice.txt
b/ide/libs.commons_compress/external/commons-compress-1.23.0-notice.txt
similarity index 100%
rename from ide/libs.commons_compress/external/commons-compress-1.21-notice.txt
rename to ide/libs.commons_compress/external/commons-compress-1.23.0-notice.txt
diff --git a/ide/libs.commons_compress/nbproject/project.properties
b/ide/libs.commons_compress/nbproject/project.properties
index 14d35d0aee..81f9b37004 100644
--- a/ide/libs.commons_compress/nbproject/project.properties
+++ b/ide/libs.commons_compress/nbproject/project.properties
@@ -18,5 +18,5 @@
is.autoload=true
javac.compilerargs=-Xlint -Xlint:-serial
javac.source=1.8
-release.external/commons-compress-1.21.jar=modules/ext/commons-compress-1.21.jar
+release.external/commons-compress-1.23.0.jar=modules/ext/commons-compress-1.23.0.jar
spec.version.base=0.26.0
diff --git a/ide/libs.commons_compress/nbproject/project.xml
b/ide/libs.commons_compress/nbproject/project.xml
index 2c0edd48e6..3dec083ee6 100644
--- a/ide/libs.commons_compress/nbproject/project.xml
+++ b/ide/libs.commons_compress/nbproject/project.xml
@@ -36,8 +36,8 @@
<package>org.apache.commons.compress.utils</package>
</friend-packages>
<class-path-extension>
-
<runtime-relative-path>ext/commons-compress-1.21.jar</runtime-relative-path>
-
<binary-origin>external/commons-compress-1.21.jar</binary-origin>
+
<runtime-relative-path>ext/commons-compress-1.23.0.jar</runtime-relative-path>
+
<binary-origin>external/commons-compress-1.23.0.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
diff --git
a/ide/libs.commons_compress/src/org/netbeans/libs/commons_compress/mf-layer.xml
b/ide/libs.commons_compress/src/org/netbeans/libs/commons_compress/mf-layer.xml
index 9c67fa3a51..9be466f6de 100644
---
a/ide/libs.commons_compress/src/org/netbeans/libs/commons_compress/mf-layer.xml
+++
b/ide/libs.commons_compress/src/org/netbeans/libs/commons_compress/mf-layer.xml
@@ -27,7 +27,7 @@
<file name="org-netbeans-lib-commons_compress-antlibrary.instance">
<attr name="instanceCreate"
methodvalue="org.apache.tools.ant.module.spi.AutomaticExtraClasspath.url"/>
<attr name="instanceOf"
stringvalue="org.apache.tools.ant.module.spi.AutomaticExtraClasspathProvider"/>
- <attr name="url"
urlvalue="nbinst://org.netbeans.libs.commons_compress/modules/ext/commons-compress-1.21.jar"/>
+ <attr name="url"
urlvalue="nbinst://org.netbeans.libs.commons_compress/modules/ext/commons-compress-1.23.0.jar"/>
</file>
</folder>
</folder>
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
index 1361dc888a..471b212f7a 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
@@ -67,7 +67,7 @@ enterprise/web.core.syntax/external/struts-tiles-1.3.10.jar
enterprise/web.strut
extide/gradle/external/gradle-7.4-bin.zip
enterprise/libs.amazon/external/ion-java-1.0.2.jar
extide/gradle/external/gradle-7.4-bin.zip
ide/c.jcraft.jsch/external/jsch-0.1.55.jar
extide/gradle/external/gradle-7.4-bin.zip
ide/c.jcraft.jzlib/external/jzlib-1.1.3.jar
-extide/gradle/external/gradle-7.4-bin.zip
ide/libs.commons_compress/external/commons-compress-1.21.jar
+extide/gradle/external/gradle-7.4-bin.zip
ide/libs.commons_compress/external/commons-compress-1.23.0.jar
extide/gradle/external/gradle-7.4-bin.zip
ide/libs.tomlj/external/tomlj-1.0.0.jar
extide/gradle/external/gradle-7.4-bin.zip
ide/o.apache.commons.lang/external/commons-lang-2.6.jar
extide/gradle/external/gradle-7.4-bin.zip
ide/o.eclipse.jgit/external/org.eclipse.jgit-5.7.0.202003110725-r.jar
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
