midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-3798:Move iDempiere default branch to openjdk 10 (web service/tycho ok, eclipse conflic) 

1. new version of cxf need new version of spring so get osgi version from org.apache.servicemix but spring of cxf limit to 4.0 so take 4.3.19.RELEASE_1
http://cxf.apache.org/docs/30-migration-guide.html

2. eclipse auto add --add-modules=ALL-SYSTEM when run eclipse launcher, so when run idempiere server from eclipse encounter bellow condition
   javax.activity, javax.xml.ws is depricate package to remove on jdk11
   that why this module is exclusive from build class path (but by --add-modules=ALL-SYSTEM it appear at runtime)
   we use some replace jar for that package (com.sun.activation for javax.activation)
This commit is contained in:
hieplq 2018-10-31 04:03:57 +07:00
parent 23530a00e2
commit 8a04f3e303
9 changed files with 1074 additions and 205 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
org.adempiere.base-feature/feature.xml
View File

@ -365,13 +365,6 @@
version="0.0.0"
unpack="false"/>
<plugin
id="jaxws-api"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="javax.transaction-api"
download-size="0"
@ -407,13 +400,6 @@
version="0.0.0"
unpack="false"/>
<plugin
id="javax.annotation"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="javax.annotation-api"
download-size="0"
@ -499,13 +485,6 @@
fragment="true"
unpack="false"/>
<plugin
id="com.sun.activation.javax.activation"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="javax.jws"
download-size="0"
@ -513,4 +492,11 @@
version="0.0.0"
unpack="false"/>
<plugin
id="javax.activation"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature>

7
org.adempiere.base/META-INF/MANIFEST.MF
View File

@ -58,12 +58,13 @@ Export-Package: bsh,
org.idempiere.model
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
Import-Package: com.sun.mail.smtp;version="1.5",
javax.activation;version="1.1.0",
javax.jms;version="1.1.0",
javax.mail;version="1.5",
javax.mail.internet;version="1.5",
javax.servlet;version="3.0.0",
javax.servlet.http;version="3.0.0",
javax.xml.bind,
javax.xml.bind;version="2.3.0",
junit.framework;version="3.8.2";resolution:=optional,
junit.textui;version="3.8.2";resolution:=optional,
net.sf.cglib.proxy,
@ -123,8 +124,6 @@ Require-Bundle: org.eclipse.equinox.app;bundle-version="0.0.0",
groovy,
javax.xml;bundle-version="1.3.4",
org.apache.poi.poi;bundle-version="3.15.0",
org.apache.poi.poi-ooxml;bundle-version="3.15.0",
com.sun.activation.javax.activation;bundle-version="1.2.0",
jaxb-api;bundle-version="2.3.1"
org.apache.poi.poi-ooxml;bundle-version="3.15.0"
Automatic-Module-Name: org.adempiere.base
Bundle-Vendor: iDempiere Community

6
org.adempiere.server-feature/server.product.launch
View File

File diff suppressed because one or more lines are too long

180
org.adempiere.target.platform-feature/feature.xml
View File

@ -162,13 +162,6 @@
version="0.0.0"
unpack="false"/>
<plugin
id="javax.ws.rs.jsr311-api"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.commons.discovery"
download-size="0"
@ -267,69 +260,6 @@
version="0.0.0"
unpack="false"/>
<plugin
id="javax.xml.ws"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.springframework.aop"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.springframework.beans"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.springframework.core"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.springframework.expression"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.springframework.osgi.core"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.springframework.osgi.extender"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.springframework.osgi.io"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.springframework.web"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.aopalliance"
download-size="0"
@ -337,20 +267,6 @@
version="0.0.0"
unpack="false"/>
<plugin
id="org.springframework.asm"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.springframework.context"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.cxf.cxf-rt-transports-http-jetty"
download-size="0"
@ -384,12 +300,6 @@
install-size="0"
version="0.0.0"/>
<plugin
id="javax.xml.soap"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="org.apache.xmlbeans"
download-size="0"
@ -418,4 +328,94 @@
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.servicemix.bundles.spring-beans"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.servicemix.bundles.spring-context"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.servicemix.bundles.spring-context-support"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.servicemix.bundles.spring-core"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.servicemix.bundles.spring-expression"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.servicemix.bundles.spring-web"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.springframework.spring-jcl"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.servicemix.bundles.spring-aop"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="jaxb-api"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="javax.jws-api"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="javax.xml.soap-api"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="javax.xml.soap"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="jaxws-api"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature>

