From d0ca3eb7beaea0634bfa63cb6835845a066db4ab Mon Sep 17 00:00:00 2001 From: hieplq Date: Tue, 5 Mar 2019 11:33:04 +0700 Subject: [PATCH] IDEMPIERE-3908:webservice client example fix conflict of javax.xml.soap from axis https://idempiere.atlassian.net/browse/IDEMPIERE-3908?focusedCommentId=43048&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-43048 --- .../model.generator.launch | 2 +- .../packinfolder.app.launch | 2 +- .../sign.database.build.launch | 2 +- .../synchronize-terminology.app.launch | 2 +- .../translation.app.launch | 2 +- .../server.product.functionaltest.launch | 2 +- .../server.product.launch | 4 ++-- .../feature.xml | 13 ++++++------ .../swingclient.product.launch | 2 +- .../org.idempiere.maven.to.p2/pom.xml | 20 +++++++++++++++++++ .../org.idempiere.p2.targetplatform.target | 3 ++- .../META-INF/MANIFEST.MF | 4 ++-- 12 files changed, 40 insertions(+), 18 deletions(-) diff --git a/org.adempiere.base-feature/model.generator.launch b/org.adempiere.base-feature/model.generator.launch index 92519e6a46..322ef86f9f 100644 --- a/org.adempiere.base-feature/model.generator.launch +++ b/org.adempiere.base-feature/model.generator.launch @@ -27,7 +27,7 @@ - + diff --git a/org.adempiere.base-feature/packinfolder.app.launch b/org.adempiere.base-feature/packinfolder.app.launch index 99cae03665..d870be788e 100644 --- a/org.adempiere.base-feature/packinfolder.app.launch +++ b/org.adempiere.base-feature/packinfolder.app.launch @@ -27,7 +27,7 @@ - + diff --git a/org.adempiere.base-feature/sign.database.build.launch b/org.adempiere.base-feature/sign.database.build.launch index e16fcc8624..4d86177e8e 100644 --- a/org.adempiere.base-feature/sign.database.build.launch +++ b/org.adempiere.base-feature/sign.database.build.launch @@ -27,7 +27,7 @@ - + diff --git a/org.adempiere.base-feature/synchronize-terminology.app.launch b/org.adempiere.base-feature/synchronize-terminology.app.launch index 81c8e223e6..cab1b0d925 100644 --- a/org.adempiere.base-feature/synchronize-terminology.app.launch +++ b/org.adempiere.base-feature/synchronize-terminology.app.launch @@ -27,7 +27,7 @@ - + diff --git a/org.adempiere.base-feature/translation.app.launch b/org.adempiere.base-feature/translation.app.launch index 161f2f3ad9..55bbc36693 100644 --- a/org.adempiere.base-feature/translation.app.launch +++ b/org.adempiere.base-feature/translation.app.launch @@ -27,7 +27,7 @@ - + diff --git a/org.adempiere.server-feature/server.product.functionaltest.launch b/org.adempiere.server-feature/server.product.functionaltest.launch index 50f794609b..529ce5cf21 100644 --- a/org.adempiere.server-feature/server.product.functionaltest.launch +++ b/org.adempiere.server-feature/server.product.functionaltest.launch @@ -27,7 +27,7 @@ - + diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch index b408966498..f5df4ed57f 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.adempiere.target.platform-feature/feature.xml b/org.adempiere.target.platform-feature/feature.xml index f5b54b17f4..00b4497148 100644 --- a/org.adempiere.target.platform-feature/feature.xml +++ b/org.adempiere.target.platform-feature/feature.xml @@ -370,12 +370,6 @@ version="0.0.0" unpack="false"/> - - + + diff --git a/org.adempiere.ui.swing-feature/swingclient.product.launch b/org.adempiere.ui.swing-feature/swingclient.product.launch index 2c4c6e3bd1..2e9c656bd5 100644 --- a/org.adempiere.ui.swing-feature/swingclient.product.launch +++ b/org.adempiere.ui.swing-feature/swingclient.product.launch @@ -27,7 +27,7 @@ - + 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 3b91b718d3..37abad15c7 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 @@ -1763,6 +1763,26 @@ true + + + download-axis + package + + wget + + + ${url.file.srv}/extra.jar/org.apache.axis_1.4.0.v201903052030.jar + false + org.apache.axis_1.4.0.v201903052030.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 73ec2aa70a..013f435439 100644 --- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target +++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target @@ -1,4 +1,4 @@ - + @@ -1300,6 +1300,7 @@ + diff --git a/org.idempiere.webservices/META-INF/MANIFEST.MF b/org.idempiere.webservices/META-INF/MANIFEST.MF index 28db788636..934f31c93e 100644 --- a/org.idempiere.webservices/META-INF/MANIFEST.MF +++ b/org.idempiere.webservices/META-INF/MANIFEST.MF @@ -89,7 +89,6 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0", org.apache.servicemix.bundles.spring-web, org.apache.cxf.cxf-rt-rs-extension-providers;bundle-version="3.1.17", org.apache.axis;bundle-version="1.4.0", - javax.xml.soap;bundle-version="1.3.0", javax.annotation-api;bundle-version="1.3.2", org.glassfish.jersey.core.jersey-common;bundle-version="2.22.1", org.apache.cxf.cxf-rt-rs-service-description;bundle-version="3.2.6", @@ -99,7 +98,8 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0", org.glassfish.hk2.utils;bundle-version="2.5.0", org.glassfish.jersey.bundles.repackaged.jersey-guava;bundle-version="2.22.1", jakarta.ws.rs-api;bundle-version="2.1.5", - jakarta.xml.ws-api;bundle-version="2.3.2" + jakarta.xml.ws-api;bundle-version="2.3.2", + jakarta.xml.soap-api;bundle-version="1.4.1" Bundle-ClassPath: ., WEB-INF/lib/idempiere-xmlbeans.jar Export-Package: org.compiere.model,