From 4aa89daac228154068104eb0487e4eca92d9496a Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 15 May 2023 23:58:25 +0200 Subject: [PATCH] Use args4j directly from Maven Central Change-Id: I91c7c42c1fc779278fe30294638edef182e88347 --- .../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/jgit-4.27.target | 14 +++++++++++--- .../org.eclipse.jgit.target/jgit-4.28.target | 14 +++++++++++--- .../org.eclipse.jgit.target/maven/dependencies.tpd | 13 +++++++++++++ .../orbit/R20230302014618-2023-03.tpd | 2 -- 14 files changed, 145 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 d85225f7e0..005da76f7a 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 @@ - + @@ -34,8 +34,6 @@ - - @@ -190,6 +188,16 @@ + + + + args4j + args4j + 2.33 + 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 acf39e54f0..ee24372409 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 @@ - + @@ -34,8 +34,6 @@ - - @@ -190,6 +188,16 @@ + + + + args4j + args4j + 2.33 + 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 7f3bf74538..7a391cc559 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 @@ - + @@ -34,8 +34,6 @@ - - @@ -190,6 +188,16 @@ + + + + args4j + args4j + 2.33 + 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 9bfa6b09bb..e4714d342f 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 @@ - + @@ -34,8 +34,6 @@ - - @@ -190,6 +188,16 @@ + + + + args4j + args4j + 2.33 + 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 853f00724c..22453dac1a 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 @@ - + @@ -34,8 +34,6 @@ - - @@ -190,6 +188,16 @@ + + + + args4j + args4j + 2.33 + 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 09b76317b2..f3d04fb844 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 @@ - + @@ -34,8 +34,6 @@ - - @@ -190,6 +188,16 @@ + + + + args4j + args4j + 2.33 + 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 5f70cb9d72..685c29a66f 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 @@ - + @@ -34,8 +34,6 @@ - - @@ -190,6 +188,16 @@ + + + + args4j + args4j + 2.33 + 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 df9d46d43d..f5481cbacf 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 @@ - + @@ -34,8 +34,6 @@ - - @@ -190,6 +188,16 @@ + + + + args4j + args4j + 2.33 + 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 dca02f367d..23a2d33cff 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 @@ - + @@ -34,8 +34,6 @@ - - @@ -190,6 +188,16 @@ + + + + args4j + args4j + 2.33 + 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 f09ff8e3fc..d7cad2c6af 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 @@ - + @@ -34,8 +34,6 @@ - - @@ -190,6 +188,16 @@ + + + + args4j + args4j + 2.33 + 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 e0052fd32f..a3017f6b92 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 @@ - + @@ -34,8 +34,6 @@ - - @@ -190,6 +188,16 @@ + + + + args4j + args4j + 2.33 + 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 b11fc141a0..755e3fa203 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 @@ - + @@ -34,8 +34,6 @@ - - @@ -190,6 +188,16 @@ + + + + args4j + args4j + 2.33 + 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 e7b5adde18..3de8cd06e6 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 @@ -19,6 +19,19 @@ maven apache } } +maven args4j + scope = compile + dependencyDepth = none + missingManifest = error + includeSources +{ + dependency { + groupId = "args4j" + artifactId = "args4j" + version = "2.33" + } +} + maven assertj 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 4bcd907445..4ca6e81a83 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 @@ -32,8 +32,6 @@ location "https://download.eclipse.org/tools/orbit/downloads/drops/R202303020146 org.hamcrest.library.source [1.3.0.v20180524-2246,1.3.0.v20180524-2246] org.junit [4.13.2.v20211018-1956,4.13.2.v20211018-1956] org.junit.source [4.13.2.v20211018-1956,4.13.2.v20211018-1956] - org.kohsuke.args4j [2.33.0.v20160323-2218,2.33.0.v20160323-2218] - org.kohsuke.args4j.source [2.33.0.v20160323-2218,2.33.0.v20160323-2218] org.mockito.mockito-core [4.8.1.v20221103-2317,4.8.1.v20221103-2317] org.mockito.mockito-core.source [4.8.1.v20221103-2317,4.8.1.v20221103-2317] org.objenesis [3.3.0.v20221103-2317,3.3.0.v20221103-2317] -- 2.39.5