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

IDEMPIERE-3946 Upgrade to Tycho 1.4.0

This commit is contained in:
Heng Sin Low 2019-04-11 20:22:24 +08:00
parent 0e4fc3a373
commit bf2b531267
17 changed files with 73 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -160,13 +160,6 @@
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin
id="javax.xml.stream"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin <plugin
id="org.apache.commons.codec" id="org.apache.commons.codec"
download-size="0" download-size="0"
@ -182,7 +175,7 @@
unpack="false"/> unpack="false"/>
<plugin <plugin
id="org.apache.xerces" id="org.apache.servicemix.bundles.xerces"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
@ -195,13 +188,6 @@
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin
id="javax.xml"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin <plugin
id="org.mortbay.jasper.apache-el" id="org.mortbay.jasper.apache-el"
download-size="0" download-size="0"

2
org.adempiere.base/.classpath
View File

@ -11,7 +11,5 @@
<classpathentry exported="true" kind="lib" path="lib/commons-validator.jar"/> <classpathentry exported="true" kind="lib" path="lib/commons-validator.jar"/>
<classpathentry exported="true" kind="lib" path="lib/cron4j.jar"/> <classpathentry exported="true" kind="lib" path="lib/cron4j.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jnlp.jar"/> <classpathentry exported="true" kind="lib" path="lib/jnlp.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jython-engine.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jython.jar"/>
<classpathentry kind="output" path="target/classes"/> <classpathentry kind="output" path="target/classes"/>
</classpath> </classpath>

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

@ -7,9 +7,7 @@ Bundle-ClassPath: .,
lib/bsh.jar, lib/bsh.jar,
lib/commons-validator.jar, lib/commons-validator.jar,
lib/cron4j.jar, lib/cron4j.jar,
lib/jnlp.jar, lib/jnlp.jar
lib/jython-engine.jar,
lib/jython.jar
Export-Package: bsh, Export-Package: bsh,
bsh.classpath, bsh.classpath,
bsh.collection, bsh.collection,
@ -122,7 +120,6 @@ Require-Bundle: org.eclipse.equinox.app;bundle-version="0.0.0",
bcprov;bundle-version="1.54.0", bcprov;bundle-version="1.54.0",
org.krysalis.barcode4j;bundle-version="0.0.0", org.krysalis.barcode4j;bundle-version="0.0.0",
groovy, groovy,
javax.xml;bundle-version="1.3.4",
org.apache.poi.poi;bundle-version="3.15.0", org.apache.poi.poi;bundle-version="3.15.0",
org.apache.poi.poi-ooxml;bundle-version="3.15.0", org.apache.poi.poi-ooxml;bundle-version="3.15.0",
com.sun.activation.jakarta.activation;bundle-version="1.2.1" com.sun.activation.jakarta.activation;bundle-version="1.2.1"

4
org.adempiere.base/build.properties
View File

@ -23,9 +23,7 @@ bin.includes = plugin.xml,\
lib/bsh.jar,\ lib/bsh.jar,\
lib/commons-validator.jar,\ lib/commons-validator.jar,\
lib/cron4j.jar,\ lib/cron4j.jar,\
lib/jnlp.jar,\ lib/jnlp.jar
lib/jython-engine.jar,\
lib/jython.jar
src.includes = schema/ src.includes = schema/
source.. = src/ source.. = src/
output.. = target/classes/ output.. = target/classes/

10
org.adempiere.base/pom.xml
View File

@ -28,16 +28,6 @@
<artifactId>bsh</artifactId> <artifactId>bsh</artifactId>
<version>2.0b6</version> <version>2.0b6</version>
</artifactItem> </artifactItem>
<artifactItem>
<groupId>com.sun.script</groupId>
<artifactId>jython-engine</artifactId>
<version>20080611</version>
</artifactItem>
<artifactItem>
<groupId>org.python</groupId>
<artifactId>jython</artifactId>
<version>2.7.0</version>
</artifactItem>
<artifactItem> <artifactItem>
<groupId>it.sauronsoftware.cron4j</groupId> <groupId>it.sauronsoftware.cron4j</groupId>
<artifactId>cron4j</artifactId> <artifactId>cron4j</artifactId>

9
org.adempiere.bundles.external-feature/feature.xml
View File

