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 (update lib) 

spring to osgi, deduce install configuration
This commit is contained in:
hieplq 2018-10-24 08:48:02 +07:00
parent 6bc86a754c
commit 2d6d70ef06
11 changed files with 104 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -364,13 +364,6 @@
version="0.0.0"
unpack="false"/>
<plugin
id="com.sun.activation.javax.activation"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="jaxws-api"
download-size="0"
@ -512,4 +505,11 @@
version="0.0.0"
unpack="false"/>
<plugin
id="com.sun.activation.javax.activation"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature>

2
org.adempiere.install/install.app.launch
View File

@ -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: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_target_plugins" value="bcpkix@default:default,bcprov@default:default,com.itextpdf@default:default,com.jaspersoft.studio.bundles.barbecue@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"/>

10
org.adempiere.report.jasper.library/pom.xml
View File

@ -53,16 +53,6 @@
<artifactId>olap4j</artifactId>
<version>0.9.7.309-JS-3</version>
</artifactItem>
<artifactItem>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>2.5</version>
</artifactItem>
<artifactItem>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>2.5</version>
</artifactItem>
<artifactItem>
<groupId>com.adobe.xmp</groupId>
<artifactId>xmpcore</artifactId>

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

File diff suppressed because one or more lines are too long

1
org.adempiere.server-feature/setup/configuration/config.ini
View File

@ -55,7 +55,6 @@ osgi.bundles=org.eclipse.equinox.ds@1:start,\
org.passay,\
groovy,\
org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec,\
com.sun.activation.javax.activation,\
jaxb-api,\
org.eclipse.osgi@start
osgi.framework.extensions=

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

@ -295,4 +295,39 @@
version="0.0.0"
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
id="com.sun.activation.javax.activation"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature>

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

@ -28,7 +28,6 @@
<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>
@ -398,7 +397,8 @@
<transitive>false</transitive>
</artifact>
<artifact>
<id>javax.activation:javax.activation-api:jar:1.2.0</id>
<!-- better javax.activation:javax.activation-api because include extra package -->
<id>com.sun.activation:javax.activation:jar:1.2.0</id>
<source>true</source>
<transitive>false</transitive>
</artifact>
@ -540,17 +540,37 @@
<transitive>false</transitive>
</artifact>
<artifact>
<id>org.springframework:spring-beans:jar:${spring.version}</id>
<id>org.springframework:spring-beans:jar:${springframework.version}</id>
<source>true</source>
<transitive>false</transitive>
</artifact>
<artifact>
<id>org.springframework:spring-core:jar:${spring.version}</id>
<id>org.springframework:spring-core:jar:${springframework.version}</id>
<source>true</source>
<transitive>false</transitive>
</artifact>
<artifact>
<id>org.springframework:spring-jcl:jar:${spring.version}</id>
<id>org.springframework:spring-jcl:jar:${springframework.version}</id>
<source>true</source>
<transitive>false</transitive>
</artifact>
<artifact>
<id>org.springframework:spring-context:jar:${springframework.version}</id>
<source>true</source>
<transitive>false</transitive>
</artifact>
<artifact>
<id>org.springframework:spring-expression:jar:${springframework.version}</id>
<source>true</source>
<transitive>false</transitive>
</artifact>
<artifact>
<id>org.springframework:spring-aop:jar:${springframework.version}</id>
<source>true</source>
<transitive>false</transitive>
</artifact>
<artifact>
<id>org.springframework:spring-web:jar:${springframework.version}</id>
<source>true</source>
<transitive>false</transitive>
</artifact>

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

