From 23530a00e2c3c0c031a918b65d078d8d2de16b11 Mon Sep 17 00:00:00 2001 From: hieplq Date: Mon, 29 Oct 2018 21:28:53 +0700 Subject: [PATCH] IDEMPIERE-3798:Move iDempiere default branch to openjdk 10 (web service) use osgi version --- org.adempiere.base-feature/feature.xml | 14 +- org.adempiere.server-feature/feature.xml | 7 + .../feature.xml | 81 ++++++-- .../org.idempiere.maven.to.p2/pom.xml | 70 +++++++ .../org.idempiere.p2.targetplatform.target | 181 ++++++++++-------- org.idempiere.webservices/.classpath | 3 - .../META-INF/MANIFEST.MF | 130 ++----------- org.idempiere.webservices/build.properties | 5 +- org.idempiere.webservices/pom.xml | 40 ---- 9 files changed, 271 insertions(+), 260 deletions(-) diff --git a/org.adempiere.base-feature/feature.xml b/org.adempiere.base-feature/feature.xml index e867789674..cc7a8d75f0 100644 --- a/org.adempiere.base-feature/feature.xml +++ b/org.adempiere.base-feature/feature.xml @@ -499,13 +499,6 @@ fragment="true" unpack="false"/> - - + + diff --git a/org.adempiere.server-feature/feature.xml b/org.adempiere.server-feature/feature.xml index 1732f20332..8b5116ae38 100644 --- a/org.adempiere.server-feature/feature.xml +++ b/org.adempiere.server-feature/feature.xml @@ -533,4 +533,11 @@ version="0.0.0" unpack="false"/> + + diff --git a/org.adempiere.target.platform-feature/feature.xml b/org.adempiere.target.platform-feature/feature.xml index 3908e78e97..8e69e34d29 100644 --- a/org.adempiere.target.platform-feature/feature.xml +++ b/org.adempiere.target.platform-feature/feature.xml @@ -260,20 +260,6 @@ version="0.0.0" unpack="false"/> - - - - + + + + + + + + + + + + + + + + + + + + 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 bb33ce8758..a4273a355e 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 @@ -96,6 +96,11 @@ true false + + org.eclipse.jetty:jetty-continuation:jar:${jetty.version} + true + false + org.eclipse.jdt:org.eclipse.jdt.core:jar:${jdtVersion} @@ -471,6 +476,11 @@ true false + + org.apache.cxf:cxf-rt-transports-http-jetty:${apache.cxf.version} + true + false + org.apache.cxf:cxf-rt-bindings-soap:jar:${apache.cxf.version} true @@ -491,11 +501,71 @@ true false + + org.apache.cxf:cxf-spring-boot-autoconfigure:jar:${apache.cxf.version} + true + false + + + org.apache.cxf:cxf-rt-rs-http-sci:jar:${apache.cxf.version} + true + false + org.apache.cxf:cxf-rt-databinding-jaxb:jar:${apache.cxf.version} true false + + org.apache.cxf:cxf-rt-ws-addr:jar:${apache.cxf.version} + true + false + + + org.apache.cxf:cxf-rt-ws-policy:jar:${apache.cxf.version} + true + false + + + org.apache.cxf:cxf-rt-rs-extension-providers:jar:${apache.cxf.version} + true + false + + + org.apache.cxf:cxf-rt-rs-service-description:jar:${apache.cxf.version} + true + false + + + org.apache.cxf:cxf-rt-management:jar:${apache.cxf.version} + true + false + + + org.apache.cxf:cxf-rt-ws-transfer:jar:${apache.cxf.version} + true + false + + + org.apache.cxf:cxf-rt-databinding-xmlbeans:jar:3.1.17 + true + false + + + org.apache.cxf:cxf-rt-bindings-object:jar:3.1.17 + true + false + + + org.apache.xmlbeans:xmlbeans:jar:3.0.1 + true + false + + + org.apache.servicemix.bundles:org.apache.servicemix.bundles.wsdl4j:jar:1.6.3_1 + true + false + org.apache.neethi:neethi:jar:3.1.1 true diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target index 05a1a5ea71..c61a3349e0 100644 --- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target +++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target @@ -764,14 +764,6 @@ - - - - - - - - @@ -800,12 +792,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - @@ -862,8 +924,6 @@ - - @@ -880,10 +940,6 @@ - - - - @@ -894,54 +950,54 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -956,16 +1012,10 @@ - - - - - - - - + + @@ -976,7 +1026,7 @@ - + @@ -989,13 +1039,12 @@ + + - - - @@ -1003,8 +1052,12 @@ + + + + @@ -1017,42 +1070,14 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/org.idempiere.webservices/.classpath b/org.idempiere.webservices/.classpath index 8d0ff468ec..83a96b9803 100644 --- a/org.idempiere.webservices/.classpath +++ b/org.idempiere.webservices/.classpath @@ -7,9 +7,6 @@ - - - diff --git a/org.idempiere.webservices/META-INF/MANIFEST.MF b/org.idempiere.webservices/META-INF/MANIFEST.MF index 7e7aca32d8..cb398ab5be 100644 --- a/org.idempiere.webservices/META-INF/MANIFEST.MF +++ b/org.idempiere.webservices/META-INF/MANIFEST.MF @@ -12,13 +12,6 @@ Import-Package: javax.activation, javax.mail.internet;version="1.5", javax.servlet;version="3.0.0", javax.servlet.http;version="3.0.0", - javax.xml.rpc, - javax.xml.rpc.encoding, - javax.xml.rpc.handler, - javax.xml.rpc.handler.soap, - javax.xml.rpc.holders, - javax.xml.rpc.server, - javax.xml.rpc.soap, net.sf.jasperreports.engine, net.sf.jasperreports.engine.base, net.sf.jasperreports.engine.util, @@ -78,8 +71,6 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0", org.apache.cxf.cxf-rt-transports-http;bundle-version="3.2.6", org.apache.cxf.cxf-rt-wsdl;bundle-version="3.2.6", jaxws-api;bundle-version="0.0.0", - javax.jws-api;bundle-version="1.1.0", - javax.xml.soap-api;bundle-version="1.4.0", org.springframework.aop;bundle-version="3.1.4", org.springframework.beans;bundle-version="3.1.4", org.springframework.core;bundle-version="3.1.4", @@ -90,112 +81,23 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0", org.springframework.web;bundle-version="3.1.4", org.springframework.asm;bundle-version="3.1.4", org.springframework.context;bundle-version="3.1.4", - org.aopalliance;bundle-version="1.0.0" + org.aopalliance;bundle-version="1.0.0", + org.apache.xml.resolver;bundle-version="1.2.0", + org.apache.cxf.cxf-rt-transports-http-jetty;bundle-version="3.2.6", + org.apache.cxf.cxf-rt-ws-addr;bundle-version="3.2.6", + org.apache.cxf.cxf-rt-ws-policy;bundle-version="3.2.6", + javax.wsdl;bundle-version="1.6.2", + org.apache.axis;bundle-version="1.4.0", + javax.xml.soap;bundle-version="1.3.0", + javax.xml.rpc;bundle-version="1.1.0", + org.apache.cxf.cxf-rt-databinding-xmlbeans;bundle-version="3.1.17", + org.apache.xmlbeans;bundle-version="3.0.1", + javax.jws;bundle-version="2.0.0", + org.apache.cxf.cxf-rt-rs-extension-providers;bundle-version="3.2.6", + javax.ws.rs-api;bundle-version="2.1.99" Bundle-ClassPath: ., - WEB-INF/lib/aopalliance.jar, - WEB-INF/lib/axis.jar, - WEB-INF/lib/idempiere-xmlbeans.jar, - WEB-INF/lib/xmlbeans.jar -Export-Package: org.apache.axis, - org.apache.axis.attachments, - org.apache.axis.client, - org.apache.axis.client.async, - org.apache.axis.collections, - org.apache.axis.components.compiler, - org.apache.axis.components.encoding, - org.apache.axis.components.image, - org.apache.axis.components.jms, - org.apache.axis.components.logger, - org.apache.axis.components.net, - org.apache.axis.components.script, - org.apache.axis.components.threadpool, - org.apache.axis.components.uuid, - org.apache.axis.configuration, - org.apache.axis.constants, - org.apache.axis.deployment.wsdd, - org.apache.axis.deployment.wsdd.providers, - org.apache.axis.description, - org.apache.axis.encoding, - org.apache.axis.encoding.ser, - org.apache.axis.encoding.ser.castor, - org.apache.axis.handlers, - org.apache.axis.handlers.http, - org.apache.axis.handlers.soap, - org.apache.axis.holders, - org.apache.axis.i18n, - org.apache.axis.management, - org.apache.axis.management.jmx, - org.apache.axis.message, - org.apache.axis.monitor, - org.apache.axis.providers, - org.apache.axis.providers.java, - org.apache.axis.schema, - org.apache.axis.security, - org.apache.axis.security.servlet, - org.apache.axis.security.simple, - org.apache.axis.server, - org.apache.axis.session, - org.apache.axis.soap, - org.apache.axis.strategies, - org.apache.axis.transport.http, - org.apache.axis.transport.java, - org.apache.axis.transport.jms, - org.apache.axis.transport.local, - org.apache.axis.transport.mail, - org.apache.axis.types, - org.apache.axis.utils, - org.apache.axis.utils.bytecode, - org.apache.axis.utils.cache, - org.apache.axis.wsdl, - org.apache.axis.wsdl.fromJava, - org.apache.axis.wsdl.gen, - org.apache.axis.wsdl.symbolTable, - org.apache.axis.wsdl.toJava, - org.apache.xmlbeans, - org.apache.xmlbeans.impl.common, - org.apache.xmlbeans.impl.config, - org.apache.xmlbeans.impl.inst2xsd, - org.apache.xmlbeans.impl.inst2xsd.util, - org.apache.xmlbeans.impl.jam, - org.apache.xmlbeans.impl.jam.annotation, - org.apache.xmlbeans.impl.jam.internal, - org.apache.xmlbeans.impl.jam.internal.classrefs, - org.apache.xmlbeans.impl.jam.internal.elements, - org.apache.xmlbeans.impl.jam.internal.javadoc, - org.apache.xmlbeans.impl.jam.internal.parser, - org.apache.xmlbeans.impl.jam.internal.reflect, - org.apache.xmlbeans.impl.jam.mutable, - org.apache.xmlbeans.impl.jam.provider, - org.apache.xmlbeans.impl.jam.visitor, - org.apache.xmlbeans.impl.jam.xml, - org.apache.xmlbeans.impl.regex, - org.apache.xmlbeans.impl.richParser, - org.apache.xmlbeans.impl.schema, - org.apache.xmlbeans.impl.soap, - org.apache.xmlbeans.impl.store, - org.apache.xmlbeans.impl.tool, - org.apache.xmlbeans.impl.util, - org.apache.xmlbeans.impl.validator, - org.apache.xmlbeans.impl.values, - org.apache.xmlbeans.impl.xb.ltgfmt, - org.apache.xmlbeans.impl.xb.ltgfmt.impl, - org.apache.xmlbeans.impl.xb.substwsdl, - org.apache.xmlbeans.impl.xb.substwsdl.impl, - org.apache.xmlbeans.impl.xb.xmlconfig, - org.apache.xmlbeans.impl.xb.xmlconfig.impl, - org.apache.xmlbeans.impl.xb.xmlschema, - org.apache.xmlbeans.impl.xb.xmlschema.impl, - org.apache.xmlbeans.impl.xb.xsdownload, - org.apache.xmlbeans.impl.xb.xsdownload.impl, - org.apache.xmlbeans.impl.xb.xsdschema, - org.apache.xmlbeans.impl.xb.xsdschema.impl, - org.apache.xmlbeans.impl.xpathgen, - org.apache.xmlbeans.impl.xsd2inst, - org.apache.xmlbeans.soap, - org.apache.xmlbeans.xml.stream, - org.apache.xmlbeans.xml.stream.events, - org.apache.xmlbeans.xml.stream.utils, - org.compiere.model, + WEB-INF/lib/idempiere-xmlbeans.jar +Export-Package: org.compiere.model, org.idempiere.adInterface.x10, org.idempiere.adInterface.x10.impl, org.idempiere.adinterface, diff --git a/org.idempiere.webservices/build.properties b/org.idempiere.webservices/build.properties index 48beed7783..9592fe3b39 100644 --- a/org.idempiere.webservices/build.properties +++ b/org.idempiere.webservices/build.properties @@ -6,10 +6,7 @@ bin.includes = META-INF/,\ WEB-INF/xsd/,\ plugin.xml,\ OSGI-INF/,\ - WEB-INF/lib/aopalliance.jar,\ - WEB-INF/lib/axis.jar,\ - WEB-INF/lib/idempiere-xmlbeans.jar,\ - WEB-INF/lib/xmlbeans.jar + WEB-INF/lib/idempiere-xmlbeans.jar src.includes = WEB-INF/lib/,\ WEB-INF/web.xml,\ WEB-INF/xsd/ diff --git a/org.idempiere.webservices/pom.xml b/org.idempiere.webservices/pom.xml index 4ad9a73bb0..75b6307fa0 100644 --- a/org.idempiere.webservices/pom.xml +++ b/org.idempiere.webservices/pom.xml @@ -22,46 +22,6 @@ - - org.apache.maven.plugins - maven-dependency-plugin - - - validate - - copy - - - - - wsdl4j - wsdl4j - 1.6.3 - - - org.apache.xmlbeans - xmlbeans - 3.0.1 - - - aopalliance - aopalliance - 1.0 - - - org.apache.axis - axis - 1.4 - - - WEB-INF/lib - true - true - true - - - - com.googlecode.maven-download-plugin download-maven-plugin