IDEMPIERE-3909:update webservice library to jdk-11

This commit is contained in:
hieplq 2019-03-02 20:22:16 +07:00
parent 874d238c5c
commit fb1ebefdf2
15 changed files with 114 additions and 163 deletions

View File

@ -351,13 +351,6 @@
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin
id="jaxb-api"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin <plugin
id="javax.transaction-api" id="javax.transaction-api"
download-size="0" download-size="0"
@ -527,4 +520,11 @@
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin
id="jakarta.xml.bind-api"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature> </feature>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -24,7 +24,7 @@
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/> <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
<stringAttribute key="pde.version" value="3.3"/> <stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.adempiere.server.server_product"/> <stringAttribute key="product" value="org.adempiere.server.server_product"/>
<stringAttribute key="selected_target_plugins" value="bcpkix@default:default,bcprov@default:default,com.itextpdf@default:default,com.jaspersoft.studio.bundles.barbecue@default:default,com.sun.activation.jakarta.activation@default:default,com.sun.mail.gimap@default:default,com.sun.mail.imap@default:default,com.sun.mail.jakarta.mail@default:default,com.sun.mail.smtp@default:default,groovy@default:default,jakarta.mail.api@default:default,javax.annotation-api@default:default,javax.jms@default:default,javax.transaction@default:false,javax.xml@default:default,jaxb-api@default:default,net.sf.supercsv.super-csv@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant*1.9.6.v201510161327@default:default,org.apache.commons.codec*1.6.0.v201305230611@default:default,org.apache.commons.collections@default:default,org.apache.commons.logging*1.2.0.v20180409-1502@default:default,org.apache.commons.net@default:default,org.apache.felix.scr@1:true,org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec@default:default,org.apache.poi.poi-ooxml@default:default,org.apache.poi.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.cryptacular@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.osgi*3.13.200.v20181130-2106@-1:true,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.hamcrest.core@default:default,org.jfree.chart-osgi@default:default,org.jfree.jcommon-osgi@default:default,org.junit@default:default,org.krysalis.barcode4j@default:default,org.passay@default:default,org.restlet*2.4.1@default:default,slf4j.api@default:default,slf4j.jcl@default:false"/> <stringAttribute key="selected_target_plugins" value="bcpkix@default:default,bcprov@default:default,com.itextpdf@default:default,com.jaspersoft.studio.bundles.barbecue@default:default,com.sun.activation.jakarta.activation@default:default,com.sun.mail.gimap@default:default,com.sun.mail.imap@default:default,com.sun.mail.jakarta.mail@default:default,com.sun.mail.smtp@default:default,groovy@default:default,jakarta.mail.api@default:default,jakarta.xml.bind-api@default:default,javax.annotation-api@default:default,javax.jms@default:default,javax.transaction@default:false,javax.xml@default:default,net.sf.supercsv.super-csv@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant*1.9.6.v201510161327@default:default,org.apache.commons.codec*1.6.0.v201305230611@default:default,org.apache.commons.collections@default:default,org.apache.commons.logging*1.2.0.v20180409-1502@default:default,org.apache.commons.net@default:default,org.apache.felix.scr@1:true,org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec@default:default,org.apache.poi.poi-ooxml@default:default,org.apache.poi.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.cryptacular@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.osgi*3.13.200.v20181130-2106@-1:true,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.hamcrest.core@default:default,org.jfree.chart-osgi@default:default,org.jfree.jcommon-osgi@default:default,org.junit@default:default,org.krysalis.barcode4j@default:default,org.passay@default:default,org.restlet*2.4.1@default:default,slf4j.api@default:default,slf4j.jcl@default:false"/>
<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:true,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default"/> <stringAttribute key="selected_workspace_plugins" value="org.adempiere.base@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:true,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/> <booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/> <stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>

View File

