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) 

use osgi version
This commit is contained in:
hieplq 2018-10-29 08:22:06 +07:00
parent c75b678db5
commit 783827e94a
5 changed files with 139 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -260,27 +260,6 @@
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin
id="org.springframework.spring-beans"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.springframework.spring-core"
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 <plugin
id="javax.xml.soap-api" id="javax.xml.soap-api"
download-size="0" download-size="0"
@ -295,34 +274,6 @@
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin
id="org.springframework.spring-aop"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.springframework.spring-context"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.springframework.spring-expression"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.springframework.spring-web"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin <plugin
id="com.sun.activation.javax.activation" id="com.sun.activation.javax.activation"
download-size="0" download-size="0"
@ -337,4 +288,81 @@
version="0.0.0" version="0.0.0"
unpack="false"/> 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"
install-size="0"
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"/>
</feature> </feature>

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

@ -28,6 +28,7 @@
<slf4j.version>1.7.25</slf4j.version> <slf4j.version>1.7.25</slf4j.version>
<xml.ws.version>2.3.1</xml.ws.version> <xml.ws.version>2.3.1</xml.ws.version>
<apache.cxf.version>3.2.6</apache.cxf.version> <apache.cxf.version>3.2.6</apache.cxf.version>
<spring.osgi.version>1.2.1</spring.osgi.version>
</properties> </properties>
<repositories> <repositories>
@ -550,16 +551,22 @@
<source>true</source> <source>true</source>
<transitive>false</transitive> <transitive>false</transitive>
</artifact> </artifact>
<artifact> <!-- <artifact>
<id>org.springframework:spring-jcl:jar:${springframework.version}</id> <id>org.springframework:spring-jcl:jar:${springframework.version}</id>
<source>true</source> <source>true</source>
<transitive>false</transitive> <transitive>false</transitive>
</artifact> </artifact>
-->
<artifact> <artifact>
<id>org.springframework:spring-context:jar:${springframework.version}</id> <id>org.springframework:spring-context:jar:${springframework.version}</id>
<source>true</source> <source>true</source>
<transitive>false</transitive> <transitive>false</transitive>
</artifact> </artifact>
<artifact>
<id>org.springframework:spring-asm:jar:${springframework.version}</id>
<source>true</source>
<transitive>false</transitive>
</artifact>
<artifact> <artifact>
<id>org.springframework:spring-expression:jar:${springframework.version}</id> <id>org.springframework:spring-expression:jar:${springframework.version}</id>
<source>true</source> <source>true</source>
@ -575,6 +582,21 @@
<source>true</source> <source>true</source>
<transitive>false</transitive> <transitive>false</transitive>
</artifact> </artifact>
<artifact>
<id>org.springframework.osgi:spring-osgi-extender:jar:${spring.osgi.version}</id>
<source>true</source>
<transitive>false</transitive>
</artifact>
<artifact>
<id>org.springframework.osgi:spring-osgi-core:jar:${spring.osgi.version}</id>
<source>true</source>
<transitive>false</transitive>
</artifact>
<artifact>
<id>org.springframework.osgi:spring-osgi-io:jar:${spring.osgi.version}</id>
<source>true</source>
<transitive>false</transitive>
</artifact>
</artifacts> </artifacts>
</feature> </feature>
<!-- zk public zk osgi on zip format download from sourceforge, so <!-- zk public zk osgi on zip format download from sourceforge, so

