IDEMPIERE-3798:Move iDempiere default branch to openjdk 10 (update lib)
spring, service, xml http://openjdk.java.net/jeps/320
This commit is contained in:
hieplq
parent
1c5a89128b
commit
6bc86a754c
|
|
@ -162,20 +162,6 @@
|
|||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="javax.xml.rpc"
|
||||
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"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="javax.xml.stream"
|
||||
download-size="0"
|
||||
|
|
|
|||
|
|
@ -123,5 +123,6 @@ Require-Bundle: org.eclipse.equinox.app;bundle-version="0.0.0",
|
|||
net.sf.supercsv.super-csv;bundle-version="0.0.0",
|
||||
bcprov;bundle-version="1.54.0",
|
||||
org.krysalis.barcode4j;bundle-version="0.0.0",
|
||||
groovy
|
||||
groovy,
|
||||
javax.xml;bundle-version="1.3.4"
|
||||
Automatic-Module-Name: org.adempiere.base
|
||||
|
|
|
|||
|
|
@ -31,13 +31,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.apache.servicemix.bundles.cglib"
|
||||
download-size="0"
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
|
||||
<stringAttribute key="pde.version" value="3.3"/>
|
||||
<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.javax.activation@default:default,com.sun.mail.javax.mail@default:default,groovy@default:default,javax.annotation-api@default:default,javax.jms@default:default,javax.transaction@default:default,javax.xml.rpc@default:default,javax.xml.soap@default:default,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@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.100.v20180827-1536@-1:true,org.eclipse.osgi.compatibility.state@default:default,org.eclipse.osgi.services*3.7.100.v20180827-1536@default:default,org.eclipse.osgi.util*3.5.100.v20180827-1536@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.3.2.v20150501-1520@default:default,slf4j.api@default:default,slf4j.jcl@default:default"/>
|
||||
<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.javax.activation@default:default,com.sun.mail.javax.mail@default:default,groovy@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@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.100.v20180827-1536@-1:true,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services*3.7.100.v20180827-1536@default:default,org.eclipse.osgi.util*3.5.100.v20180827-1536@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.3.2.v20150501-1520@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"/>
|
||||
<booleanAttribute key="show_selected_only" value="false"/>
|
||||
<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
|
||||
|
|
|
|||
|
|
@ -13,8 +13,6 @@
|
|||
<classpathentry exported="true" kind="lib" path="lib/jasperreports-fonts.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="lib/jasperreports-functions.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="lib/olap4j.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="lib/spring-beans.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="lib/spring-core.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="lib/xmpcore.jar"/>
|
||||
<classpathentry kind="output" path="target/classes"/>
|
||||
</classpath>
|
||||
|
|
|
|||
|
|
@ -13,8 +13,6 @@ Bundle-ClassPath: .,
|
|||
lib/jasperreports-fonts.jar,
|
||||
lib/jasperreports-functions.jar,
|
||||
lib/olap4j.jar,
|
||||
lib/spring-beans.jar,
|
||||
lib/spring-core.jar,
|
||||
lib/xmpcore.jar
|
||||
DynamicImport-Package: *
|
||||
Import-Package: org.w3c.dom.events;version="[3.0.0,4.0.0)"
|
||||
|
|
|
|||
|
|
@ -7,6 +7,4 @@ bin.includes = META-INF/,\
|
|||
lib/jasperreports-fonts.jar,\
|
||||
lib/jasperreports-functions.jar,\
|
||||
lib/olap4j.jar,\
|
||||
lib/spring-beans.jar,\
|
||||
lib/spring-core.jar,\
|
||||
lib/xmpcore.jar
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -32,8 +32,6 @@ osgi.bundles=org.eclipse.equinox.ds@1:start,\
|
|||
org.apache.commons.logging,\
|
||||
org.eclipse.osgi,\
|
||||
org.eclipse.osgi.services,\
|
||||
javax.xml.rpc,\
|
||||
javax.xml.soap,\
|
||||
javax.xml,\
|
||||
org.apache.activemq.activemq-core,\
|
||||
org.apache.activemq.kahadb,\
|
||||
|
|
|
|||
|
|
@ -260,4 +260,39 @@
|
|||
version="0.0.0"
|
||||
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
|
||||
id="javax.xml.soap-api"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="javax.xml.rpc-api"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
</feature>
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@
|
|||
<slf4j.version>1.7.25</slf4j.version>
|
||||
<xml.ws.version>2.3.1</xml.ws.version>
|
||||
<apache.cxf.version>3.2.6</apache.cxf.version>
|
||||
<spring.version>5.1.1.RELEASE</spring.version>
|
||||
</properties>
|
||||
|
||||
<repositories>
|
||||
|
|
@ -397,7 +398,7 @@
|
|||
<transitive>false</transitive>
|
||||
</artifact>
|
||||
<artifact>
|
||||
<id>com.sun.activation:javax.activation:jar:1.2.0</id>
|
||||
<id>javax.activation:javax.activation-api:jar:1.2.0</id>
|
||||
<source>true</source>
|
||||
<transitive>false</transitive>
|
||||
</artifact>
|
||||
|
|
@ -523,11 +524,36 @@
|
|||
<source>true</source>
|
||||
<transitive>false</transitive>
|
||||
</artifact>
|
||||
<artifact>
|
||||
<id>javax.xml.soap:javax.xml.soap-api:jar:1.4.0</id>
|
||||
<source>true</source>
|
||||
<transitive>false</transitive>
|
||||
</artifact>
|
||||
<artifact>
|
||||
<id>javax.xml.rpc:javax.xml.rpc-api:jar:1.1.1</id>
|
||||
<source>true</source>
|
||||
<transitive>false</transitive>
|
||||
</artifact>
|
||||
<artifact>
|
||||
<id>org.codehaus.woodstox:stax2-api:jar:4.1</id>
|
||||
<source>true</source>
|
||||
<transitive>false</transitive>
|
||||
</artifact>
|
||||
<artifact>
|
||||
<id>org.springframework:spring-beans:jar:${spring.version}</id>
|
||||
<source>true</source>
|
||||
<transitive>false</transitive>
|
||||
</artifact>
|
||||
<artifact>
|
||||
<id>org.springframework:spring-core:jar:${spring.version}</id>
|
||||
<source>true</source>
|
||||
<transitive>false</transitive>
|
||||
</artifact>
|
||||
<artifact>
|
||||
<id>org.springframework:spring-jcl:jar:${spring.version}</id>
|
||||
<source>true</source>
|
||||
<transitive>false</transitive>
|
||||
</artifact>
|
||||
</artifacts>
|
||||
</feature>
|
||||
<!-- zk public zk osgi on zip format download from sourceforge, so
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="idempiere-181018" sequenceNumber="107">
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="idempiere-181023" 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"/>
|
||||
|
|
@ -806,8 +806,6 @@
|
|||
<unit id="com.itextpdf.source" version="5.5.13"/>
|
||||
<unit id="com.jaspersoft.studio.bundles.barbecue" version="1.5.0.beta1_b02"/>
|
||||
<unit id="com.jaspersoft.studio.bundles.itext" version="2.1.7.js6_b02"/>
|
||||
<unit id="com.sun.activation.javax.activation" version="1.2.0"/>
|
||||
<unit id="com.sun.activation.javax.activation.source" version="1.2.0"/>
|
||||
<unit id="com.sun.mail.javax.mail" version="1.6.2"/>
|
||||
<unit id="com.sun.mail.javax.mail.source" version="1.6.2"/>
|
||||
<unit id="com.sun.xml.bind.jaxb-core" version="2.3.0.1"/>
|
||||
|
|
@ -1027,6 +1025,18 @@
|
|||
<unit id="stax2-api.source" version="4.1.0"/>
|
||||
<unit id="javax.jws-api" version="1.1.0"/>
|
||||
<unit id="javax.jws-api.source" version="1.1.0"/>
|
||||
<unit id="javax.xml.soap-api" version="1.4.0"/>
|
||||
<unit id="javax.xml.soap-api.source" version="1.4.0"/>
|
||||
<unit id="org.springframework.spring-beans" version="5.1.1.RELEASE"/>
|
||||
<unit id="org.springframework.spring-beans.source" version="5.1.1.RELEASE"/>
|
||||
<unit id="org.springframework.spring-core" version="5.1.1.RELEASE"/>
|
||||
<unit id="org.springframework.spring-core.source" version="5.1.1.RELEASE"/>
|
||||
<unit id="org.springframework.spring-jcl" version="5.1.1.RELEASE"/>
|
||||
<unit id="org.springframework.spring-jcl.source" version="5.1.1.RELEASE"/>
|
||||
<unit id="javax.xml.rpc-api" version="1.1.1"/>
|
||||
<unit id="javax.xml.rpc-api.source" version="1.1.1"/>
|
||||
<unit id="javax.activation-api" version="1.2.0"/>
|
||||
<unit id="javax.activation-api.source" version="1.2.0"/>
|
||||
</location>
|
||||
</locations>
|
||||
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-10"/>
|
||||
|
|
|
|||
|
|
@ -8,8 +8,6 @@ Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
|
|||
Service-Component: OSGI-INF/ws_modelfactory.xml
|
||||
Import-Package: javax.activation,
|
||||
javax.annotation,
|
||||
javax.jws,
|
||||
javax.jws.soap,
|
||||
javax.mail;version="1.4.1",
|
||||
javax.mail.internet;version="1.5",
|
||||
javax.servlet;version="3.0.0",
|
||||
|
|
@ -21,9 +19,6 @@ Import-Package: javax.activation,
|
|||
javax.xml.rpc.holders,
|
||||
javax.xml.rpc.server,
|
||||
javax.xml.rpc.soap,
|
||||
javax.xml.soap;version="1.3.0",
|
||||
javax.xml.ws,
|
||||
javax.xml.ws.handler,
|
||||
net.sf.jasperreports.engine,
|
||||
net.sf.jasperreports.engine.base,
|
||||
net.sf.jasperreports.engine.util,
|
||||
|
|
@ -71,11 +66,20 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
|
|||
org.apache.cxf.cxf-core;bundle-version="3.2.6",
|
||||
org.apache.neethi;bundle-version="3.1.1",
|
||||
org.apache.ws.xmlschema.core;bundle-version="2.2.3",
|
||||
org.apache.cxf.cxf-rt-frontend-jaxws;bundle-version="3.2.6",
|
||||
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-jaxrs;bundle-version="3.2.6",
|
||||
org.apache.cxf.cxf-rt-frontend-jaxws;bundle-version="3.2.6",
|
||||
org.apache.cxf.cxf-rt-bindings-soap;bundle-version="3.2.6",
|
||||
org.apache.cxf.cxf-rt-bindings-xml;bundle-version="3.2.6",
|
||||
org.apache.cxf.cxf-rt-databinding-jaxb;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-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"
|
||||
Bundle-ClassPath: .,
|
||||
WEB-INF/lib/aopalliance.jar,
|
||||
WEB-INF/lib/axis.jar,
|
||||
|
|
|
|||
Loading…
Reference in New Issue