diff --git a/org.adempiere.base-feature/feature.xml b/org.adempiere.base-feature/feature.xml
index b85223feb3..f665e43600 100644
--- a/org.adempiere.base-feature/feature.xml
+++ b/org.adempiere.base-feature/feature.xml
@@ -99,13 +99,6 @@
version="0.0.0"
unpack="false"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.adempiere.base/META-INF/MANIFEST.MF b/org.adempiere.base/META-INF/MANIFEST.MF
index f260743a80..c76cb1124f 100644
--- a/org.adempiere.base/META-INF/MANIFEST.MF
+++ b/org.adempiere.base/META-INF/MANIFEST.MF
@@ -64,6 +64,7 @@ Import-Package: com.sun.mail.smtp;version="1.5",
javax.mail.internet;version="1.5",
javax.servlet;version="3.0.0",
javax.servlet.http;version="3.0.0",
+ javax.xml.bind,
junit.framework;version="3.8.2";resolution:=optional,
junit.textui;version="3.8.2";resolution:=optional,
net.sf.cglib.proxy,
@@ -121,6 +122,6 @@ Require-Bundle: org.eclipse.equinox.app;bundle-version="0.0.0",
com.itextpdf;bundle-version="0.0.0",
net.sf.supercsv.super-csv;bundle-version="0.0.0",
bcprov;bundle-version="1.54.0",
- groovy-all;bundle-version="0.0.0",
- org.krysalis.barcode4j;bundle-version="0.0.0"
+ org.krysalis.barcode4j;bundle-version="0.0.0",
+ groovy
Automatic-Module-Name: org.adempiere.base
diff --git a/org.adempiere.base/pom.xml b/org.adempiere.base/pom.xml
index f5a42a07cc..ad992278d3 100644
--- a/org.adempiere.base/pom.xml
+++ b/org.adempiere.base/pom.xml
@@ -45,7 +45,7 @@
org.python
jython
- 2.2.1
+ 2.7.0
it.sauronsoftware.cron4j
@@ -73,4 +73,4 @@
-
\ No newline at end of file
+
diff --git a/org.adempiere.install/install.app.launch b/org.adempiere.install/install.app.launch
index a50af90157..bdada2be09 100644
--- a/org.adempiere.install/install.app.launch
+++ b/org.adempiere.install/install.app.launch
@@ -1,36 +1,36 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.adempiere.report.jasper-feature/feature.xml b/org.adempiere.report.jasper-feature/feature.xml
index e5155a3dd8..eecef53193 100644
--- a/org.adempiere.report.jasper-feature/feature.xml
+++ b/org.adempiere.report.jasper-feature/feature.xml
@@ -426,12 +426,12 @@
install-size="0"
version="0.0.0"
unpack="false"/>
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.adempiere.server-feature/pom.xml b/org.adempiere.server-feature/pom.xml
index e554646e6f..409bf50ed9 100644
--- a/org.adempiere.server-feature/pom.xml
+++ b/org.adempiere.server-feature/pom.xml
@@ -31,7 +31,7 @@
commons-beanutils
commons-beanutils
- 1.7.0
+ 1.9.3
commons-betwixt
@@ -41,37 +41,37 @@
commons-codec
commons-codec
- 1.3
+ 1.11
commons-collections
commons-collections
- 3.1
+ 3.2.2
commons-dbcp
commons-dbcp
- 1.2.1
+ 1.4
commons-digester
commons-digester
- 1.7
+ 2.1
commons-lang
commons-lang
- 2.1
+ 2.6
commons-logging
commons-logging
- 1.0.4
+ 1.2
commons-pool
commons-pool
- 1.2
+ 1.6
org.apache.ddlutils
@@ -81,7 +81,7 @@
dom4j
dom4j
- 1.4
+ 1.6.1
oro
@@ -96,7 +96,7 @@
woodstox
wstx-asl
- 3.0.2
+ 3.2.7
../db/ddlutils/lib
diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch
index 58118a0e8a..bac4f7f633 100644
--- a/org.adempiere.server-feature/server.product.launch
+++ b/org.adempiere.server-feature/server.product.launch
@@ -1,39 +1,39 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.adempiere.server-feature/setup/configuration/config.ini b/org.adempiere.server-feature/setup/configuration/config.ini
index 6ef6b56860..3160be873e 100644
--- a/org.adempiere.server-feature/setup/configuration/config.ini
+++ b/org.adempiere.server-feature/setup/configuration/config.ini
@@ -30,14 +30,11 @@ osgi.bundles=org.eclipse.equinox.ds@1:start,\
org.eclipse.equinox.preferences,\
org.eclipse.equinox.event,\
org.apache.commons.logging,\
- javax.management.j2ee-api,\
org.eclipse.osgi,\
org.eclipse.osgi.services,\
- javax.ejb,\
javax.xml.rpc,\
javax.xml.soap,\
javax.xml,\
- javax.activation,\
org.apache.activemq.activemq-core,\
org.apache.activemq.kahadb,\
javax.transaction,\
@@ -47,7 +44,6 @@ osgi.bundles=org.eclipse.equinox.ds@1:start,\
slf4j.jcl,\
org.apache.commons.codec,\
org.eclipse.osgi.compatibility.state,\
- org.eclipse.osgi.compatibility.plugins,\
org.cryptacular,\
net.sf.supercsv.super-csv,\
com.itextpdf,\
@@ -59,7 +55,10 @@ osgi.bundles=org.eclipse.equinox.ds@1:start,\
bcpkix,\
org.eclipse.equinox.common,\
org.passay,\
- groovy-all,\
+ 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=
osgi.bundles.defaultStartLevel=4
diff --git a/org.adempiere.target.platform-feature/feature.xml b/org.adempiere.target.platform-feature/feature.xml
index 0323e0a73a..9397c8dadc 100644
--- a/org.adempiere.target.platform-feature/feature.xml
+++ b/org.adempiere.target.platform-feature/feature.xml
@@ -155,4 +155,109 @@
version="0.0.0"
unpack="false"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.adempiere.ui.swing-feature/feature.xml b/org.adempiere.ui.swing-feature/feature.xml
index 77e7066257..865a2c0e0b 100644
--- a/org.adempiere.ui.swing-feature/feature.xml
+++ b/org.adempiere.ui.swing-feature/feature.xml
@@ -41,7 +41,7 @@
unpack="false"/>
+
diff --git a/org.adempiere.ui/META-INF/MANIFEST.MF b/org.adempiere.ui/META-INF/MANIFEST.MF
index 27004a5819..48b6b332d4 100644
--- a/org.adempiere.ui/META-INF/MANIFEST.MF
+++ b/org.adempiere.ui/META-INF/MANIFEST.MF
@@ -27,5 +27,6 @@ Export-Package: org.compiere.apps,
org.netbeans.api.visual.widget
Bundle-ClassPath: .,
lib/org-netbeans-api-visual.jar,
- lib/org-openide-util.jar
+ lib/org-openide-util.jar,
+ lib/org-openide-util-lookup.jar
Automatic-Module-Name: org.adempiere.ui
diff --git a/org.adempiere.ui/build.properties b/org.adempiere.ui/build.properties
index 92fa867dd9..47a81e85e6 100644
--- a/org.adempiere.ui/build.properties
+++ b/org.adempiere.ui/build.properties
@@ -1,6 +1,7 @@
bin.includes = META-INF/,\
.,\
lib/org-netbeans-api-visual.jar,\
- lib/org-openide-util.jar
+ lib/org-openide-util.jar,\
+ lib/org-openide-util-lookup.jar
source.. = src/
output.. = target/classes/
diff --git a/org.adempiere.ui/pom.xml b/org.adempiere.ui/pom.xml
index b77b7ee42c..ebc23fa460 100644
--- a/org.adempiere.ui/pom.xml
+++ b/org.adempiere.ui/pom.xml
@@ -34,12 +34,17 @@
org.netbeans.api
org-netbeans-api-visual
- RELEASE65
+ ${netbeans.lib.version}
org.netbeans.api
org-openide-util
- RELEASE65
+ ${netbeans.lib.version}
+
+
+ org.netbeans.api
+ org-openide-util-lookup
+ ${netbeans.lib.version}
lib
diff --git a/org.adempiere.webstore/META-INF/MANIFEST.MF b/org.adempiere.webstore/META-INF/MANIFEST.MF
index ffd5a56b34..ffdd71221e 100644
--- a/org.adempiere.webstore/META-INF/MANIFEST.MF
+++ b/org.adempiere.webstore/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.adempiere.webstore;singleton:=true
Bundle-Version: 5.1.0.qualifier
Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
org.adempiere.report.jasper.webapp;bundle-version="0.0.0",
- org.eclipse.jdt.core.compiler.batch;bundle-version="0.0.0"
+ org.eclipse.jdt.core;bundle-version="3.15.0"
Bundle-RequiredExecutionEnvironment: JavaSE-10
Web-ContextPath: wstore
Import-Package: javax.servlet;version="3.0.0",
diff --git a/org.compiere.db.oracle.provider/pom.xml b/org.compiere.db.oracle.provider/pom.xml
index 2b4bdab2e6..ef79b36aa2 100644
--- a/org.compiere.db.oracle.provider/pom.xml
+++ b/org.compiere.db.oracle.provider/pom.xml
@@ -26,12 +26,12 @@
com.mchange
c3p0
- 0.9.5
+ 0.9.5.2
com.mchange
mchange-commons-java
- 0.2.9
+ 0.2.15
com.google.code.maven-play-plugin.com.mchange
diff --git a/org.compiere.db.postgresql.provider/pom.xml b/org.compiere.db.postgresql.provider/pom.xml
index d3f989960b..047356632d 100644
--- a/org.compiere.db.postgresql.provider/pom.xml
+++ b/org.compiere.db.postgresql.provider/pom.xml
@@ -31,12 +31,12 @@
com.mchange
mchange-commons-java
- 0.2.12
+ 0.2.15
org.postgresql
postgresql
- 42.1.4
+ 42.2.5
lib
diff --git a/org.idempiere.hazelcast.service/pom.xml b/org.idempiere.hazelcast.service/pom.xml
index acf9aa286a..6e87b4e4f1 100644
--- a/org.idempiere.hazelcast.service/pom.xml
+++ b/org.idempiere.hazelcast.service/pom.xml
@@ -26,12 +26,12 @@
com.hazelcast
hazelcast
- 3.9.3
+ 3.10.6
com.hazelcast
hazelcast-aws
- 2.1.0
+ 2.3
lib
diff --git a/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml b/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml
index 0788e165b3..45c7e7e2a9 100644
--- a/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml
+++ b/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml
@@ -10,19 +10,24 @@
org.idempiere.maven.to.p2
pom
- https://www.zkoss.org/zkdownload/downloadEvalFile?id=1245081552
+ https://sourceforge.net/projects/zk1/files/ZK/zk-8.5.0/zk-bin-osgi-8.5.0.zip
1.1.3.v20160715
- 8.5.24.2
+ 8.5.33
8.1.12.v20180117
3.1.0.M3
- 1.1.0
+ 1.2.5
+ 2.5.3
+ 1.60
+ 1.4.0
2.9.5
3.1.4
1.1.0.Final
5.0.3
20171018
1.7.25
+ 2.3.1
+ 3.2.6
@@ -70,7 +75,7 @@
true
- org.passay:passay:jar:1.3.0
+ org.passay:passay:jar:1.3.1
true
false
@@ -91,7 +96,8 @@
false
- org.eclipse.jetty.orbit:org.eclipse.jdt.core:jar:3.8.2.v20130121
+
+ org.eclipse.jdt:org.eclipse.jdt.core:jar:3.15.0
true
false
@@ -101,17 +107,12 @@
false
- javax.annotation:javax.annotation-api:jar:1.3.1
+ javax.annotation:javax.annotation-api:jar:1.3.2
true
false
- javax.management.j2ee:javax.management.j2ee-api:jar:1.1.1
- true
- false
-
-
- com.sun.mail:javax.mail:jar:1.6.0
+ com.sun.mail:javax.mail:jar:1.6.2
true
false
@@ -121,22 +122,22 @@
org.ow2.asm:asm:jar:6.0 true false
-->
- org.apache.taglibs:taglibs-standard-impl:jar:1.2.5
+ org.apache.taglibs:taglibs-standard-impl:jar:${org.apache.taglibs.version}
true
false
- org.apache.taglibs:taglibs-standard-spec:jar:1.2.5
+ org.apache.taglibs:taglibs-standard-spec:jar:${org.apache.taglibs.version}
true
false
- org.apache.taglibs:taglibs-standard-jstlel:jar:1.2.5
+ org.apache.taglibs:taglibs-standard-jstlel:jar:${org.apache.taglibs.version}
true
false
- org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:jar:1.0.10
+ org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:jar:1.0.14
true
false
@@ -146,7 +147,7 @@
false
- org.apache.servicemix.bundles:org.apache.servicemix.bundles.cglib:jar:3.2.5_1
+ org.apache.servicemix.bundles:org.apache.servicemix.bundles.cglib:jar:3.2.6_1
true
false
@@ -161,17 +162,17 @@
false
- org.apache.felix:org.apache.felix.webconsole:jar:4.3.4
+ org.apache.felix:org.apache.felix.webconsole:jar:4.3.8
true
false
- org.apache.felix:org.apache.felix.webconsole.plugins.ds:jar:2.0.8
+ org.apache.felix:org.apache.felix.webconsole.plugins.ds:jar:2.1.0
true
false
- org.apache.felix:org.apache.felix.webconsole.plugins.memoryusage:jar:1.0.6
+ org.apache.felix:org.apache.felix.webconsole.plugins.memoryusage:jar:1.0.8
true
false
@@ -186,22 +187,22 @@
false
- com.itextpdf:itextpdf:jar:5.5.12
+ com.itextpdf:itextpdf:jar:5.5.13
true
false
- org.bouncycastle:bcpkix-jdk15on:jar:1.58
+ org.bouncycastle:bcpkix-jdk15on:jar:${org.bouncycastle.version}
true
false
- org.bouncycastle:bcprov-jdk15on:jar:1.58
+ org.bouncycastle:bcprov-jdk15on:jar:${org.bouncycastle.version}
true
false
- org.bouncycastle:bcmail-jdk15on:jar:1.58
+ org.bouncycastle:bcmail-jdk15on:jar:${org.bouncycastle.version}
true
false
@@ -226,7 +227,7 @@
false
- org.cryptacular:cryptacular:jar:1.2.1
+ org.cryptacular:cryptacular:jar:1.2.2
true
false
@@ -236,7 +237,7 @@
false
- org.atmosphere:atmosphere-runtime:jar:2.4.16
+ org.atmosphere:atmosphere-runtime:jar:2.5.0
true
false
@@ -246,22 +247,107 @@
false
- org.codehaus.groovy:groovy-all:jar:2.4.13
+ org.codehaus.groovy:groovy:jar:${groovy.version}
true
false
- com.ibm.icu:icu4j:jar:60.2
+ org.codehaus.groovy:groovy-ant:jar:${groovy.version}
true
false
- joda-time:joda-time:jar:2.9.9
+ org.codehaus.groovy:groovy-cli-commons:jar:${groovy.version}
true
false
- org.apache.commons:commons-configuration2:jar:2.2
+ org.codehaus.groovy:groovy-cli-picocli:jar:${groovy.version}
+ true
+ false
+
+
+ org.codehaus.groovy:groovy-console:jar:${groovy.version}
+ true
+ false
+
+
+ org.codehaus.groovy:groovy-datetime:jar:${groovy.version}
+ true
+ false
+
+
+ org.codehaus.groovy:groovy-docgenerator:jar:${groovy.version}
+ true
+ false
+
+
+ org.codehaus.groovy:groovy-groovydoc:jar:${groovy.version}
+ true
+ false
+
+
+ org.codehaus.groovy:groovy-groovysh:jar:${groovy.version}
+ true
+ false
+
+
+ org.codehaus.groovy:groovy-jmx:jar:${groovy.version}
+ true
+ false
+
+
+ org.codehaus.groovy:groovy-json:jar:${groovy.version}
+ true
+ false
+
+
+ org.codehaus.groovy:groovy-jsr223:jar:${groovy.version}
+ true
+ false
+
+
+ org.codehaus.groovy:groovy-macro:jar:${groovy.version}
+ true
+ false
+
+
+ org.codehaus.groovy:groovy-nio:jar:${groovy.version}
+ true
+ false
+
+
+ org.codehaus.groovy:groovy-servlet:jar:${groovy.version}
+ true
+ false
+
+
+ org.codehaus.groovy:groovy-sql:jar:${groovy.version}
+ true
+ false
+
+
+ org.codehaus.groovy:groovy-swing:jar:${groovy.version}
+ true
+ false
+
+
+ org.codehaus.groovy:groovy-xml:jar:${groovy.version}
+ true
+ false
+
+
+ com.ibm.icu:icu4j:jar:63.1
+ true
+ false
+
+
+ joda-time:joda-time:jar:2.10
+ true
+ false
+
+
+ org.apache.commons:commons-configuration2:jar:2.3
true
false
@@ -305,6 +391,138 @@
true
false
+
+ javax.transaction:javax.transaction-api:jar:1.3
+ true
+ false
+
+
+ com.sun.activation:javax.activation:jar:1.2.0
+ true
+ false
+
+
+ javax.xml.bind:jaxb-api:jar:${xml.ws.version}
+ true
+ false
+
+
+ com.sun.xml.bind:jaxb-core:jar:2.3.0.1
+ true
+ false
+
+
+ com.sun.xml.bind:jaxb-impl:jar:${xml.ws.version}
+ true
+ false
+
+
+ com.sun.xml.ws:jaxws-rt:jar:${xml.ws.version}
+ true
+ false
+
+
+ javax.xml.ws:jaxws-api:jar:${xml.ws.version}
+ true
+ false
+ true
+
+ jaxws-api
+
+
+
+ javax.interceptor:javax.interceptor-api:jar:1.2.2
+ true
+ false
+
+
+ javax.enterprise:cdi-api:jar:2.0.SP1
+ true
+ false
+
+
+
+ org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec:jar:1.0.1
+ true
+ false
+
+
+
+ org.apache.cxf:cxf-core:jar:${apache.cxf.version}
+ true
+ false
+
+
+ org.apache.cxf:cxf-rt-frontend-jaxws:jar:${apache.cxf.version}
+ true
+ false
+
+
+ org.apache.cxf:cxf-rt-frontend-jaxrs:jar:${apache.cxf.version}
+ true
+ false
+
+
+ org.apache.cxf:cxf-rt-transports-http:jar:${apache.cxf.version}
+ true
+ false
+
+
+ org.apache.cxf:cxf-rt-bindings-soap:jar:${apache.cxf.version}
+ true
+ false
+
+
+ org.apache.cxf:cxf-rt-bindings-xml:jar:${apache.cxf.version}
+ true
+ false
+
+
+ org.apache.cxf:cxf-rt-frontend-simple:jar:${apache.cxf.version}
+ true
+ false
+
+
+ org.apache.cxf:cxf-rt-wsdl:jar:${apache.cxf.version}
+ true
+ false
+
+
+ org.apache.cxf:cxf-rt-databinding-jaxb:jar:${apache.cxf.version}
+ true
+ false
+
+
+ org.apache.neethi:neethi:jar:3.1.1
+ true
+ false
+
+
+ org.apache.ws.xmlschema:xmlschema-core:jar:2.2.3
+ true
+ false
+
+
+ commons-discovery:commons-discovery:jar:0.5
+ true
+ false
+
+
+ javax.ws.rs:jsr311-api:jar:1.1.1
+ true
+ false
+
+
+ javax.ws.rs:javax.ws.rs-api:jar:2.1.1
+ true
+ false
+
+
+ org.codehaus.woodstox:stax2-api:jar:4.1
+ true
+ false
+
8.1.12.v20180117
-
+ RELEASE731
org.idempiere.p2.targetplatform
http://download.eclipse.org/eclipse/updates/4.9
@@ -315,6 +316,9 @@
org.eclipse.tycho
tycho-compiler-plugin
${tycho.version}
+
+ true
+
org.eclipse.tycho
@@ -354,7 +358,7 @@
org.apache.maven.plugins
maven-shade-plugin
- 3.1.0
+ 3.2.0
org.apache.maven.plugins
diff --git a/org.idempiere.webservices/.classpath b/org.idempiere.webservices/.classpath
index 3e79f44adc..a7d127eb75 100644
--- a/org.idempiere.webservices/.classpath
+++ b/org.idempiere.webservices/.classpath
@@ -9,23 +9,13 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/org.idempiere.webservices/META-INF/MANIFEST.MF b/org.idempiere.webservices/META-INF/MANIFEST.MF
index c3def927d9..75031ac957 100644
--- a/org.idempiere.webservices/META-INF/MANIFEST.MF
+++ b/org.idempiere.webservices/META-INF/MANIFEST.MF
@@ -7,6 +7,10 @@ Bundle-Activator: org.idempiere.webservices.Activator
Bundle-RequiredExecutionEnvironment: JavaSE-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",
javax.servlet.http;version="3.0.0",
@@ -18,6 +22,8 @@ Import-Package: javax.activation,
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,
@@ -61,41 +67,27 @@ Import-Package: javax.activation,
org.osgi.framework;version="1.6.0"
Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
org.adempiere.ui;bundle-version="0.0.0",
- org.apache.ecs;bundle-version="0.0.0"
+ org.apache.ecs;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"
Bundle-ClassPath: .,
WEB-INF/lib/aopalliance.jar,
WEB-INF/lib/axis.jar,
- WEB-INF/lib/commons-discovery.jar,
- WEB-INF/lib/cxf-bundle.jar,
- WEB-INF/lib/cxf-rt-frontend-jaxws.jar,
WEB-INF/lib/idempiere-xmlbeans.jar,
- WEB-INF/lib/jsr311-api.jar,
- WEB-INF/lib/neethi.jar,
WEB-INF/lib/spring-aop.jar,
- WEB-INF/lib/spring-asm.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-osgi-extender.jar,
WEB-INF/lib/spring-web.jar,
- WEB-INF/lib/stax2-api.jar,
- WEB-INF/lib/wsdl4j.jar,
- WEB-INF/lib/xmlbeans.jar,
- WEB-INF/lib/xmlschema-core.jar
-Export-Package: javax.ws.rs,
- javax.ws.rs.core,
- javax.ws.rs.ext,
- javax.wsdl,
- javax.wsdl.extensions,
- javax.wsdl.extensions.http,
- javax.wsdl.extensions.mime,
- javax.wsdl.extensions.schema,
- javax.wsdl.extensions.soap,
- javax.wsdl.extensions.soap12,
- javax.wsdl.factory,
- javax.wsdl.xml,
- org.apache.axis,
+ WEB-INF/lib/xmlbeans.jar
+Export-Package: org.apache.axis,
org.apache.axis.attachments,
org.apache.axis.client,
org.apache.axis.client.async,
@@ -150,19 +142,6 @@ Export-Package: javax.ws.rs,
org.apache.axis.wsdl.gen,
org.apache.axis.wsdl.symbolTable,
org.apache.axis.wsdl.toJava,
- org.apache.commons.discovery,
- org.apache.commons.discovery.ant,
- org.apache.commons.discovery.jdk,
- org.apache.commons.discovery.log,
- org.apache.commons.discovery.resource,
- org.apache.commons.discovery.resource.classes,
- org.apache.commons.discovery.resource.names,
- org.apache.commons.discovery.tools,
- org.apache.cxf,
- org.apache.cxf.jaxws,
- org.apache.cxf.jaxws.spring,
- org.apache.cxf.transport.servlet,
- org.apache.cxf.xmlbeans,
org.apache.xmlbeans,
org.apache.xmlbeans.impl.common,
org.apache.xmlbeans.impl.config,
diff --git a/org.idempiere.webservices/build.properties b/org.idempiere.webservices/build.properties
index 1fd4677baa..68fda8309a 100644
--- a/org.idempiere.webservices/build.properties
+++ b/org.idempiere.webservices/build.properties
@@ -8,24 +8,14 @@ bin.includes = META-INF/,\
OSGI-INF/,\
WEB-INF/lib/aopalliance.jar,\
WEB-INF/lib/axis.jar,\
- WEB-INF/lib/commons-discovery.jar,\
- WEB-INF/lib/cxf-bundle.jar,\
- WEB-INF/lib/cxf-rt-frontend-jaxws.jar,\
WEB-INF/lib/idempiere-xmlbeans.jar,\
- WEB-INF/lib/jsr311-api.jar,\
- WEB-INF/lib/neethi.jar,\
WEB-INF/lib/spring-aop.jar,\
- WEB-INF/lib/spring-asm.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-osgi-extender.jar,\
WEB-INF/lib/spring-web.jar,\
- WEB-INF/lib/stax2-api.jar,\
- WEB-INF/lib/wsdl4j.jar,\
- WEB-INF/lib/xmlbeans.jar,\
- WEB-INF/lib/xmlschema-core.jar
+ WEB-INF/lib/xmlbeans.jar
src.includes = WEB-INF/lib/,\
WEB-INF/web.xml,\
WEB-INF/xsd/
diff --git a/org.idempiere.webservices/pom.xml b/org.idempiere.webservices/pom.xml
index 76502d4c97..d376cab1a6 100644
--- a/org.idempiere.webservices/pom.xml
+++ b/org.idempiere.webservices/pom.xml
@@ -23,80 +23,45 @@
-
- org.springframework.osgi
- spring-osgi-extender
- 1.2.1
-
org.springframework
spring-aop
- 3.0.7.RELEASE
-
-
- org.codehaus.woodstox
- stax2-api
- 3.1.1
+ ${springframework.version}
org.springframework
spring-web
- 3.0.7.RELEASE
+ ${springframework.version}
org.springframework
spring-context
- 3.0.7.RELEASE
+ ${springframework.version}
org.springframework
spring-beans
- 3.0.7.RELEASE
+ ${springframework.version}
org.springframework
spring-core
- 3.0.7.RELEASE
-
-
- org.springframework
- spring-asm
- 3.0.7.RELEASE
+ ${springframework.version}
org.springframework
spring-expression
- 3.0.7.RELEASE
+ ${springframework.version}
wsdl4j
wsdl4j
- 1.6.2
-
-
- org.apache.cxf
- cxf-bundle
- 2.6.2
-
-
- org.apache.neethi
- neethi
- 3.0.2
-
-
- org.apache.ws.xmlschema
- xmlschema-core
- 2.0.3
-
-
- org.apache.cxf
- cxf-rt-frontend-jaxws
- 2.6.1
+ 1.6.3
org.apache.xmlbeans
xmlbeans
- 3.0.0
+ 3.0.1
aopalliance
@@ -108,16 +73,6 @@
axis
1.4
-
- commons-discovery
- commons-discovery
- 0.5
-
-
- javax.ws.rs
- jsr311-api
- 1.1
-
WEB-INF/lib
true
diff --git a/org.idempiere.zk.extra/META-INF/MANIFEST.MF b/org.idempiere.zk.extra/META-INF/MANIFEST.MF
index cefa66e9f5..dbe3042b28 100644
--- a/org.idempiere.zk.extra/META-INF/MANIFEST.MF
+++ b/org.idempiere.zk.extra/META-INF/MANIFEST.MF
@@ -16,9 +16,11 @@ Export-Package: com.google.common.annotations,
com.google.common.cache,
com.google.common.collect,
com.google.common.escape,
+ com.google.common.graph,
com.google.common.hash,
com.google.common.io,
com.google.common.math,
+ com.google.common.net,
com.google.common.primitives,
com.google.common.reflect,
com.google.common.util.concurrent,
@@ -33,11 +35,13 @@ Export-Package: com.google.common.annotations,
com.google.gson.internal.bind.util,
com.google.gson.reflect,
com.google.gson.stream,
+ com.google.j2objc.annotations,
com.google.javascript.jscomp,
com.google.javascript.jscomp.ant,
com.google.javascript.jscomp.bundle,
com.google.javascript.jscomp.deps,
com.google.javascript.jscomp.graph,
+ com.google.javascript.jscomp.ijs,
com.google.javascript.jscomp.js,
com.google.javascript.jscomp.js.es6,
com.google.javascript.jscomp.js.es6.array,
@@ -49,7 +53,6 @@ Export-Package: com.google.common.annotations,
com.google.javascript.jscomp.js.es6.util,
com.google.javascript.jscomp.js.util,
com.google.javascript.jscomp.lint,
- com.google.javascript.jscomp.newtypes,
com.google.javascript.jscomp.parsing,
com.google.javascript.jscomp.parsing.parser,
com.google.javascript.jscomp.parsing.parser.trees,
@@ -66,10 +69,12 @@ Export-Package: com.google.common.annotations,
google.protobuf,
google.protobuf.compiler,
javax.annotation,
- javax.annotation.concurrent,
javax.annotation.meta,
jsinterop.annotations,
metainfo.zk,
+ org.checkerframework.checker.nullness.qual,
+ org.checkerframework.framework.qual,
+ org.codehaus.mojo.animal_sniffer,
org.kohsuke.args4j,
org.kohsuke.args4j.spi,
org.zkforge.json.simple,
diff --git a/org.idempiere.zk.extra/pom.xml b/org.idempiere.zk.extra/pom.xml
index 83b4cb14fd..c4b1721a3b 100644
--- a/org.idempiere.zk.extra/pom.xml
+++ b/org.idempiere.zk.extra/pom.xml
@@ -52,7 +52,7 @@
com.google.javascript
closure-compiler
- v20171112
+ v20181008
lib