diff --git a/org.adempiere.base-feature/feature.xml b/org.adempiere.base-feature/feature.xml index ae8671519c..87f1f45ffd 100644 --- a/org.adempiere.base-feature/feature.xml +++ b/org.adempiere.base-feature/feature.xml @@ -160,6 +160,13 @@ 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 262b344575..69242b3e9d 100644 --- a/org.adempiere.base/META-INF/MANIFEST.MF +++ b/org.adempiere.base/META-INF/MANIFEST.MF @@ -8,6 +8,8 @@ Bundle-ClassPath: ., lib/commons-validator.jar, lib/cron4j.jar, lib/jnlp.jar, + lib/jython-engine.jar, + lib/jython.jar, lib/avalon-framework-api.jar Export-Package: bsh, bsh.classpath, @@ -124,6 +126,7 @@ Require-Bundle: org.eclipse.equinox.app;bundle-version="0.0.0", bcprov;bundle-version="1.54.0", org.krysalis.barcode4j;bundle-version="0.0.0", groovy, + javax.xml;bundle-version="1.3.4", org.apache.poi.poi;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" diff --git a/org.adempiere.base/build.properties b/org.adempiere.base/build.properties index 1d59175748..0012e60786 100644 --- a/org.adempiere.base/build.properties +++ b/org.adempiere.base/build.properties @@ -24,7 +24,9 @@ bin.includes = plugin.xml,\ lib/bsh.jar,\ lib/commons-validator.jar,\ lib/cron4j.jar,\ - lib/jnlp.jar + lib/jnlp.jar,\ + lib/jython-engine.jar,\ + lib/jython.jar src.includes = schema/ source.. = src/ output.. = target/classes/ diff --git a/org.adempiere.base/pom.xml b/org.adempiere.base/pom.xml index 4df1fd6868..96ba477762 100644 --- a/org.adempiere.base/pom.xml +++ b/org.adempiere.base/pom.xml @@ -12,7 +12,7 @@ - + org.apache.maven.plugins maven-dependency-plugin @@ -28,6 +28,16 @@ bsh 2.0b6 + + com.sun.script + jython-engine + 20080611 + + + org.python + jython + 2.7.0 + it.sauronsoftware.cron4j cron4j diff --git a/org.adempiere.bundles.external-feature/feature.xml b/org.adempiere.bundles.external-feature/feature.xml index 04d0cb80b1..dbb58d6f49 100644 --- a/org.adempiere.bundles.external-feature/feature.xml +++ b/org.adempiere.bundles.external-feature/feature.xml @@ -46,7 +46,7 @@ unpack="false"/> + + - - + + diff --git a/org.adempiere.server/META-INF/MANIFEST.MF b/org.adempiere.server/META-INF/MANIFEST.MF index 286a4f6e3e..7fb93e5206 100644 --- a/org.adempiere.server/META-INF/MANIFEST.MF +++ b/org.adempiere.server/META-INF/MANIFEST.MF @@ -34,7 +34,7 @@ Import-Package: javax.jms;version="1.1.0", org.restlet.security, org.restlet.service, org.restlet.util, - org.w3c.dom + org.w3c.dom;version="3.0.0" Export-Package: org.adempiere.server, org.compiere.ldap, org.compiere.server, diff --git a/org.adempiere.target.platform-feature/feature.xml b/org.adempiere.target.platform-feature/feature.xml index 0a9b4d50bf..00b4497148 100644 --- a/org.adempiere.target.platform-feature/feature.xml +++ b/org.adempiere.target.platform-feature/feature.xml @@ -44,6 +44,13 @@ id="org.eclipse.ecf.core.feature" version="0.0.0"/> + + + + + + 1.7.25 2.3.2 2.4 - 3.3.1 - 3.1.18 + 3.2.6 + 3.1.17 1.2.1 1.3.3 7.0 @@ -89,11 +89,6 @@ GPL v2.1 true - - org.apache.servicemix.bundles:org.apache.servicemix.bundles.xerces:jar:2.9.1_5 - true - false - org.passay:passay:jar:1.3.1 true @@ -557,11 +552,6 @@ true false - - org.apache.cxf:cxf-rt-security:jar:${apache.cxf.version} - true - false - org.apache.cxf:cxf-rt-rs-extension-providers:jar:${apache.cxf.databinding.version} jakarta.xml.rpc:jakarta.xml.rpc-api:jar:1.1.3 @@ -1786,6 +1786,26 @@ true + + + download-axis + package + + wget + + + ${url.file.srv}/extra.jar/org.apache.axis_1.4.0.v201903052030.jar + false + org.apache.axis_1.4.0.v201903052030.jar + ${project.build.directory}/repository/plugins + 5 + true + true + + diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target index 70be6f4222..013f435439 100644 --- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target +++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target @@ -183,12 +183,30 @@ + + + + + + + + + + + + + + + + + + @@ -211,6 +229,7 @@ + @@ -447,6 +466,7 @@ + @@ -975,6 +995,12 @@ + + + + + + @@ -1025,48 +1051,46 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1086,7 +1110,7 @@ - + @@ -1275,8 +1299,8 @@ - - + + @@ -1337,4 +1361,4 @@ - + \ No newline at end of file diff --git a/org.idempiere.parent/pom.xml b/org.idempiere.parent/pom.xml index 7aa8cf452b..b3159c574f 100644 --- a/org.idempiere.parent/pom.xml +++ b/org.idempiere.parent/pom.xml @@ -10,7 +10,7 @@ Maven parent project for idempiere - 1.4.0 + 1.3.0 ${tycho.version} UTF-8 6.7.0 diff --git a/org.idempiere.webservices/META-INF/MANIFEST.MF b/org.idempiere.webservices/META-INF/MANIFEST.MF index 687ca1d2b2..934f31c93e 100644 --- a/org.idempiere.webservices/META-INF/MANIFEST.MF +++ b/org.idempiere.webservices/META-INF/MANIFEST.MF @@ -88,6 +88,7 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0", org.springframework.spring-jcl;bundle-version="5.1.1", org.apache.servicemix.bundles.spring-web, 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", org.glassfish.jersey.core.jersey-common;bundle-version="2.22.1", org.apache.cxf.cxf-rt-rs-service-description;bundle-version="3.2.6", diff --git a/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/client/GetListLookup.java b/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/client/GetListLookup.java index 217187c131..6ae815acfa 100644 --- a/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/client/GetListLookup.java +++ b/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/client/GetListLookup.java @@ -25,6 +25,8 @@ import javax.xml.soap.SOAPEnvelope; import javax.xml.soap.SOAPMessage; 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.util.DisplayType; import org.compiere.util.NamePair; @@ -107,10 +109,10 @@ public class GetListLookup extends Lookup { try { Thread.currentThread().setContextClassLoader(getClass().getClassLoader()); dataMap = new LinkedHashMap(); - cf = SOAPConnectionFactory.newInstance(); + cf = new SOAPConnectionFactoryImpl(); SOAPConnection conn = cf.createConnection(); // Create a SOAPMessage instance - MessageFactory mf = MessageFactory.newInstance(); + MessageFactory mf = new MessageFactoryImpl(); SOAPMessage message = mf.createMessage(); // Create a SOAP envelope and body SOAPPart part = message.getSOAPPart(); diff --git a/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/client/QueryDataLookup.java b/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/client/QueryDataLookup.java index 0ef0991bee..42e73f915f 100644 --- a/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/client/QueryDataLookup.java +++ b/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/client/QueryDataLookup.java @@ -27,6 +27,8 @@ import javax.xml.soap.SOAPEnvelope; import javax.xml.soap.SOAPMessage; 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.util.DisplayType; import org.compiere.util.KeyNamePair; @@ -111,10 +113,10 @@ public class QueryDataLookup extends Lookup { try { Thread.currentThread().setContextClassLoader(getClass().getClassLoader()); dataMap = new LinkedHashMap(); - cf = SOAPConnectionFactory.newInstance(); + cf = new SOAPConnectionFactoryImpl(); SOAPConnection conn = cf.createConnection(); // Create a SOAPMessage instance - MessageFactory mf = MessageFactory.newInstance(); + MessageFactory mf = new MessageFactoryImpl(); SOAPMessage message = mf.createMessage(); // Create a SOAP envelope and body SOAPPart part = message.getSOAPPart();