@ -46,7 +46,7 @@
unpack="false"/> unpack="false"/>
<plugin <plugin
id="org.apache.xerces" id="org.apache.servicemix.bundles.xerces"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
@ -66,13 +66,6 @@
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin
id="javax.xml"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin <plugin
id="org.junit" id="org.junit"
download-size="0" download-size="0"

2
org.adempiere.report.jasper-feature/feature.xml
View File

@ -436,7 +436,7 @@
unpack="false"/> unpack="false"/>
<plugin <plugin
id="javax.ws.rs" id="jakarta.ws.rs-api"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"

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

File diff suppressed because one or more lines are too long

2
org.adempiere.server/META-INF/MANIFEST.MF
View File

@ -34,7 +34,7 @@ Import-Package: javax.jms;version="1.1.0",
org.restlet.security, org.restlet.security,
org.restlet.service, org.restlet.service,
org.restlet.util, org.restlet.util,
org.w3c.dom;version="3.0.0" org.w3c.dom
Export-Package: org.adempiere.server, Export-Package: org.adempiere.server,
org.compiere.ldap, org.compiere.ldap,
org.compiere.server, org.compiere.server,

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

@ -44,13 +44,6 @@
id="org.eclipse.ecf.core.feature" id="org.eclipse.ecf.core.feature"
version="0.0.0"/> version="0.0.0"/>
<plugin
id="javax.xml"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin <plugin
id="org.apache.ant" id="org.apache.ant"
download-size="0" download-size="0"
@ -281,18 +274,6 @@
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin
id="org.apache.axis"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="javax.xml.rpc"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin <plugin
id="org.apache.xmlbeans" id="org.apache.xmlbeans"
download-size="0" download-size="0"

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

@ -6,7 +6,7 @@ Bundle-Version: 6.2.0.qualifier
Comment: Bundle-RequiredExecutionEnvironment: JavaSE-11 Comment: Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))" Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))"
Require-Bundle: org.adempiere.base;bundle-version="0.0.0", Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
org.apache.xerces;bundle-version="0.0.0", org.apache.servicemix.bundles.xerces;bundle-version="0.0.0",
org.eclipse.equinox.app;bundle-version="0.0.0" org.eclipse.equinox.app;bundle-version="0.0.0"
Export-Package: org.compiere.apps, Export-Package: org.compiere.apps,
org.compiere.apps.form, org.compiere.apps.form,

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

