From 18cb13c4ef4bcdf3210e932bd9fbb602ddf234fc Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 1 May 2023 17:32:28 +0200 Subject: [PATCH] Update assertj-core to 3.24.2 and consume it directly from Maven Central. Add the bundle to the jgit p2 repository. Change-Id: I95f07a6d3ea645c4f56350d4b0facbaa84988440 --- WORKSPACE | 4 ++-- .../org.eclipse.jgit.repository/category.xml | 3 +++ .../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 | 13 +++++++++++++ .../orbit/R20230302014618-2023-03.tpd | 2 -- pom.xml | 2 +- 15 files changed, 129 insertions(+), 35 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index b7cffdb08..451c17cca 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -184,8 +184,8 @@ maven_jar( maven_jar( name = "assertj-core", - artifact = "org.assertj:assertj-core:3.20.2", - sha1 = "66f1f0ebd6db2b24e4a731979171da16ba919cd5", + artifact = "org.assertj:assertj-core:3.24.2", + sha1 = "ebbf338e33f893139459ce5df023115971c2786f", ) BYTE_BUDDY_VERSION = "1.12.18" 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 3b65d520b..3f0ed6f36 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml @@ -39,6 +39,9 @@ + + + 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 b1bdfaa6b..fbfd44fed 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 @@ - + @@ -32,8 +32,6 @@ - - @@ -150,6 +148,16 @@ + + + + org.assertj + assertj-core + 3.24.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 54431cd6b..886dc5052 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 @@ - + @@ -32,8 +32,6 @@ - - @@ -150,6 +148,16 @@ + + + + org.assertj + assertj-core + 3.24.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 40f2a61dd..a49cd2d69 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 @@ - + @@ -32,8 +32,6 @@ - - @@ -150,6 +148,16 @@ + + + + org.assertj + assertj-core + 3.24.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 02e27379a..e792dc920 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 @@ - + @@ -32,8 +32,6 @@ - - @@ -150,6 +148,16 @@ + + + + org.assertj + assertj-core + 3.24.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 3b9955758..6ce9bef54 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 @@ - + @@ -32,8 +32,6 @@ - - @@ -150,6 +148,16 @@ + + + + org.assertj + assertj-core + 3.24.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 943d21061..4dad5f761 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 @@ - + @@ -32,8 +32,6 @@ - - @@ -150,6 +148,16 @@ + + + + org.assertj + assertj-core + 3.24.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 b6b335505..44ab7e492 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 @@ - + @@ -32,8 +32,6 @@ - - @@ -150,6 +148,16 @@ + + + + org.assertj + assertj-core + 3.24.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 b5e6f9a8f..307575546 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 @@ - + @@ -32,8 +32,6 @@ - - @@ -150,6 +148,16 @@ + + + + org.assertj + assertj-core + 3.24.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 842ee1dbf..f98579f66 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 @@ - + @@ -32,8 +32,6 @@ - - @@ -150,6 +148,16 @@ + + + + org.assertj + assertj-core + 3.24.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 cc2f84320..a5bc0e82b 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 @@ - + @@ -32,8 +32,6 @@ - - @@ -150,6 +148,16 @@ + + + + org.assertj + assertj-core + 3.24.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 42ba270d9..39beb100d 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 assertj + scope = compile + dependencyDepth = none + missingManifest = error + includeSources +{ + dependency { + groupId = "org.assertj" + artifactId = "assertj-core" + version = "3.24.2" + } +} + 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 043eb3c91..137b3e612 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 @@ -30,8 +30,6 @@ location "https://download.eclipse.org/tools/orbit/downloads/drops/R202303020146 org.apache.sshd.osgi.source [2.9.2.v20221117-1942,2.9.2.v20221117-1942] org.apache.sshd.sftp [2.9.2.v20221117-1942,2.9.2.v20221117-1942] org.apache.sshd.sftp.source [2.9.2.v20221117-1942,2.9.2.v20221117-1942] - org.assertj [3.20.2.v20210706-1104,3.20.2.v20210706-1104] - org.assertj.source [3.20.2.v20210706-1104,3.20.2.v20210706-1104] 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] diff --git a/pom.xml b/pom.xml index 060e8b106..b25b3bf40 100644 --- a/pom.xml +++ b/pom.xml @@ -178,7 +178,7 @@ 3.10.1 2.13.0 2.2 - 3.20.2 + 3.24.2 jacoco