From 137dbb3c6ffbed63fd16bc7d231bf4722eb7b24e Mon Sep 17 00:00:00 2001
From: Matthias Sohn <matthias.sohn@sap.com>
Date: Mon, 1 May 2023 11:39:32 +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: I71b77af9f87d6d83d36276069aac61cc3cd12d17
---
 org.eclipse.egit.repository/category.xml                  |  4 ++--
 org.eclipse.egit.target/egit-4.26.target                  | 14 +++++++++++---
 org.eclipse.egit.target/maven/dependencies.tpd            | 13 +++++++++++++
 org.eclipse.egit.target/orbit/R20230302014618-2023-03.tpd |  2 --
 4 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/org.eclipse.egit.repository/category.xml b/org.eclipse.egit.repository/category.xml
index e58acbe16..3ea9f8d98 100644
--- a/org.eclipse.egit.repository/category.xml
+++ b/org.eclipse.egit.repository/category.xml
@@ -108,10 +108,10 @@
    <bundle id="org.apache.commons.logging.source">
       <category name="EGit.dependencies"/>
    </bundle>
-   <bundle id="javaewah">
+   <bundle id="com.googlecode.javaewah.JavaEWAH">
       <category name="EGit.dependencies"/>
    </bundle>
-   <bundle id="javaewah.source">
+   <bundle id="com.googlecode.javaewah.JavaEWAH.source">
       <category name="EGit.dependencies"/>
    </bundle>
    <bundle id="bcpg">
diff --git a/org.eclipse.egit.target/egit-4.26.target b/org.eclipse.egit.target/egit-4.26.target
index caf9c4e5a..9be9adc84 100644
--- a/org.eclipse.egit.target/egit-4.26.target
+++ b/org.eclipse.egit.target/egit-4.26.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="egit-4.26" sequenceNumber="1682773064">
+<target name="egit-4.26" sequenceNumber="1682933715">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
@@ -24,8 +24,6 @@
       <unit id="com.sun.jna.source" version="5.12.1.v20221103-2317"/>
       <unit id="com.sun.jna.platform" version="5.12.1.v20221103-2317"/>
       <unit id="com.sun.jna.platform.source" version="5.12.1.v20221103-2317"/>
-      <unit id="javaewah" version="1.1.13.v20211029-0839"/>
-      <unit id="javaewah.source" version="1.1.13.v20211029-0839"/>
       <unit id="jakarta.activation" version="1.2.2.v20221203-1659"/>
       <unit id="jakarta.activation.source" version="1.2.2.v20221203-1659"/>
       <unit id="jakarta.xml.bind" version="2.3.3.v20221203-1659"/>
@@ -164,6 +162,16 @@
     	</dependency>
     </dependencies>
     </location>
+    <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="javaewah">
+    <dependencies>
+    	<dependency>
+    		<groupId>com.googlecode.javaewah</groupId>
+    		<artifactId>JavaEWAH</artifactId>
+    		<version>1.2.3</version>
+    		<type>jar</type>
+    	</dependency>
+    </dependencies>
+    </location>
     <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="bouncycastle">
     <dependencies>
     	<dependency>
diff --git a/org.eclipse.egit.target/maven/dependencies.tpd b/org.eclipse.egit.target/maven/dependencies.tpd
index e70b6709f..6dcd8f311 100644
--- a/org.eclipse.egit.target/maven/dependencies.tpd
+++ b/org.eclipse.egit.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.egit.target/orbit/R20230302014618-2023-03.tpd b/org.eclipse.egit.target/orbit/R20230302014618-2023-03.tpd
index 0021e4138..2d65049b9 100644
--- a/org.eclipse.egit.target/orbit/R20230302014618-2023-03.tpd
+++ b/org.eclipse.egit.target/orbit/R20230302014618-2023-03.tpd
@@ -13,8 +13,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]
 	jakarta.activation [1.2.2.v20221203-1659,1.2.2.v20221203-1659]
 	jakarta.activation.source [1.2.2.v20221203-1659,1.2.2.v20221203-1659]
 	jakarta.xml.bind [2.3.3.v20221203-1659,2.3.3.v20221203-1659]
-- 
2.11.4.GIT