From 4562e79e234696ae3e1601db9bf8b73a1ef7edf8 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 16 May 2023 02:06:10 +0200 Subject: [PATCH] Use hamcrest 2.2 directly from Maven Central Change-Id: I4039b56b1cdc54ff1886c2a4973d857d785989c2 --- .../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 03972ff97c..0d735fe327 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 @@ - + @@ -14,8 +14,6 @@ - - @@ -152,6 +150,16 @@ + + + + org.hamcrest + hamcrest + 2.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 c92ac57eda..0f8cc197d5 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 @@ - + @@ -14,8 +14,6 @@ - - @@ -152,6 +150,16 @@ + + + + org.hamcrest + hamcrest + 2.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 cb01fe3c93..0bc8f116cb 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 @@ - + @@ -14,8 +14,6 @@ - - @@ -152,6 +150,16 @@ + + + + org.hamcrest + hamcrest + 2.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 0d08d0cc93..a65894ceec 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 @@ - + @@ -14,8 +14,6 @@ - - @@ -152,6 +150,16 @@ + + + + org.hamcrest + hamcrest + 2.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 d9ccb700d6..b66c977bd7 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 @@ - + @@ -14,8 +14,6 @@ - - @@ -152,6 +150,16 @@ + + + + org.hamcrest + hamcrest + 2.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 2d2dd8cefe..6692b4f596 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 @@ - + @@ -14,8 +14,6 @@ - - @@ -152,6 +150,16 @@ + + + + org.hamcrest + hamcrest + 2.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 3ba508bccc..5ce07dbba1 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 @@ - + @@ -14,8 +14,6 @@ - - @@ -152,6 +150,16 @@ + + + + org.hamcrest + hamcrest + 2.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 6697232c18..09b8fccaa6 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 @@ - + @@ -14,8 +14,6 @@ - - @@ -152,6 +150,16 @@ + + + + org.hamcrest + hamcrest + 2.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 aff230662f..47f2af56af 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 @@ - + @@ -14,8 +14,6 @@ - - @@ -152,6 +150,16 @@ + + + + org.hamcrest + hamcrest + 2.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 33fb0a6b6d..f3e052535c 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 @@ - + @@ -14,8 +14,6 @@ - - @@ -152,6 +150,16 @@ + + + + org.hamcrest + hamcrest + 2.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 1c6aee5a28..66de83ec80 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 @@ - + @@ -14,8 +14,6 @@ - - @@ -152,6 +150,16 @@ + + + + org.hamcrest + hamcrest + 2.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 baccefecd5..150c051a64 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 @@ - + @@ -14,8 +14,6 @@ - - @@ -152,6 +150,16 @@ + + + + org.hamcrest + hamcrest + 2.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 feb21d67f3..05ba2f972f 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 @@ -122,6 +122,19 @@ maven gson } } +maven hamcrest + scope = compile + dependencyDepth = none + missingManifest = error + includeSources +{ + dependency { + groupId = "org.hamcrest" + artifactId = "hamcrest" + version = "2.2" + } +} + maven javaewah 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 87696a9907..3b85df2778 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 @@ -12,8 +12,6 @@ location "https://download.eclipse.org/tools/orbit/downloads/drops/R202303020146 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] org.apache.httpcomponents.httpcore.source [4.4.16.v20221207-1049,4.4.16.v20221207-1049] - org.hamcrest [2.2.0.v20210711-0821,2.2.0.v20210711-0821] - org.hamcrest.source [2.2.0.v20210711-0821,2.2.0.v20210711-0821] org.hamcrest.core [1.3.0.v20180420-1519,1.3.0.v20180420-1519] org.hamcrest.core.source [1.3.0.v20180420-1519,1.3.0.v20180420-1519] org.hamcrest.library [1.3.0.v20180524-2246,1.3.0.v20180524-2246] -- 2.39.5