@ -24,7 +24,7 @@
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/> <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
<stringAttribute key="pde.version" value="3.3"/> <stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.adempiere.server.server_product"/> <stringAttribute key="product" value="org.adempiere.server.server_product"/>
<stringAttribute key="selected_target_plugins" value="bcpkix@default:default,bcprov@default:default,com.itextpdf@default:default,com.jaspersoft.studio.bundles.barbecue@default:default,com.sun.activation.jakarta.activation@default:default,com.sun.mail.gimap@default:default,com.sun.mail.imap@default:default,com.sun.mail.jakarta.mail@default:default,com.sun.mail.smtp@default:default,groovy@default:default,jakarta.mail.api@default:default,javax.annotation-api@default:default,javax.jms@default:default,javax.transaction@default:false,javax.xml@default:default,jaxb-api@default:default,net.sf.supercsv.super-csv@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant*1.9.6.v201510161327@default:default,org.apache.commons.codec*1.6.0.v201305230611@default:default,org.apache.commons.collections@default:default,org.apache.commons.logging*1.2.0.v20180409-1502@default:default,org.apache.commons.net@default:default,org.apache.felix.scr@1:true,org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec@default:default,org.apache.poi.poi-ooxml@default:default,org.apache.poi.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.cryptacular@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.osgi*3.13.200.v20181130-2106@-1:true,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.hamcrest.core@default:default,org.jfree.chart-osgi@default:default,org.jfree.jcommon-osgi@default:default,org.junit@default:default,org.krysalis.barcode4j@default:default,org.passay@default:default,org.restlet*2.4.1@default:default,slf4j.api@default:default,slf4j.jcl@default:false"/> <stringAttribute key="selected_target_plugins" value="bcpkix@default:default,bcprov@default:default,com.itextpdf@default:default,com.jaspersoft.studio.bundles.barbecue@default:default,com.sun.activation.jakarta.activation@default:default,com.sun.mail.gimap@default:default,com.sun.mail.imap@default:default,com.sun.mail.jakarta.mail@default:default,com.sun.mail.smtp@default:default,groovy@default:default,jakarta.mail.api@default:default,jakarta.xml.bind-api@default:default,javax.annotation-api@default:default,javax.jms@default:default,javax.transaction@default:false,javax.xml@default:default,net.sf.supercsv.super-csv@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant*1.9.6.v201510161327@default:default,org.apache.commons.codec*1.6.0.v201305230611@default:default,org.apache.commons.collections@default:default,org.apache.commons.logging*1.2.0.v20180409-1502@default:default,org.apache.commons.net@default:default,org.apache.felix.scr@1:true,org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec@default:default,org.apache.poi.poi-ooxml@default:default,org.apache.poi.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.cryptacular@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.osgi*3.13.200.v20181130-2106@-1:true,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.hamcrest.core@default:default,org.jfree.chart-osgi@default:default,org.jfree.jcommon-osgi@default:default,org.junit@default:default,org.krysalis.barcode4j@default:default,org.passay@default:default,org.restlet*2.4.1@default:default,slf4j.api@default:default,slf4j.jcl@default:false"/>
<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:true,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default"/> <stringAttribute key="selected_workspace_plugins" value="org.adempiere.base@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:true,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/> <booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/> <stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -370,40 +370,12 @@
version="0.0.0" version="0.0.0"
unpack="false"/> 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 <plugin
id="javax.xml.soap" id="javax.xml.soap"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0"/> version="0.0.0"/>
<plugin
id="jaxws-api"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin <plugin
id="org.glassfish.hk2.api" id="org.glassfish.hk2.api"
download-size="0" download-size="0"
@ -454,7 +426,21 @@
unpack="false"/> unpack="false"/>
<plugin <plugin
id="javax.ws.rs-api" id="jakarta.xml.ws-api"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="jakarta.ws.rs-api"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="jakarta.jws-api"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"

File diff suppressed because one or more lines are too long

View File

