]> source.dussan.org Git - jgit.git/commitdiff
Update org.apache.commons:commons-compress to 1.26.0 75/1177075/1
authorMatthias Sohn <matthias.sohn@sap.com>
Tue, 20 Feb 2024 16:00:22 +0000 (17:00 +0100)
committerMatthias Sohn <matthias.sohn@sap.com>
Tue, 20 Feb 2024 16:05:47 +0000 (17:05 +0100)
The new version now requires commons-io for the tests.
Hence adding dependency to commons-io:commons-io:2.15.1.

Change-Id: Ieb50ef559a119c89f90d700ab95a73c0fcae85a8

22 files changed:
WORKSPACE
lib/BUILD
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target
org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd
org.eclipse.jgit.pgm.test/BUILD
org.eclipse.jgit.test/BUILD
org.eclipse.jgit.test/META-INF/MANIFEST.MF
pom.xml

index 5694c39e96f3a07a36a01fcac2df452897d1d2e7..baa534f7564c0f1f543151978677ba2bb4487109 100644 (file)
--- 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(
index 29669b5d2f305f9c15b8188bc7a021c6f3c0736e..88062175778266d778db7fd241bc7bb3c97d0ea1 100644 (file)
--- 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 = [
index e6e8bbe5173e1140f7e450c3f2e7195c58949108..df52c55f9f4f1d429ad60ae7830e1efb155baec8 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="jgit-4.17" sequenceNumber="1708437929">
+<target name="jgit-4.17" sequenceNumber="1708444935">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
        <dependency>
                <groupId>org.apache.commons</groupId>
                <artifactId>commons-compress</artifactId>
-               <version>1.25.0</version>
+               <version>1.26.0</version>
+               <type>jar</type>
+       </dependency>
+       <dependency>
+               <groupId>commons-io</groupId>
+               <artifactId>commons-io</artifactId>
+               <version>2.15.1</version>
                <type>jar</type>
        </dependency>
        <dependency>
index 308471d7583b255d561f7696332f53969361a669..d18e1c8ddcd7b0467117e672d7389788ac3d781d 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="jgit-4.18" sequenceNumber="1708437929">
+<target name="jgit-4.18" sequenceNumber="1708444935">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
        <dependency>
                <groupId>org.apache.commons</groupId>
                <artifactId>commons-compress</artifactId>
-               <version>1.25.0</version>
+               <version>1.26.0</version>
+               <type>jar</type>
+       </dependency>
+       <dependency>
+               <groupId>commons-io</groupId>
+               <artifactId>commons-io</artifactId>
+               <version>2.15.1</version>
                <type>jar</type>
        </dependency>
        <dependency>
index ef09fb8e17dbc9a9de942e248b2d2fdb886da6a9..036613e218b43ab87e30ff250cc3df27af4da6d4 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="jgit-4.19-staging" sequenceNumber="1708437929">
+<target name="jgit-4.19-staging" sequenceNumber="1708444935">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
        <dependency>
                <groupId>org.apache.commons</groupId>
                <artifactId>commons-compress</artifactId>
-               <version>1.25.0</version>
+               <version>1.26.0</version>
+               <type>jar</type>
+       </dependency>
+       <dependency>
+               <groupId>commons-io</groupId>
+               <artifactId>commons-io</artifactId>
+               <version>2.15.1</version>
                <type>jar</type>
        </dependency>
        <dependency>
index 9ed8b068882ba2aa4cc8eecbee22e4c492a03183..c3d7750f3374fd1004356e904f80863d1019db67 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="jgit-4.20" sequenceNumber="1708437929">
+<target name="jgit-4.20" sequenceNumber="1708444935">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
        <dependency>
                <groupId>org.apache.commons</groupId>
                <artifactId>commons-compress</artifactId>
-               <version>1.25.0</version>
+               <version>1.26.0</version>
+               <type>jar</type>
+       </dependency>
+       <dependency>
+               <groupId>commons-io</groupId>
+               <artifactId>commons-io</artifactId>
+               <version>2.15.1</version>
                <type>jar</type>
        </dependency>
        <dependency>
index 8e5eef14ef4d52018fdbd69c47be60f0f27e0ba4..55d1b9be61fe261cd67d1bb4f22e91100c071ecb 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="jgit-4.21" sequenceNumber="1708437929">
+<target name="jgit-4.21" sequenceNumber="1708444935">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
        <dependency>
                <groupId>org.apache.commons</groupId>
                <artifactId>commons-compress</artifactId>
-               <version>1.25.0</version>
+               <version>1.26.0</version>
+               <type>jar</type>
+       </dependency>
+       <dependency>
+               <groupId>commons-io</groupId>
+               <artifactId>commons-io</artifactId>
+               <version>2.15.1</version>
                <type>jar</type>
        </dependency>
        <dependency>
index 71df1e96fc46f8e461f135d472a34d486fa9ad33..f53cf6f7849fa6cb44ecad64f1149658d415a3a5 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="jgit-4.22" sequenceNumber="1708437927">
+<target name="jgit-4.22" sequenceNumber="1708444934">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
        <dependency>
                <groupId>org.apache.commons</groupId>
                <artifactId>commons-compress</artifactId>
-               <version>1.25.0</version>
+               <version>1.26.0</version>
+               <type>jar</type>
+       </dependency>
+       <dependency>
+               <groupId>commons-io</groupId>
+               <artifactId>commons-io</artifactId>
+               <version>2.15.1</version>
                <type>jar</type>
        </dependency>
        <dependency>
index cb0d94560c75d5662066109c3e10aff13a7e23df..c2b6903e5a872b68a1ac2470c1b9d9224ed787dd 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="jgit-4.23" sequenceNumber="1708437927">
+<target name="jgit-4.23" sequenceNumber="1708444934">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
        <dependency>
                <groupId>org.apache.commons</groupId>
                <artifactId>commons-compress</artifactId>
-               <version>1.25.0</version>
+               <version>1.26.0</version>
+               <type>jar</type>
+       </dependency>
+       <dependency>
+               <groupId>commons-io</groupId>
+               <artifactId>commons-io</artifactId>
+               <version>2.15.1</version>
                <type>jar</type>
        </dependency>
        <dependency>
index a576837fe8f5cfaefd55501dd2aae6a2016f6b3b..109851477c4fbef781fbe55c47fab5526952ade1 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="jgit-4.24" sequenceNumber="1708437927">
+<target name="jgit-4.24" sequenceNumber="1708444934">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
        <dependency>
                <groupId>org.apache.commons</groupId>
                <artifactId>commons-compress</artifactId>
-               <version>1.25.0</version>
+               <version>1.26.0</version>
+               <type>jar</type>
+       </dependency>
+       <dependency>
+               <groupId>commons-io</groupId>
+               <artifactId>commons-io</artifactId>
+               <version>2.15.1</version>
                <type>jar</type>
        </dependency>
        <dependency>
index 97b0c7e9743e0b49eb887d0bbe594de4a0ce76c4..08576a0c0db0aebf019208bc49f89e47ae8f69b4 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="jgit-4.25" sequenceNumber="1708437927">
+<target name="jgit-4.25" sequenceNumber="1708444934">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
        <dependency>
                <groupId>org.apache.commons</groupId>
                <artifactId>commons-compress</artifactId>
-               <version>1.25.0</version>
+               <version>1.26.0</version>
+               <type>jar</type>
+       </dependency>
+       <dependency>
+               <groupId>commons-io</groupId>
+               <artifactId>commons-io</artifactId>
+               <version>2.15.1</version>
                <type>jar</type>
        </dependency>
        <dependency>
index 29a04e0521a29f9037b228ed04267aa1f07c2f87..c5a8807711c9906e9d74615823f6679d3db7bc79 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="jgit-4.26" sequenceNumber="1708437927">
+<target name="jgit-4.26" sequenceNumber="1708444934">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
        <dependency>
                <groupId>org.apache.commons</groupId>
                <artifactId>commons-compress</artifactId>
-               <version>1.25.0</version>
+               <version>1.26.0</version>
+               <type>jar</type>
+       </dependency>
+       <dependency>
+               <groupId>commons-io</groupId>
+               <artifactId>commons-io</artifactId>
+               <version>2.15.1</version>
                <type>jar</type>
        </dependency>
        <dependency>
index f9043d9a1722a5fa6af70fa8ac94da28e219b147..4a8708ef913ebffde6fdd8be1f3ff2f2ba166e4b 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="jgit-4.27" sequenceNumber="1708437927">
+<target name="jgit-4.27" sequenceNumber="1708444934">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
        <dependency>
                <groupId>org.apache.commons</groupId>
                <artifactId>commons-compress</artifactId>
-               <version>1.25.0</version>
+               <version>1.26.0</version>
+               <type>jar</type>
+       </dependency>
+       <dependency>
+               <groupId>commons-io</groupId>
+               <artifactId>commons-io</artifactId>
+               <version>2.15.1</version>
                <type>jar</type>
        </dependency>
        <dependency>
index 15abe486e8baf7eecc2f2b9f561569864c28827d..438be365c4710d76ff54d3c1136e78c71095f594 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="jgit-4.28" sequenceNumber="1708437927">
+<target name="jgit-4.28" sequenceNumber="1708444934">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
        <dependency>
                <groupId>org.apache.commons</groupId>
                <artifactId>commons-compress</artifactId>
-               <version>1.25.0</version>
+               <version>1.26.0</version>
+               <type>jar</type>
+       </dependency>
+       <dependency>
+               <groupId>commons-io</groupId>
+               <artifactId>commons-io</artifactId>
+               <version>2.15.1</version>
                <type>jar</type>
        </dependency>
        <dependency>
index 230cdfc2de278263c4ebc543ce93eee990851344..99ef0291605f0ac0fbfd9b843a54d1957dae942c 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="jgit-4.29" sequenceNumber="1708437927">
+<target name="jgit-4.29" sequenceNumber="1708444934">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
        <dependency>
                <groupId>org.apache.commons</groupId>
                <artifactId>commons-compress</artifactId>
-               <version>1.25.0</version>
+               <version>1.26.0</version>
+               <type>jar</type>
+       </dependency>
+       <dependency>
+               <groupId>commons-io</groupId>
+               <artifactId>commons-io</artifactId>
+               <version>2.15.1</version>
                <type>jar</type>
        </dependency>
        <dependency>
index effcbb6650982438fe37aa707688e542fced438b..37f73f392a31858ecf8fcb6b97a21119ea5458e3 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="jgit-4.30" sequenceNumber="1708437927">
+<target name="jgit-4.30" sequenceNumber="1708444933">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
        <dependency>
                <groupId>org.apache.commons</groupId>
                <artifactId>commons-compress</artifactId>
-               <version>1.25.0</version>
+               <version>1.26.0</version>
+               <type>jar</type>
+       </dependency>
+       <dependency>
+               <groupId>commons-io</groupId>
+               <artifactId>commons-io</artifactId>
+               <version>2.15.1</version>
                <type>jar</type>
        </dependency>
        <dependency>
index 40b732883c116997edc619eeafbb7623a6c53437..8d04997dabbe5360f29e35d1cc87fb75b468a9f2 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="jgit-4.31" sequenceNumber="1708437928">
+<target name="jgit-4.31" sequenceNumber="1708444933">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
        <dependency>
                <groupId>org.apache.commons</groupId>
                <artifactId>commons-compress</artifactId>
-               <version>1.25.0</version>
+               <version>1.26.0</version>
+               <type>jar</type>
+       </dependency>
+       <dependency>
+               <groupId>commons-io</groupId>
+               <artifactId>commons-io</artifactId>
+               <version>2.15.1</version>
                <type>jar</type>
        </dependency>
        <dependency>
index 45edf5d342473cec679d29a865664fc14bf1f773..f07d4efc9f417217fbf409f4e7f657edae6f6231 100644 (file)
@@ -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"
index 539d666883ebbf0ae30b96db2e9fc2f73e5079fa..b8ffa695940259642173e905529f0ba17aab0276 100644 (file)
@@ -15,6 +15,7 @@ junit_tests(
     deps = [
         ":helpers",
         "//lib:args4j",
+        "//lib:commons-io",
         "//lib:commons-compress",
         "//lib:javaewah",
         "//lib:junit",
index bb15de0b2d8614aa67428d896b9d016c7f43220b..29f5b3614966c03e1dfa8a26aa6c192567514b4b 100644 (file)
@@ -78,6 +78,7 @@ java_library(
     deps = [
         "//lib:assertj-core",
         "//lib:commons-codec",
+        "//lib:commons-io",
         "//lib:junit",
         "//lib:mockito",
         "//lib:slf4j-simple",
index 374a82c8b8f2ebf67d7903ab8bd854a59b5a50c2..d6468c6b69b0175f7875c19f1adcebf7699d348c 100644 (file)
@@ -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 91adcb3f899a95030e3fa25850fd7a7bee914095..cffb8529c0d824432f8f2d8f11e0362905fdf536 100644 (file)
--- a/pom.xml
+++ b/pom.xml
     <junit-version>4.13.2</junit-version>
     <test-fork-count>1C</test-fork-count>
     <args4j-version>2.33</args4j-version>
-    <commons-compress-version>1.25.0</commons-compress-version>
+    <commons-compress-version>1.26.0</commons-compress-version>
     <osgi-core-version>6.0.0</osgi-core-version>
     <servlet-api-version>4.0.4</servlet-api-version>
     <jetty-version>10.0.18</jetty-version>