38
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-181012" sequenceNumber="107"> <?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="idempiere-181029" sequenceNumber="107">
<locations> <locations>
<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit"> <location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.restlet.example.feature.group" version="2.3.2.v20150501-1520"/> <unit id="org.restlet.example.feature.group" version="2.3.2.v20150501-1520"/>
@ -1001,20 +1001,22 @@
<unit id="org.mortbay.jasper.apache-jsp" version="8.5.33"/> <unit id="org.mortbay.jasper.apache-jsp" version="8.5.33"/>
<unit id="org.passay" version="1.3.1"/> <unit id="org.passay" version="1.3.1"/>
<unit id="org.passay.source" version="1.3.1"/> <unit id="org.passay.source" version="1.3.1"/>
<unit id="org.springframework.spring-aop" version="5.1.1.RELEASE"/> <unit id="org.springframework.aop" version="3.1.4.RELEASE"/>
<unit id="org.springframework.spring-aop.source" version="5.1.1.RELEASE"/> <unit id="org.springframework.aop.source" version="3.1.4.RELEASE"/>
<unit id="org.springframework.spring-beans" version="5.1.1.RELEASE"/> <unit id="org.springframework.beans" version="3.1.4.RELEASE"/>
<unit id="org.springframework.spring-beans.source" version="5.1.1.RELEASE"/> <unit id="org.springframework.beans.source" version="3.1.4.RELEASE"/>
<unit id="org.springframework.spring-context" version="5.1.1.RELEASE"/> <unit id="org.springframework.core" version="3.1.4.RELEASE"/>
<unit id="org.springframework.spring-context.source" version="5.1.1.RELEASE"/> <unit id="org.springframework.core.source" version="3.1.4.RELEASE"/>
<unit id="org.springframework.spring-core" version="5.1.1.RELEASE"/> <unit id="org.springframework.expression" version="3.1.4.RELEASE"/>
<unit id="org.springframework.spring-core.source" version="5.1.1.RELEASE"/> <unit id="org.springframework.expression.source" version="3.1.4.RELEASE"/>
<unit id="org.springframework.spring-expression" version="5.1.1.RELEASE"/> <unit id="org.springframework.osgi.core" version="1.2.1"/>
<unit id="org.springframework.spring-expression.source" version="5.1.1.RELEASE"/> <unit id="org.springframework.osgi.core.source" version="1.2.1"/>
<unit id="org.springframework.spring-jcl" version="5.1.1.RELEASE"/> <unit id="org.springframework.osgi.extender" version="1.2.1"/>
<unit id="org.springframework.spring-jcl.source" version="5.1.1.RELEASE"/> <unit id="org.springframework.osgi.extender.source" version="1.2.1"/>
<unit id="org.springframework.spring-web" version="5.1.1.RELEASE"/> <unit id="org.springframework.osgi.io" version="1.2.1"/>
<unit id="org.springframework.spring-web.source" version="5.1.1.RELEASE"/> <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="org.w3c.dom.svg.patch" version="1.1.0.b02"/> <unit id="org.w3c.dom.svg.patch" version="1.1.0.b02"/>
<unit id="slf4j.api" version="1.7.25"/> <unit id="slf4j.api" version="1.7.25"/>
<unit id="slf4j.api.source" version="1.7.25"/> <unit id="slf4j.api.source" version="1.7.25"/>
@ -1045,6 +1047,12 @@
<unit id="zweb" version="8.5.0"/> <unit id="zweb" version="8.5.0"/>
<unit id="zweb.sources" version="8.5.0"/> <unit id="zweb.sources" version="8.5.0"/>
<repository location="https://sourceforge.net/projects/idempiere/files/binary.file/jarfile/maven-p2-R20181021"/> <repository location="https://sourceforge.net/projects/idempiere/files/binary.file/jarfile/maven-p2-R20181021"/>
<unit id="aopalliance" version="1.0.0"/>
<unit id="aopalliance.source" version="1.0.0"/>
<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.context" version="3.1.4.RELEASE"/>
<unit id="org.springframework.context.source" version="3.1.4.RELEASE"/>
</location> </location>
</locations> </locations>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-10"/> <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> <maven.dependency.version>3.1.1</maven.dependency.version>
<download.maven.version>1.4.1</download.maven.version> <download.maven.version>1.4.1</download.maven.version>
<lifecycle.mapping.version>1.0.0</lifecycle.mapping.version> <lifecycle.mapping.version>1.0.0</lifecycle.mapping.version>
<springframework.version>5.1.1.RELEASE</springframework.version> <springframework.version>3.1.4.RELEASE</springframework.version>
<!-- https://www.eclipse.org/jetty/documentation/9.3.x/alpn-chapter.html#alpn-versions --> <!-- 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> <jetty.alpn-boot.version>8.1.12.v20180117</jetty.alpn-boot.version>
<netbeans.lib.version>RELEASE731</netbeans.lib.version> <netbeans.lib.version>RELEASE731</netbeans.lib.version>

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

@ -6,7 +6,9 @@ Bundle-Version: 5.1.0.qualifier
Bundle-Activator: org.idempiere.webservices.Activator Bundle-Activator: org.idempiere.webservices.Activator
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
Service-Component: OSGI-INF/ws_modelfactory.xml Service-Component: OSGI-INF/ws_modelfactory.xml
Import-Package: javax.mail;version="1.4.1", Import-Package: javax.activation,
javax.annotation,
javax.mail;version="1.4.1",
javax.mail.internet;version="1.5", javax.mail.internet;version="1.5",
javax.servlet;version="3.0.0", javax.servlet;version="3.0.0",
javax.servlet.http;version="3.0.0", javax.servlet.http;version="3.0.0",
@ -75,18 +77,20 @@ 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-frontend-simple;bundle-version="3.2.6",
org.apache.cxf.cxf-rt-transports-http;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", 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.jws-api;bundle-version="1.1.0",
javax.xml.soap-api;bundle-version="1.4.0", javax.xml.soap-api;bundle-version="1.4.0",
org.springframework.spring-aop;bundle-version="5.1.1", org.springframework.aop;bundle-version="3.1.4",
org.springframework.spring-beans;bundle-version="5.1.1", org.springframework.beans;bundle-version="3.1.4",
org.springframework.spring-context;bundle-version="5.1.1", org.springframework.core;bundle-version="3.1.4",
org.springframework.spring-core;bundle-version="5.1.1", org.springframework.expression;bundle-version="3.1.4",
org.springframework.spring-expression;bundle-version="5.1.1", org.springframework.osgi.core;bundle-version="1.2.1",
org.springframework.spring-jcl;bundle-version="5.1.1", org.springframework.osgi.extender;bundle-version="1.2.1",
org.springframework.spring-web;bundle-version="5.1.1", org.springframework.osgi.io;bundle-version="1.2.1",
javax.annotation-api;bundle-version="1.3.2", org.springframework.web;bundle-version="3.1.4",
com.sun.activation.javax.activation;bundle-version="1.2.0", org.springframework.asm;bundle-version="3.1.4",
javax.xml.ws;bundle-version="2.1.0" org.springframework.context;bundle-version="3.1.4",
org.aopalliance;bundle-version="1.0.0"
Bundle-ClassPath: ., Bundle-ClassPath: .,
WEB-INF/lib/aopalliance.jar, WEB-INF/lib/aopalliance.jar,
WEB-INF/lib/axis.jar, WEB-INF/lib/axis.jar,