From 04ca81308f8544093906b41ed03440b8048c6d44 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 16 May 2023 02:01:14 +0200 Subject: [PATCH] Use commons-logging directly from Maven Central Change-Id: I08e51450f70f941761539d3f08dd65c5d706dcdc --- .../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/maven/dependencies.tpd | 5 +++++ .../orbit/R20230302014618-2023-03.tpd | 2 -- 14 files changed, 89 insertions(+), 38 deletions(-) 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 7d2765171..03972ff97 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 @@ - + @@ -10,8 +10,6 @@ - - @@ -252,6 +250,12 @@ 1.23.0 jar + + commons-logging + commons-logging + 1.2 + 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 af8e52ee3..c92ac57ed 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 @@ - + @@ -10,8 +10,6 @@ - - @@ -252,6 +250,12 @@ 1.23.0 jar + + commons-logging + commons-logging + 1.2 + 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 ed1b780ee..cb01fe3c9 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 @@ - + @@ -10,8 +10,6 @@ - - @@ -252,6 +250,12 @@ 1.23.0 jar + + commons-logging + commons-logging + 1.2 + 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 a3ac4cfd6..0d08d0cc9 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 @@ - + @@ -10,8 +10,6 @@ - - @@ -252,6 +250,12 @@ 1.23.0 jar + + commons-logging + commons-logging + 1.2 + 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 9db774699..d9ccb700d 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 @@ - + @@ -10,8 +10,6 @@ - - @@ -252,6 +250,12 @@ 1.23.0 jar + + commons-logging + commons-logging + 1.2 + 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 ae9c93db2..2d2dd8cef 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 @@ - + @@ -10,8 +10,6 @@ - - @@ -252,6 +250,12 @@ 1.23.0 jar + + commons-logging + commons-logging + 1.2 + 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 7aad23888..3ba508bcc 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 @@ - + @@ -10,8 +10,6 @@ - - @@ -252,6 +250,12 @@ 1.23.0 jar + + commons-logging + commons-logging + 1.2 + 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 dfa539d35..6697232c1 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 @@ - + @@ -10,8 +10,6 @@ - - @@ -252,6 +250,12 @@ 1.23.0 jar + + commons-logging + commons-logging + 1.2 + 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 54b1b9fe2..aff230662 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 @@ - + @@ -10,8 +10,6 @@ - - @@ -252,6 +250,12 @@ 1.23.0 jar + + commons-logging + commons-logging + 1.2 + 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 1a294f2f9..33fb0a6b6 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 @@ - + @@ -10,8 +10,6 @@ - - @@ -252,6 +250,12 @@ 1.23.0 jar + + commons-logging + commons-logging + 1.2 + 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 600aa67b4..1c6aee5a2 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 @@ - + @@ -10,8 +10,6 @@ - - @@ -252,6 +250,12 @@ 1.23.0 jar + + commons-logging + commons-logging + 1.2 + 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 ff14ae97a..baccefecd 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 @@ - + @@ -10,8 +10,6 @@ - - @@ -252,6 +250,12 @@ 1.23.0 jar + + commons-logging + commons-logging + 1.2 + 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 27f01cd35..feb21d67f 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 @@ -17,6 +17,11 @@ maven apache artifactId = "commons-compress" version = "1.23.0" } + dependency { + groupId = "commons-logging" + artifactId = "commons-logging" + version = "1.2" + } } maven args4j 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 b3eec3662..87696a990 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 @@ -8,8 +8,6 @@ location "https://download.eclipse.org/tools/orbit/downloads/drops/R202303020146 com.jcraft.jzlib.source [1.1.3.v20220502-1820,1.1.3.v20220502-1820] org.apache.ant [1.10.12.v20211102-1452,1.10.12.v20211102-1452] org.apache.ant.source [1.10.12.v20211102-1452,1.10.12.v20211102-1452] - 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] org.apache.httpcomponents.httpclient.source [4.5.14.v20221207-1049,4.5.14.v20221207-1049] org.apache.httpcomponents.httpcore [4.4.16.v20221207-1049,4.4.16.v20221207-1049]