@ -10,7 +10,7 @@
<artifactId>org.idempiere.maven.to.p2</artifactId> <artifactId>org.idempiere.maven.to.p2</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<properties> <properties>
<zk-osgi-zip-file>https://sourceforge.net/project/zk1/ZK/zk-8.6.0.1/zk-bin-osgi-8.6.0.1.zip</zk-osgi-zip-file> <zk-osgi-zip-file>https://iweb.dl.sourceforge.net/project/zk1/ZK/zk-8.6.0.1/zk-bin-osgi-8.6.0.1.zip</zk-osgi-zip-file>
<!-- https://github.com/eclipse/jetty.project/blob/jetty-9.4.9.v20180320/pom.xml up to verison of jetty --> <!-- https://github.com/eclipse/jetty.project/blob/jetty-9.4.9.v20180320/pom.xml up to verison of jetty -->
<jetty.version>9.4.14.v20181114</jetty.version> <jetty.version>9.4.14.v20181114</jetty.version>
<jetty.alpn.api.version>1.1.3.v20160715</jetty.alpn.api.version> <jetty.alpn.api.version>1.1.3.v20160715</jetty.alpn.api.version>
@ -26,7 +26,7 @@
<woodstox.core.version>5.0.3</woodstox.core.version> <!--it up to version of jasperreport engine--> <woodstox.core.version>5.0.3</woodstox.core.version> <!--it up to version of jasperreport engine-->
<json.version>20171018</json.version> <!--it up to version of jackson-datatype-json-org--> <json.version>20171018</json.version> <!--it up to version of jackson-datatype-json-org-->
<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.2</xml.ws.version>
<xml.ws.export.version>2.4</xml.ws.export.version> <xml.ws.export.version>2.4</xml.ws.export.version>
<apache.cxf.version>3.2.6</apache.cxf.version> <apache.cxf.version>3.2.6</apache.cxf.version>
<apache.cxf.databinding.version>3.1.17</apache.cxf.databinding.version> <apache.cxf.databinding.version>3.1.17</apache.cxf.databinding.version>
@ -427,12 +427,15 @@
</artifact> </artifact>
<artifact> <artifact>
<!-- better javax.activation:javax.activation-api because include extra package --> <!-- better javax.activation:javax.activation-api because include extra package -->
<!--https://github.com/eclipse-ee4j/jaf
https://eclipse-ee4j.github.io/jaf/-->
<id>com.sun.activation:jakarta.activation:jar:${activation.version}</id> <id>com.sun.activation:jakarta.activation:jar:${activation.version}</id>
<source>true</source> <source>true</source>
<transitive>false</transitive> <transitive>false</transitive>
</artifact> </artifact>
<artifact> <artifact>
<id>javax.xml.bind:jaxb-api:jar:${xml.ws.version}</id> <!--https://github.com/eclipse-ee4j/jaxb-api/issues/78#issuecomment-457133266-->
<id>jakarta.xml.bind:jakarta.xml.bind-api:jar:${xml.ws.version}</id>
<source>true</source> <source>true</source>
<transitive>false</transitive> <transitive>false</transitive>
</artifact> </artifact>
@ -452,34 +455,10 @@
<transitive>false</transitive> <transitive>false</transitive>
</artifact> </artifact>
<artifact> <artifact>
<id>javax.xml.ws:jaxws-api:jar:${xml.ws.version}</id> <!--https://github.com/eclipse-ee4j/jaxb-api/issues/78#issuecomment-446898628-->
<id>com.sun.xml.bind:jaxb-osgi:jar:${xml.ws.version}</id>
<source>true</source> <source>true</source>
<transitive>false</transitive> <transitive>false</transitive>
<override>true</override>
<instructions>
<Bundle-SymbolicName>jaxws-api</Bundle-SymbolicName>
<Bundle-Version>${xml.ws.version}</Bundle-Version>
<!--Export-Package keep same original, copy here because tool will remake it-->
<Export-Package>javax.xml.ws;version="${xml.ws.export.version}";uses:="javax.xml.bind,javax.xml.bind.anno
tation,javax.xml.namespace,javax.xml.transform,javax.xml.ws.handler,j
avax.xml.ws.spi,javax.xml.ws.spi.http,org.w3c.dom",javax.xml.ws.handl
er;version="${xml.ws.export.version}";uses:="javax.xml.namespace,javax.xml.ws",javax.xml.ws.handler.soap
;version="${xml.ws.export.version}";uses:="javax.xml.bind,javax.xml.namespace,javax.xml.soap,javax.xml.w
s.handler",javax.xml.ws.http;version="${xml.ws.export.version}";uses:="javax.xml.ws",javax.xml.ws.soap;version="${xml.ws.export.version}";u
ses:="javax.xml.soap,javax.xml.ws,javax.xml.ws.spi",javax.xml.ws.spi;version="${xml.ws.export.version}";
uses:="javax.xml.bind,javax.xml.namespace,javax.xml.transform,javax.x
ml.ws,javax.xml.ws.handler,javax.xml.ws.wsaddressing,org.w3c.dom",jav
ax.xml.ws.spi.http;version="${xml.ws.export.version}",javax.xml.ws.wsaddressing;version="${xml.ws.export.version}";uses:="javax.xml.bind.an
notation,javax.xml.namespace,javax.xml.transform,javax.xml.ws,org.w3c
.dom"</Export-Package>
<!--keep same original, copy here because tool will remake it-->
<DynamicImport-Package>org.glassfish.hk2.osgiresourcelocator</DynamicImport-Package>
<!--refe:note 1-->
<Import-Package>javax.xml.bind;version="[2.3,3)",javax.xml.bind.annota
tion;version="[2.3,3)",javax.xml.namespace,javax.xml.soap;version="[1
.4,2)",javax.xml.transform,javax.xml.transform.stream,org.w3c.dom</Import-Package>
<Require-Capability>osgi.ee;filter:="(&amp;(osgi.ee=JavaSE)(version=9.0))"</Require-Capability>
</instructions>
</artifact> </artifact>
<artifact> <artifact>
<id>javax.interceptor:javax.interceptor-api:jar:1.2.2</id> <id>javax.interceptor:javax.interceptor-api:jar:1.2.2</id>
@ -632,12 +611,13 @@
<transitive>false</transitive> <transitive>false</transitive>
</artifact> </artifact>
<artifact> <artifact>
<id>jakarta.ws.rs:jakarta.ws.rs-api:jar:2.1.3</id> <id>jakarta.ws.rs:jakarta.ws.rs-api:jar:2.1.5</id>
<source>true</source> <source>true</source>
<transitive>false</transitive> <transitive>false</transitive>
</artifact> </artifact>
<artifact> <artifact>
<id>javax.jws:javax.jws-api:jar:1.1</id> <!--https://github.com/eclipse-ee4j/jws-api-->
<id>jakarta.jws:jakarta.jws-api:jar:1.1.1</id>
<source>true</source> <source>true</source>
<transitive>false</transitive> <transitive>false</transitive>
</artifact> </artifact>
@ -647,12 +627,14 @@
<transitive>false</transitive> <transitive>false</transitive>
</artifact> </artifact>
<artifact> <artifact>
<!--https://github.com/eclipse-ee4j/jax-rpc-api-->
<id>jakarta.xml.rpc:jakarta.xml.rpc-api:jar:1.1.3</id> <id>jakarta.xml.rpc:jakarta.xml.rpc-api:jar:1.1.3</id>
<source>true</source> <source>true</source>
<transitive>false</transitive> <transitive>false</transitive>
</artifact> </artifact>
<artifact> <artifact>
<id>jakarta.persistence:jakarta.persistence-api:jar:2.2.1</id> <!-- https://github.com/eclipse-ee4j/jpa-api -->
<id>jakarta.persistence:jakarta.persistence-api:jar:2.2.2</id>
<source>true</source> <source>true</source>
<transitive>false</transitive> <transitive>false</transitive>
</artifact> </artifact>
@ -797,24 +779,7 @@
<artifact> <artifact>
<id>org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-web:jar:${springframework.version}</id> <id>org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-web:jar:${springframework.version}</id>
<source>false</source> <source>false</source>
<transitive>false</transitive> <transitive>false</transitive>s
<!--
note 1: about javax.activity,javax.jws and javax.xml.ws
javax.jws is depricate package, so need replace with javax.jws-api
but eclipse auto add \-\-add-modules=ALL-SYSTEM to command line, jdk-10 still have this package so mean jdk have it.
spring-web import javax.jws at option, so when it see javax.jws from jdk it will bind to jdk version
idempiere webservice need to use javax.jws-api to build with tycho and run without add-modules=ALL-SYSTEM
so it make two dependency chains when resolve dependency
solution add version to import javax.jws;version="1.1.0"
to force priority from javax.jws-api
same for javax.xml.ws.*
it also resolve issue confilic between eclipse runtime and tycho build
-->
</artifact> </artifact>
<artifact> <artifact>
<id>org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-context-support:jar:sources:${springframework.version}</id> <id>org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-context-support:jar:sources:${springframework.version}</id>

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="idempiere-190118" sequenceNumber="107"> <?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="idempiere-190302" 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.eclipse.e4.core.tools.feature.source.feature.group" version="4.10.0.v20181116-0958"/> <unit id="org.eclipse.e4.core.tools.feature.source.feature.group" version="4.10.0.v20181116-0958"/>
@ -879,6 +879,53 @@
<unit id="org.tukaani.xz.source" version="1.6.0.v20170629-1752"/> <unit id="org.tukaani.xz.source" version="1.6.0.v20170629-1752"/>
<unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/> <unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
</location> </location>
<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="com.sun.istack.commons-runtime" version="3.0.8"/>
<unit id="com.sun.istack.commons-runtime.source" version="3.0.8"/>
<unit id="com.sun.org.apache.xml.internal.resolver" version="20050927.0.0"/>
<unit id="com.sun.org.apache.xml.internal.resolver.source" version="20050927.0.0"/>
<unit id="com.sun.xml.bind.jaxb-impl" version="2.3.2"/>
<unit id="com.sun.xml.bind.jaxb-impl.source" version="2.3.2"/>
<unit id="com.sun.xml.fastinfoset.FastInfoset" version="1.2.16"/>
<unit id="com.sun.xml.fastinfoset.FastInfoset.source" version="1.2.16"/>
<unit id="com.sun.xml.messaging.saaj.impl" version="1.5.1"/>
<unit id="com.sun.xml.messaging.saaj.impl.source" version="1.5.1"/>
<unit id="com.sun.xml.stream.buffer.streambuffer" version="1.5.7"/>
<unit id="com.sun.xml.stream.buffer.streambuffer.source" version="1.5.7"/>
<unit id="com.sun.xml.ws.jaxws-rt" version="2.3.2"/>
<unit id="com.sun.xml.ws.jaxws-rt.source" version="2.3.2"/>
<unit id="com.sun.xml.ws.policy" version="2.7.6"/>
<unit id="com.sun.xml.ws.policy.source" version="2.7.6"/>
<unit id="jakarta.jws-api" version="1.1.1"/>
<unit id="jakarta.jws-api.source" version="1.1.1"/>
<unit id="jakarta.xml.bind-api" version="2.3.2"/>
<unit id="jakarta.xml.bind-api.source" version="2.3.2"/>
<unit id="jakarta.xml.soap-api" version="1.4.1"/>
<unit id="jakarta.xml.soap-api.source" version="1.4.1"/>
<unit id="jakarta.xml.ws-api" version="2.3.2"/>
<unit id="jakarta.xml.ws-api.source" version="2.3.2"/>
<unit id="javax.interceptor-api" version="1.2.2"/>
<unit id="javax.interceptor-api.source" version="1.2.2"/>
<unit id="org.glassfish.external.management-api" version="3.2.1"/>
<unit id="org.glassfish.external.management-api.source" version="3.2.1"/>
<unit id="org.glassfish.gmbal.gmbal" version="4.0.0"/>
<unit id="org.glassfish.gmbal.gmbal.source" version="4.0.0"/>
<unit id="org.glassfish.ha.ha-api" version="3.1.12"/>
<unit id="org.glassfish.ha.ha-api.source" version="3.1.12"/>
<unit id="org.glassfish.pfl.pfl-asm" version="4.0.1"/>
<unit id="org.glassfish.pfl.pfl-asm.source" version="4.0.1"/>
<unit id="org.glassfish.pfl.pfl-basic" version="4.0.1"/>
<unit id="org.glassfish.pfl.pfl-basic.source" version="4.0.1"/>
<unit id="org.glassfish.pfl.pfl-dynamic" version="4.0.1"/>
<unit id="org.glassfish.pfl.pfl-dynamic.source" version="4.0.1"/>
<unit id="org.glassfish.pfl.pfl-tf" version="4.0.1"/>
<unit id="org.glassfish.pfl.pfl-tf.source" version="4.0.1"/>
<unit id="org.jvnet.mimepull" version="1.9.11"/>
<unit id="org.jvnet.mimepull.source" version="1.9.11"/>
<unit id="org.jvnet.staxex.stax-ex" version="1.8.1"/>
<unit id="org.jvnet.staxex.stax-ex.source" version="1.8.1"/>
<repository location="https://raw.githubusercontent.com/idempiere/binary.file/master/p2.maven/org.idempiere.webservice.client-p2-R20190302"/>
</location>
<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit"> <location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="bcmail" version="1.60.0"/> <unit id="bcmail" version="1.60.0"/>
<unit id="bcmail.source" version="1.60.0"/> <unit id="bcmail.source" version="1.60.0"/>
@ -934,10 +981,12 @@
<unit id="com.sun.mail.smtp.source" version="1.6.3"/> <unit id="com.sun.mail.smtp.source" version="1.6.3"/>
<unit id="com.sun.xml.bind.jaxb-core" version="2.3.0.1"/> <unit id="com.sun.xml.bind.jaxb-core" version="2.3.0.1"/>
<unit id="com.sun.xml.bind.jaxb-core.source" version="2.3.0.1"/> <unit id="com.sun.xml.bind.jaxb-core.source" version="2.3.0.1"/>
<unit id="com.sun.xml.bind.jaxb-impl" version="2.3.1"/> <unit id="com.sun.xml.bind.jaxb-impl" version="2.3.2"/>
<unit id="com.sun.xml.bind.jaxb-impl.source" version="2.3.1"/> <unit id="com.sun.xml.bind.jaxb-impl.source" version="2.3.2"/>
<unit id="com.sun.xml.ws.jaxws-rt" version="2.3.1"/> <unit id="com.sun.xml.bind.jaxb-osgi" version="2.3.2"/>
<unit id="com.sun.xml.ws.jaxws-rt.source" version="2.3.1"/> <unit id="com.sun.xml.bind.jaxb-osgi.source" version="2.3.2"/>
<unit id="com.sun.xml.ws.jaxws-rt" version="2.3.2"/>
<unit id="com.sun.xml.ws.jaxws-rt.source" version="2.3.2"/>
<unit id="groovy" version="2.5.3"/> <unit id="groovy" version="2.5.3"/>
<unit id="groovy-ant" version="2.5.3"/> <unit id="groovy-ant" version="2.5.3"/>
<unit id="groovy-ant.source" version="2.5.3"/> <unit id="groovy-ant.source" version="2.5.3"/>
@ -974,36 +1023,34 @@
<unit id="groovy-xml" version="2.5.3"/> <unit id="groovy-xml" version="2.5.3"/>
<unit id="groovy-xml.source" version="2.5.3"/> <unit id="groovy-xml.source" version="2.5.3"/>
<unit id="groovy.source" version="2.5.3"/> <unit id="groovy.source" version="2.5.3"/>
<unit id="jakarta.jws-api" version="1.1.1"/>
<unit id="jakarta.jws-api.source" version="1.1.1"/>
<unit id="jakarta.mail.api" version="1.6.3"/> <unit id="jakarta.mail.api" version="1.6.3"/>
<unit id="jakarta.mail.api.source" version="1.6.3"/> <unit id="jakarta.mail.api.source" version="1.6.3"/>
<unit id="jakarta.persistence-api" version="2.2.2"/>
<unit id="jakarta.persistence-api.source" version="2.2.2"/>
<unit id="jakarta.ws.rs-api" version="2.1.5"/>
<unit id="jakarta.ws.rs-api.source" version="2.1.5"/>
<unit id="jakarta.xml.bind-api" version="2.3.2"/>
<unit id="jakarta.xml.bind-api.source" version="2.3.2"/>
<unit id="javax.annotation-api" version="1.3.3"/> <unit id="javax.annotation-api" version="1.3.3"/>
<unit id="javax.annotation-api.source" version="1.3.3"/> <unit id="javax.annotation-api.source" version="1.3.3"/>
<unit id="javax.enterprise.cdi-api" version="2.0.0.SP1"/> <unit id="javax.enterprise.cdi-api" version="2.0.0.SP1"/>
<unit id="javax.enterprise.cdi-api.source" version="2.0.0.SP1"/> <unit id="javax.enterprise.cdi-api.source" version="2.0.0.SP1"/>
<unit id="javax.interceptor-api" version="1.2.2"/> <unit id="javax.interceptor-api" version="1.2.2"/>
<unit id="javax.interceptor-api.source" version="1.2.2"/> <unit id="javax.interceptor-api.source" version="1.2.2"/>
<unit id="javax.jws-api" version="1.1.0"/>
<unit id="javax.jws-api.source" version="1.1.0"/>
<unit id="javax.persistence-api" version="2.2.99.b01"/>
<unit id="javax.persistence-api.source" version="2.2.99.b01"/>
<unit id="javax.transaction-api" version="1.3.0"/> <unit id="javax.transaction-api" version="1.3.0"/>
<unit id="javax.transaction-api.source" version="1.3.0"/> <unit id="javax.transaction-api.source" version="1.3.0"/>
<unit id="javax.validation.api" version="1.1.0.Final"/> <unit id="javax.validation.api" version="1.1.0.Final"/>
<unit id="javax.validation.api.source" version="1.1.0.Final"/> <unit id="javax.validation.api.source" version="1.1.0.Final"/>
<unit id="javax.websocket-api" version="1.1.0"/> <unit id="javax.websocket-api" version="1.1.0"/>
<unit id="javax.websocket-api.source" version="1.1.0"/> <unit id="javax.websocket-api.source" version="1.1.0"/>
<unit id="javax.ws.rs-api" version="2.1.3"/>
<unit id="javax.ws.rs-api.source" version="2.1.3"/>
<unit id="javax.ws.rs.jsr311-api" version="1.1.1"/> <unit id="javax.ws.rs.jsr311-api" version="1.1.1"/>
<unit id="javax.ws.rs.jsr311-api.source" version="1.1.1"/> <unit id="javax.ws.rs.jsr311-api.source" version="1.1.1"/>
<unit id="javax.xml.rpc-api" version="1.1.3"/> <unit id="javax.xml.rpc-api" version="1.1.3"/>
<unit id="javax.xml.rpc-api.source" version="1.1.3"/> <unit id="javax.xml.rpc-api.source" version="1.1.3"/>
<unit id="javax.xml.soap-api" version="1.4.0"/> <unit id="javax.xml.soap-api" version="1.4.0"/>
<unit id="javax.xml.soap-api.source" version="1.4.0"/> <unit id="javax.xml.soap-api.source" version="1.4.0"/>
<unit id="jaxb-api" version="2.3.1"/>
<unit id="jaxb-api.source" version="2.3.1"/>
<unit id="jaxws-api" version="2.3.1"/>
<unit id="jaxws-api.source" version="2.3.1"/>
<unit id="joda-time" version="2.10.0"/> <unit id="joda-time" version="2.10.0"/>
<unit id="joda-time.source" version="2.10.0"/> <unit id="joda-time.source" version="2.10.0"/>
<unit id="json" version="20171018.0.0"/> <unit id="json" version="20171018.0.0"/>
@ -1113,6 +1160,7 @@
<unit id="org.apache.poi.poi" version="3.15.0"/> <unit id="org.apache.poi.poi" version="3.15.0"/>
<unit id="org.apache.poi.poi-ooxml" version="3.15.0"/> <unit id="org.apache.poi.poi-ooxml" version="3.15.0"/>
<unit id="org.apache.poi.poi-ooxml-schemas" version="3.15.0"/> <unit id="org.apache.poi.poi-ooxml-schemas" version="3.15.0"/>
<unit id="org.apache.poi.poi-ooxml-schemas.source" version="3.15.0"/>
<unit id="org.apache.poi.poi-ooxml.source" version="3.15.0"/> <unit id="org.apache.poi.poi-ooxml.source" version="3.15.0"/>
<unit id="org.apache.poi.poi.source" version="3.15.0"/> <unit id="org.apache.poi.poi.source" version="3.15.0"/>
<unit id="org.apache.servicemix.bundles.cglib" version="3.2.6.1"/> <unit id="org.apache.servicemix.bundles.cglib" version="3.2.6.1"/>
@ -1301,54 +1349,7 @@
<unit id="zul.sources" version="8.6.0.1-patched"/> <unit id="zul.sources" version="8.6.0.1-patched"/>
<unit id="zweb" version="8.6.0.1"/> <unit id="zweb" version="8.6.0.1"/>
<unit id="zweb.sources" version="8.6.0.1"/> <unit id="zweb.sources" version="8.6.0.1"/>
<repository location="https://raw.githubusercontent.com/idempiere/binary.file/master/p2.maven/maven-p2-R20190118"/> <repository location="https://raw.githubusercontent.com/idempiere/binary.file/master/p2.maven/maven-p2-R20190302"/>
</location>
<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="com.sun.istack.commons-runtime" version="3.0.8"/>
<unit id="com.sun.istack.commons-runtime.source" version="3.0.8"/>
<unit id="com.sun.org.apache.xml.internal.resolver" version="20050927.0.0"/>
<unit id="com.sun.org.apache.xml.internal.resolver.source" version="20050927.0.0"/>
<unit id="com.sun.xml.bind.jaxb-impl" version="2.3.2"/>
<unit id="com.sun.xml.bind.jaxb-impl.source" version="2.3.2"/>
<unit id="com.sun.xml.fastinfoset.FastInfoset" version="1.2.16"/>
<unit id="com.sun.xml.fastinfoset.FastInfoset.source" version="1.2.16"/>
<unit id="com.sun.xml.messaging.saaj.impl" version="1.5.1"/>
<unit id="com.sun.xml.messaging.saaj.impl.source" version="1.5.1"/>
<unit id="com.sun.xml.stream.buffer.streambuffer" version="1.5.7"/>
<unit id="com.sun.xml.stream.buffer.streambuffer.source" version="1.5.7"/>
<unit id="com.sun.xml.ws.jaxws-rt" version="2.3.2"/>
<unit id="com.sun.xml.ws.jaxws-rt.source" version="2.3.2"/>
<unit id="com.sun.xml.ws.policy" version="2.7.6"/>
<unit id="com.sun.xml.ws.policy.source" version="2.7.6"/>
<unit id="jakarta.jws-api" version="1.1.1"/>
<unit id="jakarta.jws-api.source" version="1.1.1"/>
<unit id="jakarta.xml.bind-api" version="2.3.2"/>
<unit id="jakarta.xml.bind-api.source" version="2.3.2"/>
<unit id="jakarta.xml.soap-api" version="1.4.1"/>
<unit id="jakarta.xml.soap-api.source" version="1.4.1"/>
<unit id="jakarta.xml.ws-api" version="2.3.2"/>
<unit id="jakarta.xml.ws-api.source" version="2.3.2"/>
<unit id="javax.interceptor-api" version="1.2.2"/>
<unit id="javax.interceptor-api.source" version="1.2.2"/>
<unit id="org.glassfish.external.management-api" version="3.2.1"/>
<unit id="org.glassfish.external.management-api.source" version="3.2.1"/>
<unit id="org.glassfish.gmbal.gmbal" version="4.0.0"/>
<unit id="org.glassfish.gmbal.gmbal.source" version="4.0.0"/>
<unit id="org.glassfish.ha.ha-api" version="3.1.12"/>
<unit id="org.glassfish.ha.ha-api.source" version="3.1.12"/>
<unit id="org.glassfish.pfl.pfl-asm" version="4.0.1"/>
<unit id="org.glassfish.pfl.pfl-asm.source" version="4.0.1"/>
<unit id="org.glassfish.pfl.pfl-basic" version="4.0.1"/>
<unit id="org.glassfish.pfl.pfl-basic.source" version="4.0.1"/>
<unit id="org.glassfish.pfl.pfl-dynamic" version="4.0.1"/>
<unit id="org.glassfish.pfl.pfl-dynamic.source" version="4.0.1"/>
<unit id="org.glassfish.pfl.pfl-tf" version="4.0.1"/>
<unit id="org.glassfish.pfl.pfl-tf.source" version="4.0.1"/>
<unit id="org.jvnet.mimepull" version="1.9.11"/>
<unit id="org.jvnet.mimepull.source" version="1.9.11"/>
<unit id="org.jvnet.staxex.stax-ex" version="1.8.1"/>
<unit id="org.jvnet.staxex.stax-ex.source" version="1.8.1"/>
<repository location="https://raw.githubusercontent.com/idempiere/binary.file/master/p2.maven/org.idempiere.webservice.client-p2-R20190302"/>
</location> </location>
</locations> </locations>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>

