From 1fd8b0f7dcf1151638baf07a356d49cb63e57c23 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 20 Feb 2024 17:00:22 +0100 Subject: [PATCH] Update org.apache.commons:commons-compress to 1.26.0 The new version now requires commons-io for the tests. Hence adding dependency to commons-io:commons-io:2.15.1. Change-Id: Ieb50ef559a119c89f90d700ab95a73c0fcae85a8 --- WORKSPACE | 10 ++++++++-- lib/BUILD | 10 ++++++++++ .../org.eclipse.jgit.target/jgit-4.17.target | 10 ++++++++-- .../org.eclipse.jgit.target/jgit-4.18.target | 10 ++++++++-- .../org.eclipse.jgit.target/jgit-4.19.target | 10 ++++++++-- .../org.eclipse.jgit.target/jgit-4.20.target | 10 ++++++++-- .../org.eclipse.jgit.target/jgit-4.21.target | 10 ++++++++-- .../org.eclipse.jgit.target/jgit-4.22.target | 10 ++++++++-- .../org.eclipse.jgit.target/jgit-4.23.target | 10 ++++++++-- .../org.eclipse.jgit.target/jgit-4.24.target | 10 ++++++++-- .../org.eclipse.jgit.target/jgit-4.25.target | 10 ++++++++-- .../org.eclipse.jgit.target/jgit-4.26.target | 10 ++++++++-- .../org.eclipse.jgit.target/jgit-4.27.target | 10 ++++++++-- .../org.eclipse.jgit.target/jgit-4.28.target | 10 ++++++++-- .../org.eclipse.jgit.target/jgit-4.29.target | 10 ++++++++-- .../org.eclipse.jgit.target/jgit-4.30.target | 10 ++++++++-- .../org.eclipse.jgit.target/jgit-4.31.target | 10 ++++++++-- .../org.eclipse.jgit.target/maven/dependencies.tpd | 7 ++++++- org.eclipse.jgit.pgm.test/BUILD | 1 + org.eclipse.jgit.test/BUILD | 1 + org.eclipse.jgit.test/META-INF/MANIFEST.MF | 2 ++ pom.xml | 2 +- 22 files changed, 149 insertions(+), 34 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 5694c39e96..baa534f756 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -150,8 +150,14 @@ maven_jar( maven_jar( name = "commons-compress", - artifact = "org.apache.commons:commons-compress:1.25.0", - sha1 = "9d35aec423da6c8a7f93d7e9e1c6b1d9fe14bb5e", + artifact = "org.apache.commons:commons-compress:1.26.0", + sha1 = "659feffdd12280201c8aacb8f7be94f9a883c824", +) + +maven_jar( + name = "commons-io", + artifact = "commons-io:commons-io:2.15.1", + sha1 = "f11560da189ab563a5c8e351941415430e9304ea", ) maven_jar( diff --git a/lib/BUILD b/lib/BUILD index 29669b5d2f..8806217577 100644 --- a/lib/BUILD +++ b/lib/BUILD @@ -19,6 +19,16 @@ java_library( exports = ["@commons-compress//jar"], ) +java_library( + name = "commons-io", + visibility = [ + "//org.eclipse.jgit.archive:__pkg__", + "//org.eclipse.jgit.pgm.test:__pkg__", + "//org.eclipse.jgit.test:__pkg__", + ], + exports = ["@commons-io//jar"], +) + java_library( name = "commons-codec", visibility = [ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target index e6e8bbe517..df52c55f9f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target @@ -1,7 +1,7 @@ - + @@ -257,7 +257,13 @@ org.apache.commons commons-compress - 1.25.0 + 1.26.0 + jar + + + commons-io + commons-io + 2.15.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target index 308471d758..d18e1c8ddc 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target @@ -1,7 +1,7 @@ - + @@ -257,7 +257,13 @@ org.apache.commons commons-compress - 1.25.0 + 1.26.0 + jar + + + commons-io + commons-io + 2.15.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target index ef09fb8e17..036613e218 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target @@ -1,7 +1,7 @@ - + @@ -257,7 +257,13 @@ org.apache.commons commons-compress - 1.25.0 + 1.26.0 + jar + + + commons-io + commons-io + 2.15.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target index 9ed8b06888..c3d7750f33 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target @@ -1,7 +1,7 @@ - + @@ -257,7 +257,13 @@ org.apache.commons commons-compress - 1.25.0 + 1.26.0 + jar + + + commons-io + commons-io + 2.15.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target index 8e5eef14ef..55d1b9be61 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target @@ -1,7 +1,7 @@ - + @@ -257,7 +257,13 @@ org.apache.commons commons-compress - 1.25.0 + 1.26.0 + jar + + + commons-io + commons-io + 2.15.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target index 71df1e96fc..f53cf6f784 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target @@ -1,7 +1,7 @@ - + @@ -257,7 +257,13 @@ org.apache.commons commons-compress - 1.25.0 + 1.26.0 + jar + + + commons-io + commons-io + 2.15.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target index cb0d94560c..c2b6903e5a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target @@ -1,7 +1,7 @@ - + @@ -257,7 +257,13 @@ org.apache.commons commons-compress - 1.25.0 + 1.26.0 + jar + + + commons-io + commons-io + 2.15.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target index a576837fe8..109851477c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target @@ -1,7 +1,7 @@ - + @@ -257,7 +257,13 @@ org.apache.commons commons-compress - 1.25.0 + 1.26.0 + jar + + + commons-io + commons-io + 2.15.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target index 97b0c7e974..08576a0c0d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target @@ -1,7 +1,7 @@ - + @@ -257,7 +257,13 @@ org.apache.commons commons-compress - 1.25.0 + 1.26.0 + jar + + + commons-io + commons-io + 2.15.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target index 29a04e0521..c5a8807711 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target @@ -1,7 +1,7 @@ - + @@ -257,7 +257,13 @@ org.apache.commons commons-compress - 1.25.0 + 1.26.0 + jar + + + commons-io + commons-io + 2.15.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target index f9043d9a17..4a8708ef91 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target @@ -1,7 +1,7 @@ - + @@ -257,7 +257,13 @@ org.apache.commons commons-compress - 1.25.0 + 1.26.0 + jar + + + commons-io + commons-io + 2.15.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target index 15abe486e8..438be365c4 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target @@ -1,7 +1,7 @@ - + @@ -257,7 +257,13 @@ org.apache.commons commons-compress - 1.25.0 + 1.26.0 + jar + + + commons-io + commons-io + 2.15.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target index 230cdfc2de..99ef029160 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target @@ -1,7 +1,7 @@ - + @@ -257,7 +257,13 @@ org.apache.commons commons-compress - 1.25.0 + 1.26.0 + jar + + + commons-io + commons-io + 2.15.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target index effcbb6650..37f73f392a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target @@ -1,7 +1,7 @@ - + @@ -257,7 +257,13 @@ org.apache.commons commons-compress - 1.25.0 + 1.26.0 + jar + + + commons-io + commons-io + 2.15.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target index 40b732883c..8d04997dab 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target @@ -1,7 +1,7 @@ - + @@ -257,7 +257,13 @@ org.apache.commons commons-compress - 1.25.0 + 1.26.0 + jar + + + commons-io + commons-io + 2.15.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd index 45edf5d342..f07d4efc9f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd @@ -15,7 +15,12 @@ maven apache dependency { groupId = "org.apache.commons" artifactId = "commons-compress" - version = "1.25.0" + version = "1.26.0" + } + dependency { + groupId = "commons-io" + artifactId = "commons-io" + version = "2.15.1" } dependency { groupId = "commons-logging" diff --git a/org.eclipse.jgit.pgm.test/BUILD b/org.eclipse.jgit.pgm.test/BUILD index 539d666883..b8ffa69594 100644 --- a/org.eclipse.jgit.pgm.test/BUILD +++ b/org.eclipse.jgit.pgm.test/BUILD @@ -15,6 +15,7 @@ junit_tests( deps = [ ":helpers", "//lib:args4j", + "//lib:commons-io", "//lib:commons-compress", "//lib:javaewah", "//lib:junit", diff --git a/org.eclipse.jgit.test/BUILD b/org.eclipse.jgit.test/BUILD index bb15de0b2d..29f5b36149 100644 --- a/org.eclipse.jgit.test/BUILD +++ b/org.eclipse.jgit.test/BUILD @@ -78,6 +78,7 @@ java_library( deps = [ "//lib:assertj-core", "//lib:commons-codec", + "//lib:commons-io", "//lib:junit", "//lib:mockito", "//lib:slf4j-simple", diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index 374a82c8b8..d6468c6b69 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -18,6 +18,8 @@ Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", org.apache.commons.compress.compressors.bzip2;version="[1.15.0,2.0)", org.apache.commons.compress.compressors.gzip;version="[1.15.0,2.0)", org.apache.commons.compress.compressors.xz;version="[1.15.0,2.0)", + org.apache.commons.io;version="[2.15.0,3.0.0)", + org.apache.commons.io.output;version="[2.15.0,3.0.0)", org.assertj.core.api;version="[3.14.0,4.0.0)", org.eclipse.jgit.annotations;version="[6.9.0,6.10.0)", org.eclipse.jgit.api;version="[6.9.0,6.10.0)", diff --git a/pom.xml b/pom.xml index 91adcb3f89..cffb8529c0 100644 --- a/pom.xml +++ b/pom.xml @@ -127,7 +127,7 @@ 4.13.2 1C 2.33 - 1.25.0 + 1.26.0 6.0.0 4.0.4 10.0.18 -- 2.39.5