8
org.adempiere.ui.zk/META-INF/MANIFEST.MF
View File

@ -5,15 +5,14 @@ Bundle-SymbolicName: org.adempiere.ui.zk;singleton:=true
Bundle-Version: 5.1.0.qualifier
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
Import-Package: groovy.transform.stc;version="2.4.7",
javax.annotation,
javax.activation;version="1.1.0",
javax.annotation.processing,
javax.annotation.security;version="1.2.0",
javax.annotation.sql;version="1.2.0",
javax.servlet,
javax.servlet.annotation;version="3.1.0",
javax.servlet.http,
javax.servlet.jsp.resources;version="2.3.0",
javax.servlet.resources;version="3.1.0",
javax.xml.bind;version="2.3.0",
net.sf.jasperreports.engine,
net.sf.jasperreports.engine.export,
net.sf.jasperreports.engine.util,
@ -153,8 +152,7 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
org.apache.commons.io;bundle-version="0.0.0",
com.itextpdf;bundle-version="0.0.0",
org.atmosphere.runtime;bundle-version="0.0.0",
com.sun.activation.javax.activation;bundle-version="1.2.0",
jaxb-api;bundle-version="2.3.1"
javax.annotation-api;bundle-version="1.3.2"
Bundle-Activator: org.adempiere.webui.WebUIActivator
Eclipse-ExtensibleAPI: true
Web-ContextPath: webui

955
org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml
View File

File diff suppressed because it is too large Load Diff