@ -28,8 +28,8 @@
<slf4j.version>1.7.25</slf4j.version> <slf4j.version>1.7.25</slf4j.version>
<xml.ws.version>2.3.2</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.3.1</apache.cxf.version>
<apache.cxf.databinding.version>3.1.17</apache.cxf.databinding.version> <apache.cxf.databinding.version>3.1.18</apache.cxf.databinding.version>
<activation.version>1.2.1</activation.version> <activation.version>1.2.1</activation.version>
<annotation.version>1.3.3</annotation.version> <annotation.version>1.3.3</annotation.version>
<asm.version>7.0</asm.version> <asm.version>7.0</asm.version>
@ -89,6 +89,11 @@
<license>GPL v2.1</license> <license>GPL v2.1</license>
<generateSourceFeature>true</generateSourceFeature> <generateSourceFeature>true</generateSourceFeature>
<artifacts> <artifacts>
<artifact>
<id>org.apache.servicemix.bundles:org.apache.servicemix.bundles.xerces:jar:2.9.1_5</id>
<source>true</source>
<transitive>false</transitive>
</artifact>
<artifact> <artifact>
<id>org.passay:passay:jar:1.3.1</id> <id>org.passay:passay:jar:1.3.1</id>
<source>true</source> <source>true</source>
@ -552,6 +557,11 @@
<source>true</source> <source>true</source>
<transitive>false</transitive> <transitive>false</transitive>
</artifact> </artifact>
<artifact>
<id>org.apache.cxf:cxf-rt-security:jar:${apache.cxf.version}</id>
<source>true</source>
<transitive>false</transitive>
</artifact>
<artifact> <artifact>
<id>org.apache.cxf:cxf-rt-rs-extension-providers:jar:${apache.cxf.databinding.version}</id> <id>org.apache.cxf:cxf-rt-rs-extension-providers:jar:${apache.cxf.databinding.version}</id>
<!-- the latest is ${apache.cxf.version} (3.2.6) but hasn't XMLBeansElementProvider so use ${apache.cxf.databinding.version} 3.1.17 <!-- the latest is ${apache.cxf.version} (3.2.6) but hasn't XMLBeansElementProvider so use ${apache.cxf.databinding.version} 3.1.17
@ -594,11 +604,6 @@
<source>true</source> <source>true</source>
<transitive>false</transitive> <transitive>false</transitive>
</artifact> </artifact>
<artifact>
<id>javax.ws.rs:jsr311-api:jar:1.1.1</id>
<source>true</source>
<transitive>false</transitive>
</artifact>
<artifact> <artifact>
<id>jakarta.ws.rs:jakarta.ws.rs-api:jar:2.1.5</id> <id>jakarta.ws.rs:jakarta.ws.rs-api:jar:2.1.5</id>
<source>true</source> <source>true</source>
@ -610,11 +615,6 @@
<source>true</source> <source>true</source>
<transitive>false</transitive> <transitive>false</transitive>
</artifact> </artifact>
<artifact>
<id>javax.xml.soap:javax.xml.soap-api:jar:1.4.0</id>
<source>true</source>
<transitive>false</transitive>
</artifact>
<artifact> <artifact>
<!--https://github.com/eclipse-ee4j/jax-rpc-api--> <!--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>
@ -1763,26 +1763,6 @@
<skipCache>true</skipCache> <skipCache>true</skipCache>
</configuration> </configuration>
</execution> </execution>
<execution>
<!--axis dependency to bundle javax.xml.soap and javax.xml.rpc
that library move to https://github.com/eclipse-ee4j and newer version use by other library
so to avoid conflict, update dependency to newer version
-->
<id>download-axis</id>
<phase>package</phase>
<goals>
<goal>wget</goal>
</goals>
<configuration>
<url>${url.file.srv}/extra.jar/org.apache.axis_1.4.0.v201903052030.jar</url>
<unpack>false</unpack>
<outputFileName>org.apache.axis_1.4.0.v201903052030.jar</outputFileName>
<outputDirectory>${project.build.directory}/repository/plugins</outputDirectory>
<retries>5</retries>
<overwrite>true</overwrite>
<skipCache>true</skipCache>
</configuration>
</execution>
</executions> </executions>
</plugin> </plugin>
<!-- copy zk osgi bundle to repository folder --> <!-- copy zk osgi bundle to repository folder -->

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

