From 32d4d189f97e8947335267adecd8a2913467c4d6 Mon Sep 17 00:00:00 2001 From: hieplq Date: Mon, 4 Mar 2019 04:46:08 +0700 Subject: [PATCH] IDEMPIERE-3908:webservice client example fix to can build with maven --- .../server.product.launch | 4 +-- .../org.idempiere.maven.to.p2/pom.xml | 25 +++++++++++++++---- .../org.idempiere.p2.targetplatform.target | 5 ++-- .../feature.xml | 3 ++- .../pom.xml | 2 +- 5 files changed, 27 insertions(+), 12 deletions(-) diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch index bba06d14f1..86b30192e8 100644 --- a/org.adempiere.server-feature/server.product.launch +++ b/org.adempiere.server-feature/server.product.launch @@ -27,8 +27,8 @@ - - + + diff --git a/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml b/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml index 337367352a..71f1099bfe 100644 --- a/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml +++ b/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml @@ -439,11 +439,6 @@ true false - - com.sun.xml.bind:jaxb-core:jar:2.3.0.1 - true - false - com.sun.xml.bind:jaxb-impl:jar:${xml.ws.version} true @@ -1754,6 +1749,26 @@ true + + + download-sun-package + package + + wget + + + ${url.file.srv}/extra.jar/com.diffplug.osgi.extension.sun.misc_0.0.0.jar + false + com.diffplug.osgi.extension.sun.misc_0.0.0.jar + ${project.build.directory}/repository/plugins + 5 + true + true + + diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target index 6b66fec459..0629838e54 100644 --- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target +++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target @@ -935,6 +935,7 @@ + @@ -979,8 +980,6 @@ - - @@ -1349,7 +1348,7 @@ - + diff --git a/org.idempiere.webservices.client-feature/feature.xml b/org.idempiere.webservices.client-feature/feature.xml index c25b2ab790..80bcf6432c 100644 --- a/org.idempiere.webservices.client-feature/feature.xml +++ b/org.idempiere.webservices.client-feature/feature.xml @@ -165,10 +165,11 @@ unpack="false"/> diff --git a/org.idempiere.webservices.client-feature/pom.xml b/org.idempiere.webservices.client-feature/pom.xml index 9dea7f87bc..7c64e55320 100644 --- a/org.idempiere.webservices.client-feature/pom.xml +++ b/org.idempiere.webservices.client-feature/pom.xml @@ -6,6 +6,6 @@ 6.2.0-SNAPSHOT ../org.idempiere.parent/pom.xml - org.idempiere.webservices.client-feature + org.idempiere.webservices.client.feature eclipse-feature \ No newline at end of file