From ee2143f74449f2a95320231eece26a2494fdb0e3 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 1 May 2023 11:38:36 +0200 Subject: [PATCH] Update javaEWAH to 1.2.3 and use it directly from Maven central This changes its BundleSymbolicName from "javaewah" (name in Orbit) to com.googlecode.javaewah.JavaEWAH (name in upstream artefact from Maven Central). Change-Id: I8dee6909d496e3d05b2de938515dde831518be24 --- 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 | 13 +++++++++++++ .../orbit/R20230302014618-2023-03.tpd | 2 -- pom.xml | 2 +- 15 files changed, 128 insertions(+), 37 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 81358dcbc..c40cd9249 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -74,8 +74,8 @@ maven_jar( maven_jar( name = "javaewah", - artifact = "com.googlecode.javaewah:JavaEWAH:1.1.13", - sha1 = "32cd724a42dc73f99ca08453d11a4bb83e0034c7", + artifact = "com.googlecode.javaewah:JavaEWAH:1.2.3", + sha1 = "13a27c856e0c8808cee9a64032c58eee11c3adc9", ) 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 3e4ce59ec..39093220d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml @@ -69,10 +69,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 d1b88a753..c6f29d34b 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 @@ - - @@ -118,6 +116,16 @@ + + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + 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 2b67f6f87..c4cd20874 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 @@ - - @@ -118,6 +116,16 @@ + + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + 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 c728eb912..a800e6a9c 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 @@ - - @@ -118,6 +116,16 @@ + + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + 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 8ca2e0bdc..181d1badb 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 @@ - - @@ -118,6 +116,16 @@ + + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + 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 da2ebda04..e73f45888 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 @@ - - @@ -118,6 +116,16 @@ + + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + 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 eecf70024..1150eb10d 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 @@ - - @@ -118,6 +116,16 @@ + + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + 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 34f050854..197ca2cd3 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 @@ - - @@ -118,6 +116,16 @@ + + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + 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 d187546b3..e0c122f8e 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 @@ - - @@ -118,6 +116,16 @@ + + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + 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 bc1fe3f35..7c09b8d41 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 @@ - - @@ -118,6 +116,16 @@ + + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + 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 a79fa1d3a..8ddf39d3f 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 @@ - - @@ -118,6 +116,16 @@ + + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + 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 e70b6709f..6dcd8f311 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 @@ -28,6 +28,19 @@ maven bouncycastle } } +maven javaewah + scope = compile + dependencyDepth = none + missingManifest = error + includeSources +{ + dependency { + groupId = "com.googlecode.javaewah" + artifactId = "JavaEWAH" + version = "1.2.3" + } +} + maven jetty 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 3712d0af0..445b93df0 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 com.sun.jna.source [5.12.1.v20221103-2317,5.12.1.v20221103-2317] com.sun.jna.platform [5.12.1.v20221103-2317,5.12.1.v20221103-2317] com.sun.jna.platform.source [5.12.1.v20221103-2317,5.12.1.v20221103-2317] - javaewah [1.1.13.v20211029-0839,1.1.13.v20211029-0839] - javaewah.source [1.1.13.v20211029-0839,1.1.13.v20211029-0839] net.bytebuddy.byte-buddy [1.12.18.v20221114-2102,1.12.18.v20221114-2102] net.bytebuddy.byte-buddy.source [1.12.18.v20221114-2102,1.12.18.v20221114-2102] net.bytebuddy.byte-buddy-agent [1.12.18.v20221114-2102,1.12.18.v20221114-2102] diff --git a/pom.xml b/pom.xml index ead2f0b79..3feeb3f2a 100644 --- a/pom.xml +++ b/pom.xml @@ -155,7 +155,7 @@ 2.9.2 0.1.55 1.1.3 - 1.1.13 + 1.2.3 4.13.2 1C 2.33