@ -183,30 +183,12 @@
<unit id="javax.security.auth.message.source" version="1.0.0.v201108011116"/> <unit id="javax.security.auth.message.source" version="1.0.0.v201108011116"/>
<unit id="javax.security.jacc" version="1.4.0.v201205031350"/> <unit id="javax.security.jacc" version="1.4.0.v201205031350"/>
<unit id="javax.security.jacc.source" version="1.4.0.v201205031350"/> <unit id="javax.security.jacc.source" version="1.4.0.v201205031350"/>
<unit id="javax.servlet" version="3.1.0.v201410161800"/>
<unit id="javax.servlet.jsp" version="2.2.0.v201112011158"/>
<unit id="javax.servlet.jsp.jstl" version="1.2.0.v201105211821"/>
<unit id="javax.servlet.jsp.jstl.impl" version="1.2.0.v201210211230"/>
<unit id="javax.servlet.jsp.jstl.impl.source" version="1.2.0.v201210211230"/>
<unit id="javax.servlet.jsp.jstl.source" version="1.2.0.v201105211821"/>
<unit id="javax.servlet.jsp.source" version="2.2.0.v201112011158"/>
<unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
<unit id="javax.transaction" version="1.1.1.v201105210645"/> <unit id="javax.transaction" version="1.1.1.v201105210645"/>
<unit id="javax.transaction.source" version="1.1.1.v201105210645"/> <unit id="javax.transaction.source" version="1.1.1.v201105210645"/>
<unit id="javax.validation" version="1.0.0.GA_v201205091237"/> <unit id="javax.validation" version="1.0.0.GA_v201205091237"/>
<unit id="javax.validation.source" version="1.0.0.GA_v201205091237"/> <unit id="javax.validation.source" version="1.0.0.GA_v201205091237"/>
<unit id="javax.websocket" version="1.0.0.v20140310-1603"/>
<unit id="javax.websocket.source" version="1.0.0.v20140310-1603"/>
<unit id="javax.ws.rs" version="2.0.1.v201504171603"/>
<unit id="javax.wsdl" version="1.6.2.v201012040545"/> <unit id="javax.wsdl" version="1.6.2.v201012040545"/>
<unit id="javax.wsdl.source" version="1.6.2.v201012040545"/> <unit id="javax.wsdl.source" version="1.6.2.v201012040545"/>
<unit id="javax.xml" version="1.3.4.v201005080400"/>
<unit id="javax.xml.bind" version="2.2.0.v201105210648"/>
<unit id="javax.xml.bind.source" version="2.2.0.v201105210648"/>
<unit id="javax.xml.rpc" version="1.1.0.v201209140446"/>
<unit id="javax.xml.soap" version="1.3.0.v201105210645"/>
<unit id="javax.xml.stream" version="1.0.1.v201004272200"/>
<unit id="javax.xml.ws" version="2.1.0.v200902101523"/>
<unit id="jnr.x86asm" version="1.0.2.v201505052040"/> <unit id="jnr.x86asm" version="1.0.2.v201505052040"/>
<unit id="lpg.runtime.java" version="2.0.17.v201004271640"/> <unit id="lpg.runtime.java" version="2.0.17.v201004271640"/>
<unit id="lpg.runtime.java.source" version="2.0.17.v201004271640"/> <unit id="lpg.runtime.java.source" version="2.0.17.v201004271640"/>
@ -229,7 +211,6 @@
<unit id="org.aopalliance" version="1.0.0.v201105210816"/> <unit id="org.aopalliance" version="1.0.0.v201105210816"/>
<unit id="org.apache.ant" version="1.9.6.v201510161327"/> <unit id="org.apache.ant" version="1.9.6.v201510161327"/>
<unit id="org.apache.ant.source" version="1.9.6.v201510161327"/> <unit id="org.apache.ant.source" version="1.9.6.v201510161327"/>
<unit id="org.apache.axis" version="1.4.0.v201411182030"/>
<unit id="org.apache.bcel" version="5.2.0.v201005080400"/> <unit id="org.apache.bcel" version="5.2.0.v201005080400"/>
<unit id="org.apache.bcel.source" version="5.2.0.v201005080400"/> <unit id="org.apache.bcel.source" version="5.2.0.v201005080400"/>
<unit id="org.apache.bsf" version="2.4.0.v201103030230"/> <unit id="org.apache.bsf" version="2.4.0.v201103030230"/>
@ -466,7 +447,6 @@
<unit id="org.apache.xbean.naming.source" version="3.12.0.v201304201405"/> <unit id="org.apache.xbean.naming.source" version="3.12.0.v201304201405"/>
<unit id="org.apache.xbean.reflect" version="3.12.0.v201304201405"/> <unit id="org.apache.xbean.reflect" version="3.12.0.v201304201405"/>
<unit id="org.apache.xbean.reflect.source" version="3.12.0.v201304201405"/> <unit id="org.apache.xbean.reflect.source" version="3.12.0.v201304201405"/>
<unit id="org.apache.xerces" version="2.9.0.v201101211617"/>
<unit id="org.apache.xml.resolver" version="1.2.0.v201005080400"/> <unit id="org.apache.xml.resolver" version="1.2.0.v201005080400"/>
<unit id="org.apache.xml.security" version="1.4.2.v201005080400"/> <unit id="org.apache.xml.security" version="1.4.2.v201005080400"/>
<unit id="org.apache.xml.serializer" version="2.7.1.v201005080400"/> <unit id="org.apache.xml.serializer" version="2.7.1.v201005080400"/>
@ -995,12 +975,6 @@
<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.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.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.source" version="1.4.0"/>
<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"/>
@ -1051,46 +1025,48 @@
<unit id="org.apache.commons.io.source" version="2.6.0"/> <unit id="org.apache.commons.io.source" version="2.6.0"/>
<unit id="org.apache.commons.javaflow" version="1590792.0.0"/> <unit id="org.apache.commons.javaflow" version="1590792.0.0"/>
<unit id="org.apache.commons.javaflow.source" version="1590792.0.0"/> <unit id="org.apache.commons.javaflow.source" version="1590792.0.0"/>
<unit id="org.apache.cxf.cxf-core" version="3.2.6"/> <unit id="org.apache.cxf.cxf-core" version="3.3.1"/>
<unit id="org.apache.cxf.cxf-core.source" version="3.2.6"/> <unit id="org.apache.cxf.cxf-core.source" version="3.3.1"/>
<unit id="org.apache.cxf.cxf-rt-bindings-object" version="3.1.17"/> <unit id="org.apache.cxf.cxf-rt-bindings-object" version="3.1.18"/>
<unit id="org.apache.cxf.cxf-rt-bindings-object.source" version="3.1.17"/> <unit id="org.apache.cxf.cxf-rt-bindings-object.source" version="3.1.18"/>
<unit id="org.apache.cxf.cxf-rt-bindings-soap" version="3.2.6"/> <unit id="org.apache.cxf.cxf-rt-bindings-soap" version="3.3.1"/>
<unit id="org.apache.cxf.cxf-rt-bindings-soap.source" version="3.2.6"/> <unit id="org.apache.cxf.cxf-rt-bindings-soap.source" version="3.3.1"/>
<unit id="org.apache.cxf.cxf-rt-bindings-xml" version="3.2.6"/> <unit id="org.apache.cxf.cxf-rt-bindings-xml" version="3.3.1"/>
<unit id="org.apache.cxf.cxf-rt-bindings-xml.source" version="3.2.6"/> <unit id="org.apache.cxf.cxf-rt-bindings-xml.source" version="3.3.1"/>
<unit id="org.apache.cxf.cxf-rt-databinding-jaxb" version="3.2.6"/> <unit id="org.apache.cxf.cxf-rt-databinding-jaxb" version="3.3.1"/>
<unit id="org.apache.cxf.cxf-rt-databinding-jaxb.source" version="3.2.6"/> <unit id="org.apache.cxf.cxf-rt-databinding-jaxb.source" version="3.3.1"/>
<unit id="org.apache.cxf.cxf-rt-databinding-xmlbeans" version="3.1.17"/> <unit id="org.apache.cxf.cxf-rt-databinding-xmlbeans" version="3.1.18"/>
<unit id="org.apache.cxf.cxf-rt-databinding-xmlbeans.source" version="3.1.17"/> <unit id="org.apache.cxf.cxf-rt-databinding-xmlbeans.source" version="3.1.18"/>
<unit id="org.apache.cxf.cxf-rt-frontend-jaxrs" version="3.2.6"/> <unit id="org.apache.cxf.cxf-rt-frontend-jaxrs" version="3.3.1"/>
<unit id="org.apache.cxf.cxf-rt-frontend-jaxrs.source" version="3.2.6"/> <unit id="org.apache.cxf.cxf-rt-frontend-jaxrs.source" version="3.3.1"/>
<unit id="org.apache.cxf.cxf-rt-frontend-jaxws" version="3.2.6"/> <unit id="org.apache.cxf.cxf-rt-frontend-jaxws" version="3.3.1"/>
<unit id="org.apache.cxf.cxf-rt-frontend-jaxws.source" version="3.2.6"/> <unit id="org.apache.cxf.cxf-rt-frontend-jaxws.source" version="3.3.1"/>
<unit id="org.apache.cxf.cxf-rt-frontend-simple" version="3.2.6"/> <unit id="org.apache.cxf.cxf-rt-frontend-simple" version="3.3.1"/>
<unit id="org.apache.cxf.cxf-rt-frontend-simple.source" version="3.2.6"/> <unit id="org.apache.cxf.cxf-rt-frontend-simple.source" version="3.3.1"/>
<unit id="org.apache.cxf.cxf-rt-management" version="3.2.6"/> <unit id="org.apache.cxf.cxf-rt-management" version="3.3.1"/>
<unit id="org.apache.cxf.cxf-rt-management.source" version="3.2.6"/> <unit id="org.apache.cxf.cxf-rt-management.source" version="3.3.1"/>
<unit id="org.apache.cxf.cxf-rt-rs-extension-providers" version="3.1.17"/> <unit id="org.apache.cxf.cxf-rt-rs-extension-providers" version="3.1.18"/>
<unit id="org.apache.cxf.cxf-rt-rs-extension-providers.source" version="3.1.17"/> <unit id="org.apache.cxf.cxf-rt-rs-extension-providers.source" version="3.1.18"/>
<unit id="org.apache.cxf.cxf-rt-rs-http-sci" version="3.2.6"/> <unit id="org.apache.cxf.cxf-rt-rs-http-sci" version="3.3.1"/>
<unit id="org.apache.cxf.cxf-rt-rs-http-sci.source" version="3.2.6"/> <unit id="org.apache.cxf.cxf-rt-rs-http-sci.source" version="3.3.1"/>
<unit id="org.apache.cxf.cxf-rt-rs-service-description" version="3.2.6"/> <unit id="org.apache.cxf.cxf-rt-rs-service-description" version="3.3.1"/>
<unit id="org.apache.cxf.cxf-rt-rs-service-description.source" version="3.2.6"/> <unit id="org.apache.cxf.cxf-rt-rs-service-description.source" version="3.3.1"/>
<unit id="org.apache.cxf.cxf-rt-transports-http" version="3.2.6"/> <unit id="org.apache.cxf.cxf-rt-transports-http" version="3.3.1"/>
<unit id="org.apache.cxf.cxf-rt-transports-http-jetty" version="3.2.6"/> <unit id="org.apache.cxf.cxf-rt-transports-http-jetty" version="3.3.1"/>
<unit id="org.apache.cxf.cxf-rt-transports-http-jetty.source" version="3.2.6"/> <unit id="org.apache.cxf.cxf-rt-transports-http-jetty.source" version="3.3.1"/>
<unit id="org.apache.cxf.cxf-rt-transports-http.source" version="3.2.6"/> <unit id="org.apache.cxf.cxf-rt-transports-http.source" version="3.3.1"/>
<unit id="org.apache.cxf.cxf-rt-ws-addr" version="3.2.6"/> <unit id="org.apache.cxf.cxf-rt-ws-addr" version="3.3.1"/>
<unit id="org.apache.cxf.cxf-rt-ws-addr.source" version="3.2.6"/> <unit id="org.apache.cxf.cxf-rt-ws-addr.source" version="3.3.1"/>
<unit id="org.apache.cxf.cxf-rt-ws-policy" version="3.2.6"/> <unit id="org.apache.cxf.cxf-rt-ws-policy" version="3.3.1"/>
<unit id="org.apache.cxf.cxf-rt-ws-policy.source" version="3.2.6"/> <unit id="org.apache.cxf.cxf-rt-ws-policy.source" version="3.3.1"/>
<unit id="org.apache.cxf.cxf-rt-wsdl" version="3.2.6"/> <unit id="org.apache.cxf.cxf-rt-wsdl" version="3.3.1"/>
<unit id="org.apache.cxf.cxf-rt-wsdl.source" version="3.2.6"/> <unit id="org.apache.cxf.cxf-rt-wsdl.source" version="3.3.1"/>
<unit id="org.apache.cxf.cxf-spring-boot-autoconfigure" version="3.2.6"/> <unit id="org.apache.cxf.cxf-spring-boot-autoconfigure" version="3.3.1"/>
<unit id="org.apache.cxf.cxf-spring-boot-autoconfigure.source" version="3.2.6"/> <unit id="org.apache.cxf.cxf-spring-boot-autoconfigure.source" version="3.3.1"/>
<unit id="org.apache.cxf.rt-ws-transfer" version="3.2.6"/> <unit id="org.apache.cxf.rt-ws-transfer" version="3.3.1"/>
<unit id="org.apache.cxf.rt-ws-transfer.source" version="3.2.6"/> <unit id="org.apache.cxf.rt-ws-transfer.source" version="3.3.1"/>
<unit id="org.apache.cxf.cxf-rt-security" version="3.3.1"/>
<unit id="org.apache.cxf.cxf-rt-security.source" version="3.3.1"/>
<unit id="org.apache.felix.inventory" version="1.0.6"/> <unit id="org.apache.felix.inventory" version="1.0.6"/>
<unit id="org.apache.felix.inventory.source" version="1.0.6"/> <unit id="org.apache.felix.inventory.source" version="1.0.6"/>
<unit id="org.apache.felix.webconsole" version="4.3.8"/> <unit id="org.apache.felix.webconsole" version="4.3.8"/>
@ -1110,7 +1086,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-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"/>
@ -1299,8 +1275,8 @@
<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-R20190304"/> <unit id="org.apache.servicemix.bundles.xerces" version="2.9.1.5"/>
<unit id="org.apache.axis" version="1.4.0.v201903052030"/> <repository location="https://raw.githubusercontent.com/idempiere/binary.file/master/p2.maven/maven-p2-R20190411"/>
</location> </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="com.sun.istack.commons-runtime" version="3.0.8"/> <unit id="com.sun.istack.commons-runtime" version="3.0.8"/>

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