50
org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="idempiere-181029" sequenceNumber="107">
<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="idempiere-181032" sequenceNumber="107">
<locations>
<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.restlet.example.feature.group" version="2.3.2.v20150501-1520"/>
@ -46,7 +46,7 @@
<unit id="org.restlet.ext.xml.feature.group" version="2.3.2.v20150501-1520"/>
<unit id="org.restlet.ext.xstream.feature.group" version="2.3.2.v20150501-1520"/>
<unit id="org.restlet.feature.group" version="2.3.2.v20150501-1520"/>
<repository location="http://p2.restlet.com/2.3"/>
<repository location="http://localhost:8081/artifactory/restlet"/>
</location>
<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.e4.core.tools.feature.source.feature.group" version="4.9.0.v20180823-1503"/>
@ -61,7 +61,7 @@
<unit id="org.eclipse.sdk.tests.feature.group" version="4.9.0.v20180906-0745"/>
<unit id="org.eclipse.swt.tools.feature.feature.group" version="3.107.100.v20180821-0933"/>
<unit id="org.eclipse.test.feature.group" version="3.7.400.v20180822-0818"/>
<repository location="http://download.eclipse.org/eclipse/updates/4.9"/>
<repository location="http://localhost:8081/artifactory/eclipse-root/4.9"/>
<unit id="org.eclipse.ecf.core.feature.feature.group" version="1.5.1.v20180810-0833"/>
<unit id="org.eclipse.ecf.core.ssl.feature.feature.group" version="1.1.100.v20180301-0201"/>
<unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="3.14.2.v20180801-2237"/>
@ -744,7 +744,7 @@
<unit id="osgi.enterprise.source" version="4.2.0.v201108120515"/>
<unit id="scannotation" version="1.0.2.v201205170710"/>
<unit id="scannotation.source" version="1.0.2.v201205170710"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20180905201904/repository"/>
<repository location="http://localhost:8081/artifactory/orbit-root/drops/R20180905201904/repository"/>
<unit id="org.objectweb.asm" version="6.2.1.v20180823-1831"/>
<unit id="org.objectweb.asm.analysis" version="6.2.1.v20180823-1831"/>
<unit id="org.objectweb.asm.analysis.source" version="6.2.1.v20180823-1831"/>
@ -761,7 +761,7 @@
<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.bundles.f.feature.group" version="9.4.12.v20180830"/>
<unit id="org.eclipse.jetty.bundles.f.source.feature.group" version="9.4.12.v20180830"/>
<repository location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.12.v20180830"/>
<repository location="http://localhost:8081/artifactory/jetty-9.4.12.v20180830"/>
</location>
<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="com.fasterxml.jackson.core.jackson-annotations" version="2.9.5"/>
@ -978,8 +978,8 @@
<unit id="org.apache.cxf.cxf-rt-frontend-simple.source" version="3.2.6"/>
<unit id="org.apache.cxf.cxf-rt-management" version="3.2.6"/>
<unit id="org.apache.cxf.cxf-rt-management.source" version="3.2.6"/>
<unit id="org.apache.cxf.cxf-rt-rs-extension-providers" version="3.2.6"/>
<unit id="org.apache.cxf.cxf-rt-rs-extension-providers.source" version="3.2.6"/>
<unit id="org.apache.cxf.cxf-rt-rs-extension-providers" version="3.1.17"/>
<unit id="org.apache.cxf.cxf-rt-rs-extension-providers.source" version="3.1.17"/>
<unit id="org.apache.cxf.cxf-rt-rs-http-sci" version="3.2.6"/>
<unit id="org.apache.cxf.cxf-rt-rs-http-sci.source" version="3.2.6"/>
<unit id="org.apache.cxf.cxf-rt-rs-service-description" version="3.2.6"/>
@ -1050,34 +1050,30 @@
<unit id="org.mortbay.jasper.apache-jsp" version="8.5.33"/>
<unit id="org.passay" version="1.3.1"/>
<unit id="org.passay.source" version="1.3.1"/>
<unit id="org.springframework.aop" version="3.1.4.RELEASE"/>
<unit id="org.springframework.aop.source" version="3.1.4.RELEASE"/>
<unit id="org.springframework.asm" version="3.1.4.RELEASE"/>
<unit id="org.springframework.asm.source" version="3.1.4.RELEASE"/>
<unit id="org.springframework.beans" version="3.1.4.RELEASE"/>
<unit id="org.springframework.beans.source" version="3.1.4.RELEASE"/>
<unit id="org.springframework.context" version="3.1.4.RELEASE"/>
<unit id="org.springframework.context.source" version="3.1.4.RELEASE"/>
<unit id="org.springframework.core" version="3.1.4.RELEASE"/>
<unit id="org.springframework.core.source" version="3.1.4.RELEASE"/>
<unit id="org.springframework.expression" version="3.1.4.RELEASE"/>
<unit id="org.springframework.expression.source" version="3.1.4.RELEASE"/>
<unit id="org.springframework.osgi.core" version="1.2.1"/>
<unit id="org.springframework.osgi.core.source" version="1.2.1"/>
<unit id="org.springframework.osgi.extender" version="1.2.1"/>
<unit id="org.springframework.osgi.extender.source" version="1.2.1"/>
<unit id="org.springframework.osgi.io" version="1.2.1"/>
<unit id="org.springframework.osgi.io.source" version="1.2.1"/>
<unit id="org.springframework.web" version="3.1.4.RELEASE"/>
<unit id="org.springframework.web.source" version="3.1.4.RELEASE"/>
<unit id="slf4j.api" version="1.7.25"/>
<unit id="slf4j.api.source" version="1.7.25"/>
<unit id="slf4j.jcl" version="1.7.25"/>
<unit id="slf4j.jcl.source" version="1.7.25"/>
<unit id="slf4j.jdk14" version="1.7.25"/>
<unit id="slf4j.jdk14.source" version="1.7.25"/>
<unit id="org.apache.servicemix.bundles.spring-beans" version="4.3.19.RELEASE_1"/>
<unit id="org.apache.servicemix.bundles.spring-context" version="4.3.19.RELEASE_1"/>
<unit id="org.apache.servicemix.bundles.spring-core" version="4.3.19.RELEASE_1"/>
<unit id="stax2-api" version="4.1.0"/>
<unit id="stax2-api.source" version="4.1.0"/>
<unit id="org.apache.servicemix.bundles.spring-beans.source.sources" version="4.3.19.RELEASE_1"/>
<unit id="org.apache.servicemix.bundles.spring-context.source.sources" version="4.3.19.RELEASE_1"/>
<unit id="org.apache.servicemix.bundles.spring-core.source.sources" version="4.3.19.RELEASE_1"/>
<unit id="org.apache.servicemix.bundles.spring-aop" version="4.3.19.RELEASE_1"/>
<unit id="org.apache.servicemix.bundles.spring-aop.source.sources" version="4.3.19.RELEASE_1"/>
<unit id="org.apache.servicemix.bundles.spring-context-support" version="4.3.19.RELEASE_1"/>
<unit id="org.apache.servicemix.bundles.spring-context-support.source.sources" version="4.3.19.RELEASE_1"/>
<unit id="org.apache.servicemix.bundles.spring-expression" version="4.3.19.RELEASE_1"/>
<unit id="org.apache.servicemix.bundles.spring-expression.source.sources" version="4.3.19.RELEASE_1"/>
<unit id="org.apache.servicemix.bundles.spring-web" version="4.3.19.RELEASE_1"/>
<unit id="org.apache.servicemix.bundles.spring-web.source.sources" version="4.3.19.RELEASE_1"/>
<unit id="org.springframework.spring-jcl" version="5.1.1.RELEASE"/>
<unit id="org.springframework.spring-jcl.source" version="5.1.1.RELEASE"/>
</location>
</locations>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-10"/>

