diff --git a/org.adempiere.base/META-INF/MANIFEST.MF b/org.adempiere.base/META-INF/MANIFEST.MF
index 7cf71255e2..c4aee5c15e 100644
--- a/org.adempiere.base/META-INF/MANIFEST.MF
+++ b/org.adempiere.base/META-INF/MANIFEST.MF
@@ -67,8 +67,8 @@ Import-Package: com.sun.mail.smtp;version="1.5",
junit.framework;version="3.8.2";resolution:=optional,
junit.textui;version="3.8.2";resolution:=optional,
net.sf.cglib.proxy,
- net.sourceforge.barbecue;version="1.5.0.beta1",
- net.sourceforge.barbecue.linear.ean;version="1.5.0.beta1",
+ net.sourceforge.barbecue,
+ net.sourceforge.barbecue.linear.ean,
org.apache.activemq;version="5.3.0",
org.apache.commons.collections;version="3.2.0",
org.apache.commons.collections.keyvalue;version="3.2.0",
diff --git a/org.adempiere.report.jasper-feature/feature.xml b/org.adempiere.report.jasper-feature/feature.xml
index e9d12947a4..e5155a3dd8 100644
--- a/org.adempiere.report.jasper-feature/feature.xml
+++ b/org.adempiere.report.jasper-feature/feature.xml
@@ -35,13 +35,6 @@
install-size="0"
version="0.0.0"/>
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.adempiere.report.jasper.library/.classpath b/org.adempiere.report.jasper.library/.classpath
index fda455228c..75976faf99 100644
--- a/org.adempiere.report.jasper.library/.classpath
+++ b/org.adempiere.report.jasper.library/.classpath
@@ -4,12 +4,11 @@
-
+
-
diff --git a/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF b/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
index 5e3a58f727..ef2071b78b 100644
--- a/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
+++ b/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
@@ -13,94 +13,9 @@ Bundle-ClassPath: .,
lib/jasperreports-fonts.jar,
lib/jasperreports-functions.jar,
lib/olap4j.jar,
- lib/rhino.jar,
lib/spring-beans.jar,
lib/spring-core.jar,
lib/xmpcore.jar
-Import-Package: bsh,
- bsh.classpath,
- bsh.collection,
- bsh.commands,
- bsh.engine,
- bsh.org.objectweb.asm,
- bsh.reflect,
- bsh.servlet,
- bsh.util,
- javax.servlet;version="3.1.0",
- javax.servlet.http;version="3.1.0",
- javax.servlet.resources;version="3.1.0",
- org.apache.commons.codec.digest;version="1.6.0",
- org.apache.tools.ant,
- org.apache.tools.ant.attribute,
- org.apache.tools.ant.dispatch,
- org.apache.tools.ant.filters,
- org.apache.tools.ant.filters.util,
- org.apache.tools.ant.helper,
- org.apache.tools.ant.input,
- org.apache.tools.ant.launch,
- org.apache.tools.ant.listener,
- org.apache.tools.ant.loader,
- org.apache.tools.ant.property,
- org.apache.tools.ant.taskdefs,
- org.apache.tools.ant.taskdefs.compilers,
- org.apache.tools.ant.taskdefs.condition,
- org.apache.tools.ant.taskdefs.cvslib,
- org.apache.tools.ant.taskdefs.email,
- org.apache.tools.ant.taskdefs.launcher,
- org.apache.tools.ant.taskdefs.optional,
- org.apache.tools.ant.taskdefs.optional.ccm,
- org.apache.tools.ant.taskdefs.optional.clearcase,
- org.apache.tools.ant.taskdefs.optional.depend,
- org.apache.tools.ant.taskdefs.optional.depend.constantpool,
- org.apache.tools.ant.taskdefs.optional.ejb,
- org.apache.tools.ant.taskdefs.optional.extension,
- org.apache.tools.ant.taskdefs.optional.extension.resolvers,
- org.apache.tools.ant.taskdefs.optional.i18n,
- org.apache.tools.ant.taskdefs.optional.image,
- org.apache.tools.ant.taskdefs.optional.j2ee,
- org.apache.tools.ant.taskdefs.optional.javacc,
- org.apache.tools.ant.taskdefs.optional.javah,
- org.apache.tools.ant.taskdefs.optional.jdepend,
- org.apache.tools.ant.taskdefs.optional.jlink,
- org.apache.tools.ant.taskdefs.optional.jsp,
- org.apache.tools.ant.taskdefs.optional.jsp.compilers,
- org.apache.tools.ant.taskdefs.optional.junit,
- org.apache.tools.ant.taskdefs.optional.native2ascii,
- org.apache.tools.ant.taskdefs.optional.net,
- org.apache.tools.ant.taskdefs.optional.pvcs,
- org.apache.tools.ant.taskdefs.optional.script,
- org.apache.tools.ant.taskdefs.optional.sos,
- org.apache.tools.ant.taskdefs.optional.sound,
- org.apache.tools.ant.taskdefs.optional.splash,
- org.apache.tools.ant.taskdefs.optional.ssh,
- org.apache.tools.ant.taskdefs.optional.testing,
- org.apache.tools.ant.taskdefs.optional.unix,
- org.apache.tools.ant.taskdefs.optional.vss,
- org.apache.tools.ant.taskdefs.optional.windows,
- org.apache.tools.ant.taskdefs.rmic,
- org.apache.tools.ant.types,
- org.apache.tools.ant.types.mappers,
- org.apache.tools.ant.types.optional,
- org.apache.tools.ant.types.optional.depend,
- org.apache.tools.ant.types.optional.image,
- org.apache.tools.ant.types.resolver,
- org.apache.tools.ant.types.resources,
- org.apache.tools.ant.types.resources.comparators,
- org.apache.tools.ant.types.resources.selectors,
- org.apache.tools.ant.types.selectors,
- org.apache.tools.ant.types.selectors.modifiedselector,
- org.apache.tools.ant.types.spi,
- org.apache.tools.ant.util,
- org.apache.tools.ant.util.depend,
- org.apache.tools.ant.util.depend.bcel,
- org.apache.tools.ant.util.facade,
- org.apache.tools.ant.util.java15,
- org.apache.tools.ant.util.optional,
- org.apache.tools.ant.util.regexp,
- org.apache.tools.bzip2,
- org.apache.tools.mail,
- org.apache.tools.tar,
- org.apache.tools.zip,
- org.apache.xml.serializer;version="2.7.1"
DynamicImport-Package: *
+Import-Package: org.w3c.dom.events;version="[3.0.0,4.0.0)"
Automatic-Module-Name: org.adempiere.report.jasper.library
diff --git a/org.adempiere.report.jasper.library/build.properties b/org.adempiere.report.jasper.library/build.properties
index 860892e7b1..08faa30823 100644
--- a/org.adempiere.report.jasper.library/build.properties
+++ b/org.adempiere.report.jasper.library/build.properties
@@ -7,7 +7,6 @@ bin.includes = META-INF/,\
lib/jasperreports-fonts.jar,\
lib/jasperreports-functions.jar,\
lib/olap4j.jar,\
- lib/rhino.jar,\
lib/spring-beans.jar,\
lib/spring-core.jar,\
lib/xmpcore.jar
diff --git a/org.adempiere.report.jasper.library/pom.xml b/org.adempiere.report.jasper.library/pom.xml
index 09911c1d8f..096f719ed0 100644
--- a/org.adempiere.report.jasper.library/pom.xml
+++ b/org.adempiere.report.jasper.library/pom.xml
@@ -48,11 +48,6 @@
jasperreports-functions
${jp.version}
-
- org.mozilla
- rhino
- 1.7.6
-
org.olap4j
olap4j
@@ -93,7 +88,7 @@
wget
- ${url.file.srv}/jarfile/jp-6.3.1/jasperreports-fonts-6.3.1.jar
+ ${url.file.srv}/jarfile/jp-${jp.version}/jasperreports-fonts-${jp.version}.jar
false
lib
jasperreports-fonts.jar
diff --git a/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF b/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF
index f05e447393..094d5661ab 100644
--- a/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF
+++ b/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF
@@ -9,6 +9,7 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
org.adempiere.report.jasper;bundle-version="0.0.0"
Import-Package: net.sf.jasperreports.engine,
net.sf.jasperreports.engine.export,
+ net.sf.jasperreports.swing,
net.sf.jasperreports.view,
org.adempiere.report.jasper,
org.osgi.framework
diff --git a/org.adempiere.report.jasper.swing/src/org/compiere/report/JasperReportViewer.java b/org.adempiere.report.jasper.swing/src/org/compiere/report/JasperReportViewer.java
index b5e6960963..56f4202bdd 100644
--- a/org.adempiere.report.jasper.swing/src/org/compiere/report/JasperReportViewer.java
+++ b/org.adempiere.report.jasper.swing/src/org/compiere/report/JasperReportViewer.java
@@ -22,7 +22,7 @@ import net.sf.jasperreports.engine.JasperExportManager;
import net.sf.jasperreports.engine.JasperPrint;
import net.sf.jasperreports.engine.JasperReport;
import net.sf.jasperreports.engine.export.JRXlsExporter;
-import net.sf.jasperreports.view.JRViewer;
+import net.sf.jasperreports.swing.JRViewer;
import org.compiere.apps.EMailDialog;
import org.compiere.model.MUser;
@@ -76,8 +76,8 @@ public class JasperReportViewer extends JRViewer {
tlbToolBar.add(comboBox);
// Set default viewer zoom level
- btnFitPage.setSelected(true);
- setZooms();
+ //btnFitPage.setSelected(true);
+ //setZooms();
}
public JasperPrint getJasperPrint() {
@@ -89,12 +89,12 @@ public class JasperReportViewer extends JRViewer {
}
- @Override
+ //@Override
protected void paintPage(Graphics2D grx) {
ClassLoader cl = Thread.currentThread().getContextClassLoader();
try {
Thread.currentThread().setContextClassLoader(JasperReport.class.getClassLoader());
- super.paintPage(grx);
+ //super.paintPage(grx);
} finally {
Thread.currentThread().setContextClassLoader(cl);
}
diff --git a/org.adempiere.report.jasper/META-INF/MANIFEST.MF b/org.adempiere.report.jasper/META-INF/MANIFEST.MF
index c736dfba65..55624d4410 100644
--- a/org.adempiere.report.jasper/META-INF/MANIFEST.MF
+++ b/org.adempiere.report.jasper/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: iDempiere JasperReport integration
Bundle-SymbolicName: org.adempiere.report.jasper;singleton:=true
Bundle-Version: 5.1.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: net.sourceforge.barbecue;version="1.5.0.beta1",
+Import-Package: net.sourceforge.barbecue,
org.apache.commons.codec,
org.apache.commons.codec.binary,
org.apache.commons.logging;version="1.1.1",
diff --git a/org.adempiere.server-feature/idempiere-server.sh b/org.adempiere.server-feature/idempiere-server.sh
index 131b8d7cc4..6b4cc1e436 100644
--- a/org.adempiere.server-feature/idempiere-server.sh
+++ b/org.adempiere.server-feature/idempiere-server.sh
@@ -21,7 +21,7 @@ echo Starting iDempiere Server
echo ===================================
-VMOPTS="-Dorg.osgi.framework.bootdelegation=sun.security.ssl
+VMOPTS="-Dorg.osgi.framework.bootdelegation=sun.security.ssl,org.w3c.dom.events
-Dosgi.compatibility.bootdelegation=true
-Djetty.home=$BASE/jettyhome
-Djetty.base=$BASE/jettyhome
diff --git a/org.adempiere.server-feature/server.product b/org.adempiere.server-feature/server.product
index 9f9a7883a2..bb538b7049 100644
--- a/org.adempiere.server-feature/server.product
+++ b/org.adempiere.server-feature/server.product
@@ -9,7 +9,7 @@
-console
- -Declipse.product=org.adempiere.server.product -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dorg.osgi.framework.bootdelegation=sun.security.ssl -Dosgi.compatibility.bootdelegation=true -Djetty.home=jettyhome -Djetty.etc.config.urls=etc/jetty.xml,etc/jetty-deployer.xml,etc/jetty-ssl.xml,etc/jetty-ssl-context.xml,etc/jetty-http.xml,etc/jetty-alpn.xml,etc/jetty-http2.xml,etc/jetty-https.xml -Dmail.mime.encodefilename=true -Dmail.mime.decodefilename=true -Dmail.mime.encodeparameters=true -Dmail.mime.decodeparameters=true -Dhazelcast.config=hazelcast.xml -Dorg.zkoss.zk.config.path=file://${workspace_loc}/zk.xml
+ -Declipse.product=org.adempiere.server.product -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dorg.osgi.framework.bootdelegation=sun.security.ssl,org.w3c.dom.events -Dosgi.compatibility.bootdelegation=true -Djetty.home=jettyhome -Djetty.etc.config.urls=etc/jetty.xml,etc/jetty-deployer.xml,etc/jetty-ssl.xml,etc/jetty-ssl-context.xml,etc/jetty-http.xml,etc/jetty-alpn.xml,etc/jetty-http2.xml,etc/jetty-https.xml -Dmail.mime.encodefilename=true -Dmail.mime.decodefilename=true -Dmail.mime.encodeparameters=true -Dmail.mime.decodeparameters=true -Dhazelcast.config=hazelcast.xml -Dorg.zkoss.zk.config.path=file://${workspace_loc}/zk.xml
-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
diff --git a/org.adempiere.server-feature/setup/configuration/config.ini b/org.adempiere.server-feature/setup/configuration/config.ini
index f1b25e7b4e..14adee3d87 100644
--- a/org.adempiere.server-feature/setup/configuration/config.ini
+++ b/org.adempiere.server-feature/setup/configuration/config.ini
@@ -1,4 +1,4 @@
-osgi.framework=file\:../plugins/org.eclipse.osgi_3.12.100.v20180210-1608.jar
+osgi.framework=file\:../plugins/org.eclipse.osgi_3.13.0.v20180409-1500.jar
osgi.install.area=setup
osgi.bundles=org.eclipse.equinox.ds@1:start,\
org.eclipse.equinox.util,\
diff --git a/org.idempiere.equinox.p2.director-feature/director/configuration/config.ini b/org.idempiere.equinox.p2.director-feature/director/configuration/config.ini
index 74ef193739..c73f3a781b 100644
--- a/org.idempiere.equinox.p2.director-feature/director/configuration/config.ini
+++ b/org.idempiere.equinox.p2.director-feature/director/configuration/config.ini
@@ -1,4 +1,4 @@
-osgi.framework=file\:../plugins/org.eclipse.osgi_3.12.100.v20180210-1608.jar
+osgi.framework=file\:../plugins/org.eclipse.osgi_3.13.0.v20180409-1500.jar
osgi.install.area=director
equinox.use.ds=true
osgi.bundles=org.eclipse.core.net@start,\
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 1494311a5e..3cc4fa5cc9 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
@@ -1,12 +1,12 @@
- 4.0.0
org.idempiere
org.idempiere.parent
5.1.0-SNAPSHOT
../../org.idempiere.parent/pom.xml
+ 4.0.0
org.idempiere.maven.to.p2
pom
@@ -17,9 +17,29 @@
8.1.12.v20180117
3.1.0.M3
1.1.0
-
-
+ 2.9.5
+ 3.1.4
+ 1.1.0.Final
+ 5.0.3
+ 20171018
+
+
+
+ orbit-photon-R20180531190352
+ http://download.eclipse.org/tools/orbit/downloads/drops2/R20180531190352/repository
+ p2
+
+
+ org.jfree.chart
+ http://nexus.orbisgis.org/content/repositories/osgi-maven
+
+
+ jasperstudio-6.6.0
+ https://sourceforge.net/projects/jasperstudio/files/updatesite/6.6.0
+ p2
+
+
@@ -475,18 +495,158 @@
net.sf.jasperreports:jasperreports:jar:${jp.version}
- false
+ true
false
- true
+
+
+ commons-digester:commons-digester:jar:2.1
+ true
+ false
+
+
+ com.google.zxing:core:jar:3.2.1
+ true
+ false
+
+
+ org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxen:jar:1.1.1_2
+ true
+ false
+
+
+ org.apache.servicemix.bundles:org.apache.servicemix.bundles.rhino:jar:1.7.6_1
+ true
+ false
+
+
+ org.jfree:jfreechart-osgi:jar:1.0.19
+ true
+ false
+
+
+ org.jfree:jcommon-osgi:jar:1.0.23
+ true
+ false
+
+
+ org.apache.poi:poi:jar:3.15
+ true
+ false
+ true
- net.sf.jasperreports.engine
- net.sf.jasperreports.engine
+ org.apache.poi.poi
+ poi-ooxml
+ *;resolution:=optional
+ *
+
+ org.apache.poi:poi-ooxml:jar:3.15
+ true
+ false
+ true
+
+ org.apache.poi.poi-ooxml
+ poi-ooxml
+ *;resolution:=optional
+ *
+
+
+
+ org.apache.poi:poi-ooxml-schemas:jar:3.15
+ true
+ false
+ true
+
+ org.apache.poi.poi-ooxml-schemas
+ poi-ooxml-schemas
+ *;resolution:=optional
+ *
+
+
+
+ com.fasterxml.jackson.core:jackson-core:jar:${jackson.version}
+ true
+ false
+
+
+ com.fasterxml.jackson.core:jackson-annotations:jar:${jackson.version}
+ true
+ false
+
+
+ com.fasterxml.jackson.core:jackson-databind:jar:${jackson.version}
+ true
+ false
+
+
+ com.fasterxml.jackson.dataformat:jackson-dataformat-xml:jar:${jackson.version}
+ true
+ false
+
+
+ com.fasterxml.jackson.datatype:jackson-datatype-guava:jar:${jackson.version}
+ true
+ false
+
+
+ com.fasterxml.jackson.datatype:jackson-datatype-joda:jar:${jackson.version}
+ true
+ false
+
+
+ com.fasterxml.jackson.datatype:jackson-datatype-json-org:jar:${jackson.version}
+ true
+ false
+
+
+ com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:jar:${jackson.version}
+ true
+ false
+
+
+ com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:jar:${jackson.version}
+ true
+ false
+
+
+ com.fasterxml.jackson.jaxrs:jackson-jaxrs-xml-provider:jar:${jackson.version}
+ true
+ false
+
+
+ com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:${jackson.version}
+ true
+ false
+
+
+ com.fasterxml.jackson.module:jackson-module-jsonSchema:jar:${jackson.version}
+ true
+ false
+
+
+ org.codehaus.woodstox:stax2-api:jar:${stax2.api.version}
+ true
+ false
+
+
+ javax.validation:validation-api:jar:${validation.api.version}
+ true
+ false
+
+
+ com.fasterxml.woodstox:woodstox-core:jar:${woodstox.core.version}
+ true
+ false
+
+
+ org.json:json:jar:${json.version}
+ true
+ false
+
-
org.javassist:javassist:${zk.javassist.src.version}
@@ -504,7 +664,83 @@
-
+
+
+ org.apache.batik.anim:1.9.1.v20180528-1434
+
+
+ org.apache.batik.bridge:1.9.1.v20180313-1559
+
+
+ org.apache.batik.codec:1.9.1.v20180313-1559
+
+
+ org.apache.batik.constants:1.9.1.v20180227-1645
+
+
+ org.apache.batik.css:1.9.1.v20180313-1559
+
+
+ org.apache.batik.dom:1.9.1.v20180528-1434
+
+
+ org.apache.batik.dom.svg:1.9.1.v20180313-1559
+
+
+ org.apache.batik.ext.awt:1.9.1.v20180227-1645
+
+
+ org.apache.batik.extension:1.9.1.v20180313-1559
+
+
+ org.apache.batik.gvt:1.9.1.v20180227-1645
+
+
+ org.apache.batik.i18n:1.9.1.v20180227-1645
+
+
+ org.apache.batik.parser:1.9.1.v20180313-1559
+
+
+ org.apache.batik.pdf:1.9.1.v20180417-1407
+
+
+ org.apache.batik.script:1.9.1.v20180313-1559
+
+
+ org.apache.batik.svggen:1.9.1.v20180313-1559
+
+
+ org.apache.batik.swing:1.9.1.v20180313-1559
+
+
+ org.apache.batik.transcoder:1.9.1.v20180313-1559
+
+
+ org.apache.batik.util:1.9.1.v20180227-1645
+
+
+ org.apache.batik.util.gui:1.9.1.v20180227-1645
+
+
+ org.apache.batik.xml:1.9.1.v20180227-1645
+
+
+ org.apache.xmlgraphics:2.2.0.v20180410-1551
+
+
+ com.jaspersoft.studio.bundles.barbecue:1.5.0.beta1_b02
+
+
+ com.jaspersoft.studio.bundles.itext:2.1.7.js6_b02
+
+
+ org.w3c.dom.svg.patch:1.1.0.b02
+
+
+ org.krysalis.barcode4j:2.1.0
+
+
@@ -539,7 +775,7 @@
rename-file
package
- rename
+ copy
@@ -607,13 +843,29 @@
- false
+ true
${project.build.directory}/repository
+
+ org.eclipse.tycho.extras
+ tycho-eclipserun-plugin
+
+ -application org.eclipse.equinox.p2.publisher.CategoryPublisher -artifactRepository file:${project.build.directory}/repository -metadataRepository file:${project.build.directory}/repository -categoryDefinition file:${project.build.directory}/repository/category.xml -categoryQualifier -compress
+
+
+
+
+ eclipse-run
+
+ package
+
+
+
+
diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
index 95165f7bc8..690212a3a7 100644
--- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
+++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
@@ -1,4 +1,4 @@
-
+
@@ -47,136 +47,12 @@
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -921,6 +797,181 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/org.idempiere.p2/category.xml b/org.idempiere.p2/category.xml
index b64aa8a8d0..3a8dd13886 100644
--- a/org.idempiere.p2/category.xml
+++ b/org.idempiere.p2/category.xml
@@ -36,36 +36,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -84,5 +54,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.idempiere.p2/server.product b/org.idempiere.p2/server.product
index 9f9a7883a2..bb538b7049 100644
--- a/org.idempiere.p2/server.product
+++ b/org.idempiere.p2/server.product
@@ -9,7 +9,7 @@
-console
- -Declipse.product=org.adempiere.server.product -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dorg.osgi.framework.bootdelegation=sun.security.ssl -Dosgi.compatibility.bootdelegation=true -Djetty.home=jettyhome -Djetty.etc.config.urls=etc/jetty.xml,etc/jetty-deployer.xml,etc/jetty-ssl.xml,etc/jetty-ssl-context.xml,etc/jetty-http.xml,etc/jetty-alpn.xml,etc/jetty-http2.xml,etc/jetty-https.xml -Dmail.mime.encodefilename=true -Dmail.mime.decodefilename=true -Dmail.mime.encodeparameters=true -Dmail.mime.decodeparameters=true -Dhazelcast.config=hazelcast.xml -Dorg.zkoss.zk.config.path=file://${workspace_loc}/zk.xml
+ -Declipse.product=org.adempiere.server.product -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dorg.osgi.framework.bootdelegation=sun.security.ssl,org.w3c.dom.events -Dosgi.compatibility.bootdelegation=true -Djetty.home=jettyhome -Djetty.etc.config.urls=etc/jetty.xml,etc/jetty-deployer.xml,etc/jetty-ssl.xml,etc/jetty-ssl-context.xml,etc/jetty-http.xml,etc/jetty-alpn.xml,etc/jetty-http2.xml,etc/jetty-https.xml -Dmail.mime.encodefilename=true -Dmail.mime.decodefilename=true -Dmail.mime.encodeparameters=true -Dmail.mime.decodeparameters=true -Dhazelcast.config=hazelcast.xml -Dorg.zkoss.zk.config.path=file://${workspace_loc}/zk.xml
-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
diff --git a/org.idempiere.parent/pom.xml b/org.idempiere.parent/pom.xml
index 4a03521746..5d628189e7 100644
--- a/org.idempiere.parent/pom.xml
+++ b/org.idempiere.parent/pom.xml
@@ -10,11 +10,11 @@
Maven parent project for idempiere
- 1.1.0
+ 1.2.0
${tycho.version}
UTF-8
9.4.11.v20180605
- 6.3.1
+ 6.7.0
8.5.0
3.18.2-GA
3.0.2
@@ -493,6 +493,8 @@
x86_64
+ JavaSE-1.8
+ JavaSE-1.8