From 6890b8ffa8b47098ab019625e1eff58679ee01b9 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 1 May 2023 14:58:23 +0200 Subject: [PATCH] Update org.apache.commons:commons-compress to 1.23.0 and consume it directly from Maven Central. Its BundleSymbolicName changes to "org.apache.commons.commons-compress" which is defined upstream. Change-Id: I691f5f49491dd2c9ba577ebe0c6f7cdd462c047a --- WORKSPACE | 4 ++-- .../org.eclipse.jgit.repository/category.xml | 4 ++-- .../org.eclipse.jgit.target/jgit-4.17.target | 14 +++++++++++--- .../org.eclipse.jgit.target/jgit-4.18.target | 14 +++++++++++--- .../org.eclipse.jgit.target/jgit-4.19.target | 14 +++++++++++--- .../org.eclipse.jgit.target/jgit-4.20.target | 14 +++++++++++--- .../org.eclipse.jgit.target/jgit-4.21.target | 14 +++++++++++--- .../org.eclipse.jgit.target/jgit-4.22.target | 14 +++++++++++--- .../org.eclipse.jgit.target/jgit-4.23.target | 14 +++++++++++--- .../org.eclipse.jgit.target/jgit-4.24.target | 14 +++++++++++--- .../org.eclipse.jgit.target/jgit-4.25.target | 14 +++++++++++--- .../org.eclipse.jgit.target/jgit-4.26.target | 14 +++++++++++--- .../org.eclipse.jgit.target/maven/dependencies.tpd | 14 ++++++++++++++ .../orbit/R20230302014618-2023-03.tpd | 2 -- pom.xml | 2 +- 15 files changed, 129 insertions(+), 37 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index c40cd9249..a7a952724 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -148,8 +148,8 @@ maven_jar( maven_jar( name = "commons-compress", - artifact = "org.apache.commons:commons-compress:1.22", - sha1 = "691a8b4e6cf4248c3bc72c8b719337d5cb7359fa", + artifact = "org.apache.commons:commons-compress:1.23.0", + sha1 = "4af2060ea9b0c8b74f1854c6cafe4d43cfc161fc", ) maven_jar( diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml index 39093220d..dc2a39b25 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml @@ -141,10 +141,10 @@ - + - + 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 c6f29d34b..d99a36383 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 @@ - + @@ -24,8 +24,6 @@ - - @@ -154,5 +152,15 @@ + + + + org.apache.commons + commons-compress + 1.23.0 + 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 c4cd20874..3c1e2cf6b 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 @@ - + @@ -24,8 +24,6 @@ - - @@ -154,5 +152,15 @@ + + + + org.apache.commons + commons-compress + 1.23.0 + 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 a800e6a9c..e18fce6ca 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 @@ - + @@ -24,8 +24,6 @@ - - @@ -154,5 +152,15 @@ + + + + org.apache.commons + commons-compress + 1.23.0 + 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 181d1badb..182882572 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 @@ - + @@ -24,8 +24,6 @@ - - @@ -154,5 +152,15 @@ + + + + org.apache.commons + commons-compress + 1.23.0 + 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 e73f45888..3a3a9d205 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 @@ - + @@ -24,8 +24,6 @@ - - @@ -154,5 +152,15 @@ + + + + org.apache.commons + commons-compress + 1.23.0 + 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 1150eb10d..4db2902a9 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 @@ - + @@ -24,8 +24,6 @@ - - @@ -154,5 +152,15 @@ + + + + org.apache.commons + commons-compress + 1.23.0 + 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 197ca2cd3..d010a378a 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 @@ - + @@ -24,8 +24,6 @@ - - @@ -154,5 +152,15 @@ + + + + org.apache.commons + commons-compress + 1.23.0 + 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 e0c122f8e..a19438644 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 @@ - + @@ -24,8 +24,6 @@ - - @@ -154,5 +152,15 @@ + + + + org.apache.commons + commons-compress + 1.23.0 + 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 7c09b8d41..55f54dc57 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 @@ - + @@ -24,8 +24,6 @@ - - @@ -154,5 +152,15 @@ + + + + org.apache.commons + commons-compress + 1.23.0 + 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 8ddf39d3f..b39f54f10 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 @@ - + @@ -24,8 +24,6 @@ - - @@ -154,5 +152,15 @@ + + + + org.apache.commons + commons-compress + 1.23.0 + 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 6dcd8f311..69f3aff64 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 @@ -1,5 +1,19 @@ target "dependencies" + +maven apache + scope = compile + dependencyDepth = none + missingManifest = error + includeSources +{ + dependency { + groupId = "org.apache.commons" + artifactId = "commons-compress" + version = "1.23.0" + } +} + maven bouncycastle scope = compile dependencyDepth = none diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20230302014618-2023-03.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20230302014618-2023-03.tpd index 445b93df0..bd5f15251 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20230302014618-2023-03.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20230302014618-2023-03.tpd @@ -22,8 +22,6 @@ location "https://download.eclipse.org/tools/orbit/downloads/drops/R202303020146 org.apache.ant.source [1.10.12.v20211102-1452,1.10.12.v20211102-1452] org.apache.commons.codec [1.14.0.v20221112-0806,1.14.0.v20221112-0806] org.apache.commons.codec.source [1.14.0.v20221112-0806,1.14.0.v20221112-0806] - org.apache.commons.compress [1.22.0.v20221207-1049,1.22.0.v20221207-1049] - org.apache.commons.compress.source [1.22.0.v20221207-1049,1.22.0.v20221207-1049] org.apache.commons.logging [1.2.0.v20180409-1502,1.2.0.v20180409-1502] org.apache.commons.logging.source [1.2.0.v20180409-1502,1.2.0.v20180409-1502] org.apache.httpcomponents.httpclient [4.5.14.v20221207-1049,4.5.14.v20221207-1049] diff --git a/pom.xml b/pom.xml index 3feeb3f2a..060e8b106 100644 --- a/pom.xml +++ b/pom.xml @@ -159,7 +159,7 @@ 4.13.2 1C 2.33 - 1.22 + 1.23.0 6.0.0 4.0.4 10.0.15