From bbeab2ba27f14aca85e2b209ccac6fa9e782d213 Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Wed, 1 Nov 2023 13:47:48 +0700
Subject: [PATCH] IDEMPIERE-5895:use maven for bundle from p2 repository
 eclipse 4.20 (#2077)

---
 .../maven.locations.xml                         | 12 ++++++++++++
 .../org.idempiere.p2.targetplatform.target      | 17 ++++++++++++-----
 .../org.idempiere.p2.targetplatform.tpd         |  6 ------
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/org.idempiere.p2.targetplatform/maven.locations.xml b/org.idempiere.p2.targetplatform/maven.locations.xml
index 9b47a0e289..0857a27b5d 100644
--- a/org.idempiere.p2.targetplatform/maven.locations.xml
+++ b/org.idempiere.p2.targetplatform/maven.locations.xml
@@ -1484,4 +1484,16 @@ Export-Package:        *;version="${version}";-noimport:=true
 	    <version>1.9.1</version>
 		<type>jar</type>
 	</location>
+	<location includeSource="true" missingManifest="error" type="Maven">
+		<groupId>org.apache.httpcomponents</groupId>
+	    <artifactId>httpcore-osgi</artifactId>
+	    <version>4.4.14</version>
+		<type>jar</type>
+	</location>
+	<location includeSource="true" missingManifest="error" type="Maven">
+	 	<groupId>org.apache.httpcomponents</groupId>
+	    <artifactId>httpclient-osgi</artifactId>
+	    <version>4.5.13</version>
+		<type>jar</type>
+	</location>
 </locations>
diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
index b0f68f31c9..339a809f11 100644
--- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
+++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
@@ -27,11 +27,6 @@
       <unit id="org.apache.poi.ooxml-schemas" version="4.1.2.v202109010034"/>
       <repository id="repackaged" location="https://idempiere.github.io/binary.file/p2.repackaged/9.0.0"/>
     </location>
-    <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <unit id="org.apache.httpcomponents.httpclient" version="4.5.13.v20210128-2225"/>
-      <unit id="org.apache.httpcomponents.httpcore" version="4.4.14.v20210128-2225"/>
-      <repository id="eclipse" location="https://download.eclipse.org/eclipse/updates/4.20"/>
-    </location>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.osgi" version="3.18.300.v20230220-1352"/>
       <unit id="org.osgi.annotation.bundle" version="2.0.0.202202082230"/>
@@ -1635,5 +1630,17 @@ Export-Package:        *;version="${version}";-noimport:=true
 	    <version>1.9.1</version>
 		<type>jar</type>
 	</location>
+	<location includeSource="true" missingManifest="error" type="Maven">
+		<groupId>org.apache.httpcomponents</groupId>
+	    <artifactId>httpcore-osgi</artifactId>
+	    <version>4.4.14</version>
+		<type>jar</type>
+	</location>
+	<location includeSource="true" missingManifest="error" type="Maven">
+	 	<groupId>org.apache.httpcomponents</groupId>
+	    <artifactId>httpclient-osgi</artifactId>
+	    <version>4.5.13</version>
+		<type>jar</type>
+	</location>
   </locations>
 </target>
diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.tpd b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.tpd
index adb874e65a..4977d90334 100644
--- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.tpd
+++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.tpd
@@ -26,12 +26,6 @@ location repackaged "https://idempiere.github.io/binary.file/p2.repackaged/9.0.0
 	org.apache.poi.ooxml-schemas	
 }
 
-location eclipse "https://download.eclipse.org/eclipse/updates/4.20" {
-	//dependency for com.google.http-client.google-http-client
-	org.apache.httpcomponents.httpclient
-	org.apache.httpcomponents.httpcore
-}
-
 location eclipse-2023-03 "https://download.eclipse.org/eclipse/updates/4.27" {
 	// equinox core framework
 	org.eclipse.osgi