View File

@ -88,10 +88,8 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
org.springframework.spring-jcl;bundle-version="5.1.1", org.springframework.spring-jcl;bundle-version="5.1.1",
org.apache.servicemix.bundles.spring-web, org.apache.servicemix.bundles.spring-web,
org.apache.cxf.cxf-rt-rs-extension-providers;bundle-version="3.1.17", 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", org.apache.axis;bundle-version="1.4.0",
javax.xml.soap;bundle-version="1.3.0", javax.xml.soap;bundle-version="1.3.0",
jaxws-api;bundle-version="2.3.1",
javax.annotation-api;bundle-version="1.3.2", javax.annotation-api;bundle-version="1.3.2",
org.glassfish.jersey.core.jersey-common;bundle-version="2.22.1", org.glassfish.jersey.core.jersey-common;bundle-version="2.22.1",
org.apache.cxf.cxf-rt-rs-service-description;bundle-version="3.2.6", org.apache.cxf.cxf-rt-rs-service-description;bundle-version="3.2.6",
@ -100,7 +98,8 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
org.glassfish.hk2.locator;bundle-version="2.5.0", org.glassfish.hk2.locator;bundle-version="2.5.0",
org.glassfish.hk2.utils;bundle-version="2.5.0", org.glassfish.hk2.utils;bundle-version="2.5.0",
org.glassfish.jersey.bundles.repackaged.jersey-guava;bundle-version="2.22.1", org.glassfish.jersey.bundles.repackaged.jersey-guava;bundle-version="2.22.1",
javax.ws.rs-api;bundle-version="2.1.3" jakarta.ws.rs-api;bundle-version="2.1.5",
jakarta.xml.ws-api;bundle-version="2.3.2"
Bundle-ClassPath: ., Bundle-ClassPath: .,
WEB-INF/lib/idempiere-xmlbeans.jar WEB-INF/lib/idempiere-xmlbeans.jar
Export-Package: org.compiere.model, Export-Package: org.compiere.model,