2
org.idempiere.parent/pom.xml
View File

@ -20,7 +20,7 @@
<maven.dependency.version>3.1.1</maven.dependency.version>
<download.maven.version>1.4.1</download.maven.version>
<lifecycle.mapping.version>1.0.0</lifecycle.mapping.version>
<springframework.version>3.1.4.RELEASE</springframework.version>
<springframework.version>4.3.19.RELEASE_1</springframework.version><!--cfx dependency on [3.1,5)-->
<!-- https://www.eclipse.org/jetty/documentation/9.3.x/alpn-chapter.html#alpn-versions -->
<jetty.alpn-boot.version>8.1.12.v20180117</jetty.alpn-boot.version>
<netbeans.lib.version>RELEASE731</netbeans.lib.version>

41
org.idempiere.webservices/META-INF/MANIFEST.MF
View File

@ -6,12 +6,15 @@ Bundle-Version: 5.1.0.qualifier
Bundle-Activator: org.idempiere.webservices.Activator
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
Service-Component: OSGI-INF/ws_modelfactory.xml
Import-Package: javax.activation,
javax.annotation,
Import-Package: javax.activation;version="1.1.0",
javax.annotation;version="1.3.2",
javax.jws;version="1.1.0",
javax.jws.soap;version="1.1.0",
javax.mail;version="1.4.1",
javax.mail.internet;version="1.5",
javax.servlet;version="3.0.0",
javax.servlet.http;version="3.0.0",
javax.xml.bind;version="2.3.0",
net.sf.jasperreports.engine,
net.sf.jasperreports.engine.base,
net.sf.jasperreports.engine.util,
@ -60,7 +63,6 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
org.apache.neethi;bundle-version="3.1.1",
org.apache.ws.xmlschema.core;bundle-version="2.2.3",
org.apache.commons.discovery;bundle-version="0.5.0",
javax.ws.rs.jsr311-api;bundle-version="1.1.1",
stax2-api;bundle-version="4.1.0",
org.apache.cxf.cxf-rt-frontend-jaxrs;bundle-version="3.2.6",
org.apache.cxf.cxf-rt-frontend-jaxws;bundle-version="3.2.6",
@ -70,31 +72,28 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
org.apache.cxf.cxf-rt-frontend-simple;bundle-version="3.2.6",
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",
org.springframework.aop;bundle-version="3.1.4",
org.springframework.beans;bundle-version="3.1.4",
org.springframework.core;bundle-version="3.1.4",
org.springframework.expression;bundle-version="3.1.4",
org.springframework.osgi.core;bundle-version="1.2.1",
org.springframework.osgi.extender;bundle-version="1.2.1",
org.springframework.osgi.io;bundle-version="1.2.1",
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.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"
javax.ws.rs-api;bundle-version="2.1.99",
org.apache.servicemix.bundles.spring-aop,
org.apache.servicemix.bundles.spring-beans,
org.apache.servicemix.bundles.spring-context,
org.apache.servicemix.bundles.spring-context-support,
org.apache.servicemix.bundles.spring-core,
org.apache.servicemix.bundles.spring-expression,
org.springframework.spring-jcl;bundle-version="5.1.1",
org.apache.servicemix.bundles.spring-web,
org.apache.cxf.cxf-rt-rs-extension-providers;bundle-version="3.1.17",
javax.xml.soap-api;bundle-version="1.4.0",
org.apache.axis;bundle-version="1.4.0",
javax.xml.soap;bundle-version="1.3.0",
javax.annotation-api;bundle-version="1.3.2",
jaxws-api;bundle-version="2.3.1"
Bundle-ClassPath: .,
WEB-INF/lib/idempiere-xmlbeans.jar
Export-Package: org.compiere.model,