IDEMPIERE-5895:use maven for bundle from p2 repository eclipse 4.20 (#2077)

This commit is contained in:
hieplq 2023-11-01 13:47:48 +07:00 committed by GitHub
parent 286ec63012
commit bbeab2ba27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 11 deletions

View File

@ -1484,4 +1484,16 @@ Export-Package: *;version="${version}";-noimport:=true
<version>1.9.1</version> <version>1.9.1</version>
<type>jar</type> <type>jar</type>
</location> </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> </locations>

View File

@ -27,11 +27,6 @@
<unit id="org.apache.poi.ooxml-schemas" version="4.1.2.v202109010034"/> <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"/> <repository id="repackaged" location="https://idempiere.github.io/binary.file/p2.repackaged/9.0.0"/>
</location> </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"> <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.eclipse.osgi" version="3.18.300.v20230220-1352"/>
<unit id="org.osgi.annotation.bundle" version="2.0.0.202202082230"/> <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> <version>1.9.1</version>
<type>jar</type> <type>jar</type>
</location> </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> </locations>
</target> </target>

View File

@ -26,12 +26,6 @@ location repackaged "https://idempiere.github.io/binary.file/p2.repackaged/9.0.0
org.apache.poi.ooxml-schemas 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" { location eclipse-2023-03 "https://download.eclipse.org/eclipse/updates/4.27" {
// equinox core framework // equinox core framework
org.eclipse.osgi org.eclipse.osgi