@ -806,6 +806,8 @@
<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"/>
@ -856,6 +858,8 @@
<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.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.transaction-api" version="1.3.0"/>
<unit id="javax.transaction-api.source" version="1.3.0"/>
<unit id="javax.validation.api" version="1.1.0.Final"/>
@ -866,6 +870,10 @@
<unit id="javax.ws.rs-api.source" version="2.1.99.b01"/>
<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.xml.rpc-api" version="1.1.1"/>
<unit id="javax.xml.rpc-api.source" version="1.1.1"/>
<unit id="javax.xml.soap-api" 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="0.0.0"/>
@ -993,6 +1001,20 @@
<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.spring-aop" version="5.1.1.RELEASE"/>
<unit id="org.springframework.spring-aop.source" version="5.1.1.RELEASE"/>
<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-context" version="5.1.1.RELEASE"/>
<unit id="org.springframework.spring-context.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-expression" version="5.1.1.RELEASE"/>
<unit id="org.springframework.spring-expression.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="org.springframework.spring-web" version="5.1.1.RELEASE"/>
<unit id="org.springframework.spring-web.source" version="5.1.1.RELEASE"/>
<unit id="org.w3c.dom.svg.patch" version="1.1.0.b02"/>
<unit id="slf4j.api" version="1.7.25"/>
<unit id="slf4j.api.source" version="1.7.25"/>
@ -1001,7 +1023,9 @@
<unit id="slf4j.jdk14" version="1.7.25"/>
<unit id="slf4j.jdk14.source" version="1.7.25"/>
<unit id="stax2-api" version="3.1.4"/>
<unit id="stax2-api" version="4.1.0"/>
<unit id="stax2-api.source" version="3.1.4"/>
<unit id="stax2-api.source" version="4.1.0"/>
<unit id="zcommon" version="8.5.0"/>
<unit id="zcommon.sources" version="8.5.0"/>
<unit id="zel" version="8.5.0"/>
@ -1020,23 +1044,7 @@
<unit id="zul.sources" version="8.5.0"/>
<unit id="zweb" 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"/>
<unit id="stax2-api" version="4.1.0"/>
<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"/>
<repository location="file:/home/hieplq/1Dev/project/native/idempiere-dev-11/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/target/repository/"/>
</location>
</locations>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-10"/>

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

@ -79,17 +79,18 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
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"
javax.xml.soap-api;bundle-version="1.4.0",
org.springframework.spring-aop;bundle-version="5.1.1",
org.springframework.spring-beans;bundle-version="5.1.1",
org.springframework.spring-context;bundle-version="5.1.1",
org.springframework.spring-core;bundle-version="5.1.1",
org.springframework.spring-expression;bundle-version="5.1.1",
org.springframework.spring-jcl;bundle-version="5.1.1",
org.springframework.spring-web;bundle-version="5.1.1"
Bundle-ClassPath: .,
WEB-INF/lib/aopalliance.jar,
WEB-INF/lib/axis.jar,
WEB-INF/lib/idempiere-xmlbeans.jar,
WEB-INF/lib/spring-aop.jar,
WEB-INF/lib/spring-beans.jar,
WEB-INF/lib/spring-context.jar,
WEB-INF/lib/spring-core.jar,
WEB-INF/lib/spring-expression.jar,
WEB-INF/lib/spring-web.jar,
WEB-INF/lib/xmlbeans.jar
Export-Package: org.apache.axis,
org.apache.axis.attachments,
@ -196,9 +197,7 @@ Export-Package: org.apache.axis,
org.idempiere.adinterface,
org.idempiere.webservices,
org.idempiere.webservices.client,
org.idempiere.webservices.fault,
org.springframework.web.context,
org.springframework.web.util
org.idempiere.webservices.fault
Web-ContextPath: ADInterface
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.idempiere.webservices

6
org.idempiere.webservices/build.properties
View File

@ -9,12 +9,6 @@ bin.includes = META-INF/,\
WEB-INF/lib/aopalliance.jar,\
WEB-INF/lib/axis.jar,\
WEB-INF/lib/idempiere-xmlbeans.jar,\
WEB-INF/lib/spring-aop.jar,\
WEB-INF/lib/spring-beans.jar,\
WEB-INF/lib/spring-context.jar,\
WEB-INF/lib/spring-core.jar,\
WEB-INF/lib/spring-expression.jar,\
WEB-INF/lib/spring-web.jar,\
WEB-INF/lib/xmlbeans.jar
src.includes = WEB-INF/lib/,\
WEB-INF/web.xml,\

30
org.idempiere.webservices/pom.xml
View File

@ -23,36 +23,6 @@
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<version>${springframework.version}</version>
</artifactItem>
<artifactItem>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>${springframework.version}</version>
</artifactItem>
<artifactItem>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${springframework.version}</version>
</artifactItem>
<artifactItem>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>${springframework.version}</version>
</artifactItem>
<artifactItem>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>${springframework.version}</version>
</artifactItem>
<artifactItem>
<groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
<version>${springframework.version}</version>
</artifactItem>
<artifactItem>
<groupId>wsdl4j</groupId>
<artifactId>wsdl4j</artifactId>