@ -10,7 +10,7 @@
<name>Maven parent project for idempiere</name> <name>Maven parent project for idempiere</name>
<properties> <properties>
<tycho.version>1.3.0</tycho.version> <tycho.version>1.4.0</tycho.version>
<tycho.extras.version>${tycho.version}</tycho.extras.version> <tycho.extras.version>${tycho.version}</tycho.extras.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jp.version>6.7.0</jp.version> <jp.version>6.7.0</jp.version>

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

@ -88,7 +88,6 @@ 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",
org.apache.axis;bundle-version="1.4.0",
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",

6
org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/client/GetListLookup.java
View File

@ -25,8 +25,6 @@ import javax.xml.soap.SOAPEnvelope;
import javax.xml.soap.SOAPMessage; import javax.xml.soap.SOAPMessage;
import javax.xml.soap.SOAPPart; import javax.xml.soap.SOAPPart;
import org.apache.axis.soap.MessageFactoryImpl;
import org.apache.axis.soap.SOAPConnectionFactoryImpl;
import org.compiere.model.Lookup; import org.compiere.model.Lookup;
import org.compiere.util.DisplayType; import org.compiere.util.DisplayType;
import org.compiere.util.NamePair; import org.compiere.util.NamePair;
@ -109,10 +107,10 @@ public class GetListLookup extends Lookup {
try { try {
Thread.currentThread().setContextClassLoader(getClass().getClassLoader()); Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
dataMap = new LinkedHashMap<Object, NamePair>(); dataMap = new LinkedHashMap<Object, NamePair>();
cf = new SOAPConnectionFactoryImpl(); cf = SOAPConnectionFactory.newInstance();
SOAPConnection conn = cf.createConnection(); SOAPConnection conn = cf.createConnection();
// Create a SOAPMessage instance // Create a SOAPMessage instance
MessageFactory mf = new MessageFactoryImpl(); MessageFactory mf = MessageFactory.newInstance();
SOAPMessage message = mf.createMessage(); SOAPMessage message = mf.createMessage();
// Create a SOAP envelope and body // Create a SOAP envelope and body
SOAPPart part = message.getSOAPPart(); SOAPPart part = message.getSOAPPart();

6
org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/client/QueryDataLookup.java
View File

@ -27,8 +27,6 @@ import javax.xml.soap.SOAPEnvelope;
import javax.xml.soap.SOAPMessage; import javax.xml.soap.SOAPMessage;
import javax.xml.soap.SOAPPart; import javax.xml.soap.SOAPPart;
import org.apache.axis.soap.MessageFactoryImpl;
import org.apache.axis.soap.SOAPConnectionFactoryImpl;
import org.compiere.model.Lookup; import org.compiere.model.Lookup;
import org.compiere.util.DisplayType; import org.compiere.util.DisplayType;
import org.compiere.util.KeyNamePair; import org.compiere.util.KeyNamePair;
@ -113,10 +111,10 @@ public class QueryDataLookup extends Lookup {
try { try {
Thread.currentThread().setContextClassLoader(getClass().getClassLoader()); Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
dataMap = new LinkedHashMap<Integer, KeyNamePair>(); dataMap = new LinkedHashMap<Integer, KeyNamePair>();
cf = new SOAPConnectionFactoryImpl(); cf = SOAPConnectionFactory.newInstance();
SOAPConnection conn = cf.createConnection(); SOAPConnection conn = cf.createConnection();
// Create a SOAPMessage instance // Create a SOAPMessage instance
MessageFactory mf = new MessageFactoryImpl(); MessageFactory mf = MessageFactory.newInstance();
SOAPMessage message = mf.createMessage(); SOAPMessage message = mf.createMessage();
// Create a SOAP envelope and body // Create a SOAP envelope and body
SOAPPart part = message.getSOAPPart(); SOAPPart part = message.getSOAPPart();