IDEMPIERE-3531: update jasper report to 6.7.0

+ add more Osgi for jasper dependency
+ don't fix incompatibility issue for swing
+ use bootdelegation to resolve org.w3c.dom.events issue. let all use class from jdk

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,
- net.sourceforge.barbecue.linear.ean;version="1.5.0.beta1",
+ 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",

org.adempiere.report.jasper-feature/feature.xml

@@ -35,13 +35,6 @@
          install-size="0"
          version="0.0.0"/>
 
-   <plugin
-         id="com.jaspersoft.studio.bundles.batik"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.antlr.runtime"
          download-size="0"
@@ -63,20 +56,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="com.jaspersoft.studio.bundles.poi"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.jaspersoft.studio.bundles.zxing"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="bctsp"
          download-size="0"
@@ -112,13 +91,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.apache.servicemix.bundles.jaxen"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.jfree.chart-osgi"
          download-size="0"
@@ -140,13 +112,6 @@
          version="3.5.0.v20120725-1805"
          unpack="false"/>
 
-   <plugin
-         id="com.jaspersoft.studio.bundles.jxl"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="net.sf.jasperreports.engine"
          download-size="0"
@@ -161,13 +126,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.w3c.dom.events"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.w3c.dom.smil"
          download-size="0"
@@ -204,18 +162,325 @@
          unpack="false"/>
 
    <plugin
-         id="org.apache.servicemix.bundles.xmlbeans"
+         id="com.google.zxing.core"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.w3c.dom.svg.patch"
+         id="org.apache.poi.poi"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.poi.poi-ooxml"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.poi.poi-ooxml-schemas"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.batik.anim"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.batik.bridge"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.batik.codec"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.batik.constants"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.batik.css"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.batik.dom"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.batik.dom.svg"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.batik.ext.awt"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.batik.extension"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.batik.gvt"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.batik.i18n"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.batik.parser"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.batik.pdf"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.batik.script"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.batik.svggen"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.batik.swing"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.batik.transcoder"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.batik.util"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.batik.util.gui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.batik.xml"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.xmlgraphics"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.fasterxml.jackson.core.jackson-annotations"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.fasterxml.jackson.core.jackson-core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.fasterxml.jackson.core.jackson-databind"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.fasterxml.jackson.dataformat.jackson-dataformat-xml"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.fasterxml.jackson.datatype.jackson-datatype-guava"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.fasterxml.jackson.datatype.jackson-datatype-joda"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-xml-provider"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.fasterxml.jackson.module.jackson-module-jsonSchema"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.fasterxml.woodstox.woodstox-core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="javax.validation.api"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="stax2-api"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="javax.ws.rs"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.google.guava"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.json"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.fasterxml.jackson.module.jackson-module-jsonSchema.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.fasterxml.jackson.datatype.jackson-datatype-json-org"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="json"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.w3c.dom.events"
          download-size="0"
          install-size="0"
          version="0.0.0"
-         fragment="true"
          unpack="false"/>
 
 </feature>

org.adempiere.report.jasper.library/.classpath

@@ -4,12 +4,11 @@
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry exported="true" kind="lib" path="lib/castor-core.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/castor-xml.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jasperreports-fonts.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jasperreports-chart-customizers.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jasperreports-chart-themes.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jasperreports-fonts.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jasperreports-functions.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/olap4j.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/rhino.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/spring-beans.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/spring-core.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/xmpcore.jar"/>

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

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

org.adempiere.report.jasper.library/pom.xml

@@ -48,11 +48,6 @@
 									<artifactId>jasperreports-functions</artifactId>
 									<version>${jp.version}</version>
 								</artifactItem>
-								<artifactItem>
-									<groupId>org.mozilla</groupId>
-									<artifactId>rhino</artifactId>
-									<version>1.7.6</version>
-								</artifactItem>
 								<artifactItem>
 									<groupId>org.olap4j</groupId>
 									<artifactId>olap4j</artifactId>
@@ -93,7 +88,7 @@
 							<goal>wget</goal>
 						</goals>
 						<configuration>
-							<url>${url.file.srv}/jarfile/jp-6.3.1/jasperreports-fonts-6.3.1.jar</url>
+							<url>${url.file.srv}/jarfile/jp-${jp.version}/jasperreports-fonts-${jp.version}.jar</url>
 							<unpack>false</unpack>
 							<outputDirectory>lib</outputDirectory>
 							<outputFileName>jasperreports-fonts.jar</outputFileName>

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

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);
+		//btnFitPage.setSelected(true);
-		setZooms();
+		//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);
 		}

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",

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

org.adempiere.server-feature/server.product

@@ -9,7 +9,7 @@
    <launcherArgs>
       <programArgs>-console
       </programArgs>
-      <vmArgs>-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
+      <vmArgs>-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
       </vmArgs>
       <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
       </vmArgsMac>

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,\

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,\

org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml

@@ -1,12 +1,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
 		<version>5.1.0-SNAPSHOT</version>
 		<relativePath>../../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
+	<modelVersion>4.0.0</modelVersion>
 	<artifactId>org.idempiere.maven.to.p2</artifactId>
 	<packaging>pom</packaging>
 	<properties>
@@ -17,9 +17,29 @@
 		<jetty.conscrypt.version>8.1.12.v20180117</jetty.conscrypt.version>
 		<jetty.osgi.servlet.api.version>3.1.0.M3</jetty.osgi.servlet.api.version>
 		<jetty.conscrypt.openjdk.uber.version>1.1.0</jetty.conscrypt.openjdk.uber.version>
-		
+        <jackson.version>2.9.5</jackson.version> <!--it up to version of jasperreport engine-->
-		
+        <stax2.api.version>3.1.4</stax2.api.version> <!--it up to version of jasperreport engine-->
+        <validation.api.version>1.1.0.Final</validation.api.version> <!--it up to version of jasperreport engine-->
+        <woodstox.core.version>5.0.3</woodstox.core.version> <!--it up to version of jasperreport engine-->
+        <json.version>20171018</json.version> <!--it up to version of jackson-datatype-json-org-->
 	</properties>
+	
+    <repositories>
+        <repository>
+            <id>orbit-photon-R20180531190352</id><!--only this repository have bakik 1.9-->
+            <url>http://download.eclipse.org/tools/orbit/downloads/drops2/R20180531190352/repository</url>
+            <layout>p2</layout>
+        </repository>
+        <repository>
+	        <id>org.jfree.chart</id>
+	        <url>http://nexus.orbisgis.org/content/repositories/osgi-maven</url>
+        </repository>
+        <repository>
+	        <id>jasperstudio-6.6.0</id>
+	        <url>https://sourceforge.net/projects/jasperstudio/files/updatesite/6.6.0</url>
+            <layout>p2</layout>
+        </repository>
+    </repositories>
 
 	<build>
 		<plugins>
@@ -475,18 +495,158 @@
 									<artifacts>
 										<artifact>
 											<id>net.sf.jasperreports:jasperreports:jar:${jp.version}</id>
-											<source>false</source>
+											<source>true</source>
 											<transitive>false</transitive>
-											<override>true</override>
+										</artifact>
+										<artifact>
+											<id>commons-digester:commons-digester:jar:2.1</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>com.google.zxing:core:jar:3.2.1</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxen:jar:1.1.1_2</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.apache.servicemix.bundles:org.apache.servicemix.bundles.rhino:jar:1.7.6_1</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.jfree:jfreechart-osgi:jar:1.0.19</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.jfree:jcommon-osgi:jar:1.0.23</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.apache.poi:poi:jar:3.15</id>
+											<source>true</source>
+											<transitive>false</transitive>
+                                            <override>true</override>
 											<instructions>
-												<Bundle-SymbolicName>net.sf.jasperreports.engine</Bundle-SymbolicName>
+												<Bundle-SymbolicName>org.apache.poi.poi</Bundle-SymbolicName>
-												<Bundle-Name>net.sf.jasperreports.engine</Bundle-Name>
+												<Bundle-Name>poi-ooxml</Bundle-Name>
+                                                <Import-Package>*;resolution:=optional</Import-Package>
+                                                <Export-Package>*</Export-Package>
 											</instructions>
 										</artifact>
+										<artifact>
+											<id>org.apache.poi:poi-ooxml:jar:3.15</id>
+											<source>true</source>
+											<transitive>false</transitive>
+                                            <override>true</override>
+											<instructions>
+												<Bundle-SymbolicName>org.apache.poi.poi-ooxml</Bundle-SymbolicName>
+												<Bundle-Name>poi-ooxml</Bundle-Name>
+                                                <Import-Package>*;resolution:=optional</Import-Package>
+                                                <Export-Package>*</Export-Package>
+											</instructions>
+										</artifact>
+										<artifact>
+											<id>org.apache.poi:poi-ooxml-schemas:jar:3.15</id>
+											<source>true</source>
+											<transitive>false</transitive>
+                                            <override>true</override>
+											<instructions>
+												<Bundle-SymbolicName>org.apache.poi.poi-ooxml-schemas</Bundle-SymbolicName>
+												<Bundle-Name>poi-ooxml-schemas</Bundle-Name>
+                                                <Import-Package>*;resolution:=optional</Import-Package>
+                                                <Export-Package>*</Export-Package>
+											</instructions>
+										</artifact>
+										<artifact>
+											<id>com.fasterxml.jackson.core:jackson-core:jar:${jackson.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>com.fasterxml.jackson.core:jackson-annotations:jar:${jackson.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>com.fasterxml.jackson.core:jackson-databind:jar:${jackson.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>com.fasterxml.jackson.dataformat:jackson-dataformat-xml:jar:${jackson.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>com.fasterxml.jackson.datatype:jackson-datatype-guava:jar:${jackson.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>com.fasterxml.jackson.datatype:jackson-datatype-joda:jar:${jackson.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>com.fasterxml.jackson.datatype:jackson-datatype-json-org:jar:${jackson.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:jar:${jackson.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:jar:${jackson.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>com.fasterxml.jackson.jaxrs:jackson-jaxrs-xml-provider:jar:${jackson.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:${jackson.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>com.fasterxml.jackson.module:jackson-module-jsonSchema:jar:${jackson.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.codehaus.woodstox:stax2-api:jar:${stax2.api.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>javax.validation:validation-api:jar:${validation.api.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>com.fasterxml.woodstox:woodstox-core:jar:${woodstox.core.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.json:json:jar:${json.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
 									</artifacts>
 								</feature>
 							</featureDefinitions>
-
 							<artifacts>
 								<artifact>
 									<id>org.javassist:javassist:${zk.javassist.src.version}</id>
@@ -504,7 +664,83 @@
 									</instructions>
 								</artifact>
 							</artifacts>
-
+                            <p2>
+                                <artifact>
+                                    <id>org.apache.batik.anim:1.9.1.v20180528-1434</id>
+                                </artifact>
+                                <artifact>
+                                    <id>org.apache.batik.bridge:1.9.1.v20180313-1559</id>
+                                </artifact>
+                                <artifact>
+                                    <id>org.apache.batik.codec:1.9.1.v20180313-1559</id>
+                                </artifact>
+                                <artifact>
+                                    <id>org.apache.batik.constants:1.9.1.v20180227-1645</id>
+                                </artifact>
+                                <artifact>
+                                    <id>org.apache.batik.css:1.9.1.v20180313-1559</id>
+                                </artifact>
+                                <artifact>
+                                    <id>org.apache.batik.dom:1.9.1.v20180528-1434</id>
+                                </artifact>
+                                <artifact>
+                                    <id>org.apache.batik.dom.svg:1.9.1.v20180313-1559</id>
+                                </artifact>
+                                <artifact>
+                                    <id>org.apache.batik.ext.awt:1.9.1.v20180227-1645</id>
+                                </artifact>
+                                <artifact>
+                                    <id>org.apache.batik.extension:1.9.1.v20180313-1559</id>
+                                </artifact>
+                                <artifact>
+                                    <id>org.apache.batik.gvt:1.9.1.v20180227-1645</id>
+                                </artifact>
+                                <artifact>
+                                    <id>org.apache.batik.i18n:1.9.1.v20180227-1645</id>
+                                </artifact>
+                                <artifact>
+                                    <id>org.apache.batik.parser:1.9.1.v20180313-1559</id>
+                                </artifact>
+                                <artifact>
+                                    <id>org.apache.batik.pdf:1.9.1.v20180417-1407</id>
+                                </artifact>
+                                <artifact>
+                                    <id>org.apache.batik.script:1.9.1.v20180313-1559</id>
+                                </artifact>
+                                <artifact>
+                                    <id>org.apache.batik.svggen:1.9.1.v20180313-1559</id>
+                                </artifact>
+                                <artifact>
+                                    <id>org.apache.batik.swing:1.9.1.v20180313-1559</id>
+                                </artifact>
+                                <artifact>
+                                    <id>org.apache.batik.transcoder:1.9.1.v20180313-1559</id>
+                                </artifact>
+                                <artifact>
+                                    <id>org.apache.batik.util:1.9.1.v20180227-1645</id>
+                                </artifact>
+                                <artifact>
+                                    <id>org.apache.batik.util.gui:1.9.1.v20180227-1645</id>
+                                </artifact>
+                                <artifact>
+                                    <id>org.apache.batik.xml:1.9.1.v20180227-1645</id>
+                                </artifact>
+                                <artifact>
+                                    <id>org.apache.xmlgraphics:2.2.0.v20180410-1551</id>
+                                </artifact>
+                                <artifact>
+                                    <id>com.jaspersoft.studio.bundles.barbecue:1.5.0.beta1_b02</id>
+                                </artifact>
+                                <artifact>
+                                    <id>com.jaspersoft.studio.bundles.itext:2.1.7.js6_b02</id>
+                                </artifact>
+                                <artifact>
+                                    <id>org.w3c.dom.svg.patch:1.1.0.b02</id>
+                                </artifact>
+                                <artifact>
+                                    <id>org.krysalis.barcode4j:2.1.0</id>
+                                </artifact>
+                            </p2>
 						</configuration>
 					</execution>
 				</executions>
@@ -539,7 +775,7 @@
 						<id>rename-file</id>
 						<phase>package</phase>
 						<goals>
-							<goal>rename</goal>
+							<goal>copy</goal>
 						</goals>
 						<configuration>
 							<fileSets>
@@ -607,13 +843,29 @@
 
 						</goals>
 						<configuration>
-							<append>false</append>
+							<append>true</append>
 							<sourceLocation>${project.build.directory}/repository</sourceLocation>
 						</configuration>
 					</execution>
 				</executions>
 			</plugin>
 
+			<plugin>
+				<groupId>org.eclipse.tycho.extras</groupId>
+				<artifactId>tycho-eclipserun-plugin</artifactId>
+				<configuration>
+					<appArgLine>-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</appArgLine>
+				</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>eclipse-run</goal>
+						</goals>
+						<phase>package</phase>
+					</execution>
+				</executions>
+			</plugin>
+
 		</plugins>
 	</build>
 </project>

org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="idempiere" sequenceNumber="107">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="idempiere-180911" sequenceNumber="107">
 <locations>
 <location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.restlet.example.feature.group" version="2.3.2.v20150501-1520"/>
@@ -47,136 +47,12 @@
 <unit id="org.restlet.ext.xstream.feature.group" version="2.3.2.v20150501-1520"/>
 <unit id="org.restlet.feature.group" version="2.3.2.v20150501-1520"/>
 <repository location="http://p2.restlet.com/2.3"/>
+</location>
 <location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.jetty.bundles.f.feature.group" version="9.4.11.v20180605"/>
 <unit id="org.eclipse.jetty.bundles.f.source.feature.group" version="9.4.11.v20180605"/>
 <repository location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.11.v20180605"/>
 </location>
-<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="bcmail" version="1.58.0"/>
-<unit id="bcmail.source" version="1.58.0"/>
-<unit id="bcpkix" version="1.58.0"/>
-<unit id="bcpkix.source" version="1.58.0"/>
-<unit id="bcprov" version="1.58.0"/>
-<unit id="bcprov.source" version="1.58.0"/>
-<unit id="bctsp" version="1.46.0"/>
-<unit id="bctsp.source" version="1.46.0"/>
-<unit id="com.ibm.icu" version="60.2.0"/>
-<unit id="com.ibm.icu.source" version="60.2.0"/>
-<unit id="com.itextpdf" version="5.5.12"/>
-<unit id="com.itextpdf.source" version="5.5.12"/>
-<unit id="com.sun.mail.javax.mail" version="1.6.0"/>
-<unit id="com.sun.mail.javax.mail.source" version="1.6.0"/>
-<unit id="groovy-all" version="2.4.13"/>
-<unit id="groovy-all.source" version="2.4.13"/>
-<unit id="javax.annotation-api" version="1.3.1"/>
-<unit id="javax.annotation-api.source" version="1.3.1"/>
-<unit id="javax.management.j2ee-api" version="1.1.1"/>
-<unit id="javax.management.j2ee-api.source" version="1.1.1"/>
-<unit id="javax.websocket-api" version="1.1.0"/>
-<unit id="javax.websocket-api.source" version="1.1.0"/>
-<unit id="joda-time" version="2.9.9"/>
-<unit id="joda-time.source" version="2.9.9"/>
-<unit id="net.sf.jasperreports.engine" version="6.3.1"/>
-<unit id="net.sf.supercsv.super-csv" version="2.4.0"/>
-<unit id="net.sf.supercsv.super-csv.source" version="2.4.0"/>
-<unit id="org.apache.activemq.activemq-core" version="5.7.0"/>
-<unit id="org.apache.activemq.activemq-core.source" version="5.7.0"/>
-<unit id="org.apache.activemq.kahadb" version="5.7.0"/>
-<unit id="org.apache.activemq.kahadb.source" version="5.7.0"/>
-<unit id="org.apache.aries.spifly.dynamic.bundle" version="1.0.10"/>
-<unit id="org.apache.aries.spifly.dynamic.bundle.source" version="1.0.10"/>
-<unit id="org.apache.aries.util" version="1.1.3"/>
-<unit id="org.apache.aries.util.source" version="1.1.3"/>
-<unit id="org.apache.commons.commons-collections4" version="4.2.0"/>
-<unit id="org.apache.commons.commons-collections4.source" version="4.2.0"/>
-<unit id="org.apache.commons.configuration" version="2.2.0"/>
-<unit id="org.apache.commons.configuration.source" version="2.2.0"/>
-<unit id="org.apache.commons.digester" version="2.1.0"/>
-<unit id="org.apache.commons.digester.source" version="2.1.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.felix.inventory" version="1.0.6"/>
-<unit id="org.apache.felix.inventory.source" version="1.0.6"/>
-<unit id="org.apache.felix.webconsole" version="4.3.4"/>
-<unit id="org.apache.felix.webconsole.plugins.ds" version="2.0.8"/>
-<unit id="org.apache.felix.webconsole.plugins.ds.source" version="2.0.8"/>
-<unit id="org.apache.felix.webconsole.plugins.memoryusage" version="1.0.6"/>
-<unit id="org.apache.felix.webconsole.plugins.memoryusage.source" version="1.0.6"/>
-<unit id="org.apache.felix.webconsole.plugins.packageadmin" version="1.0.4"/>
-<unit id="org.apache.felix.webconsole.plugins.packageadmin.source" version="1.0.4"/>
-<unit id="org.apache.felix.webconsole.source" version="4.3.4"/>
-<unit id="org.apache.servicemix.bundles.cglib" version="3.2.5.1"/>
-<unit id="org.apache.servicemix.bundles.cglib.source" version="3.2.5.1"/>
-<unit id="org.apache.taglibs.standard-impl" version="1.2.5"/>
-<unit id="org.apache.taglibs.standard-impl.source" version="1.2.5"/>
-<unit id="org.apache.taglibs.standard-jstlel" version="1.2.5"/>
-<unit id="org.apache.taglibs.standard-jstlel.source" version="1.2.5"/>
-<unit id="org.apache.taglibs.taglibs-standard-spec" version="1.2.5"/>
-<unit id="org.apache.taglibs.taglibs-standard-spec.source" version="1.2.5"/>
-<unit id="org.apache.velocity" version="1.7.0"/>
-<unit id="org.apache.velocity.source" version="1.7.0"/>
-<unit id="org.atmosphere.runtime" version="2.4.16"/>
-<unit id="org.atmosphere.runtime.source" version="2.4.16"/>
-<unit id="org.cryptacular" version="1.2.1"/>
-<unit id="org.cryptacular.source" version="1.2.1"/>
-<unit id="org.eclipse.jdt.core.compiler.batch" version="3.8.2.v20130121-145325"/>
-<unit id="org.eclipse.jdt.core.compiler.batch.source" version="3.8.2.v20130121-145325"/>
-<unit id="org.eclipse.jetty.alpn.api" version="1.1.3.v20160715"/>
-<unit id="org.eclipse.jetty.alpn.api.source" version="1.1.3.v20160715"/>
-<unit id="org.eclipse.jetty.alpn.conscrypt.server" version="9.4.9.v20180320"/>
-<unit id="org.eclipse.jetty.alpn.conscrypt.server.source" version="9.4.9.v20180320"/>
-<unit id="org.eclipse.jetty.alpn.openjdk8.server" version="9.4.9.v20180320"/>
-<unit id="org.eclipse.jetty.alpn.openjdk8.server.source" version="9.4.9.v20180320"/>
-<unit id="org.eclipse.jetty.osgi-servlet-api" version="3.1.0.M3"/>
-<unit id="org.eclipse.jetty.osgi-servlet-api.source" version="3.1.0.M3"/>
-<unit id="org.idempiere.org.conscrypt.openjdk-uber" version="1.1.0"/>
-<unit id="org.idempiere.org.conscrypt.openjdk-uber.source" version="1.1.0"/>
-<unit id="org.mortbay.jasper.apache-el" version="8.5.24"/>
-<unit id="org.mortbay.jasper.apache-el.source" version="8.5.24"/>
-<unit id="org.mortbay.jasper.apache-jsp" version="8.5.24"/>
-<unit id="org.passay" version="1.3.0"/>
-<unit id="org.passay.source" version="1.3.0"/>
-<unit id="zcommon" version="8.5.0"/>
-<unit id="zcommon.sources" version="8.5.0"/>
-<unit id="zel" version="8.5.0"/>
-<unit id="zel.sources" version="8.5.0"/>
-<unit id="zhtml" version="8.5.0"/>
-<unit id="zhtml.sources" version="8.5.0"/>
-<unit id="zjavassist" version="8.5.0"/>
-<unit id="zjavassist.sources" version="8.5.0"/>
-<unit id="zk" version="8.5.0"/>
-<unit id="zk.sources" version="8.5.0"/>
-<unit id="zkbind" version="8.5.0"/>
-<unit id="zkbind.sources" version="8.5.0"/>
-<unit id="zkplus" version="8.5.0"/>
-<unit id="zkplus.sources" version="8.5.0"/>
-<unit id="zul" version="8.5.0"/>
-<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-R20180726"/>
-</location>
-	<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-		<unit id="com.jaspersoft.studio.bundles.barbecue" version="1.5.0.beta1"/>
-		<unit id="com.jaspersoft.studio.bundles.batik" version="1.8.0.js01"/>
-		<unit id="com.jaspersoft.studio.bundles.commons-digester" version="2.1.0.201503161008"/>
-		<unit id="com.jaspersoft.studio.bundles.itext" version="2.1.7.js5"/>
-		<unit id="com.jaspersoft.studio.bundles.jxl" version="2.6.10"/>
-		<unit id="com.jaspersoft.studio.bundles.poi" version="3.10.1.201502161145"/>
-		<unit id="com.jaspersoft.studio.bundles.zxing" version="2.3.0"/>
-		<unit id="net.sf.jasperreports.engine" version="6.3.1"/>
-		<unit id="net.sf.jasperreports.engine.source" version="6.3.1"/>
-		<unit id="org.apache.commons.collections" version="3.2.2.v201511171945"/>
-		<unit id="org.apache.servicemix.bundles.jaxen" version="1.1.1.2"/>
-		<unit id="org.apache.servicemix.bundles.rhino" version="1.7.6.1"/>
-		<unit id="org.apache.servicemix.bundles.xmlbeans" version="2.5.0.2"/>
-		<unit id="org.jfree.chart-osgi" version="1.0.19"/>
-		<unit id="org.jfree.jcommon-osgi" version="1.0.23"/>
-		<unit id="org.krysalis.barcode4j" version="2.1.0"/>
-		<repository location="https://sourceforge.net/projects/idempiere/files/binary.file/jarfile/jp-p2/jp-6.3.1/"/>
-		<unit id="org.w3c.dom.svg.patch" version="1.1.0"/>
-	</location>
 	<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
 		<unit id="org.eclipse.e4.core.tools.feature.source.feature.group" version="4.8.0.v20180512-1132"/>
 		<unit id="org.eclipse.pde.api.tools.ee.feature.feature.group" version="1.0.300.v20180221-1224"/>
@@ -921,6 +797,181 @@
 		<unit id="scannotation.source" version="1.0.2.v201205170710"/>
 		<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20180606145124/repository"/>
 	</location>
+	<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+		<unit id="bcmail" version="1.58.0"/>
+		<unit id="bcmail.source" version="1.58.0"/>
+		<unit id="bcpkix" version="1.58.0"/>
+		<unit id="bcpkix.source" version="1.58.0"/>
+		<unit id="bcprov" version="1.58.0"/>
+		<unit id="bcprov.source" version="1.58.0"/>
+		<unit id="bctsp" version="1.46.0"/>
+		<unit id="bctsp.source" version="1.46.0"/>
+		<unit id="com.fasterxml.jackson.core.jackson-annotations" version="2.9.5"/>
+		<unit id="com.fasterxml.jackson.core.jackson-annotations.source" version="2.9.5"/>
+		<unit id="com.fasterxml.jackson.core.jackson-core" version="2.9.5"/>
+		<unit id="com.fasterxml.jackson.core.jackson-core.source" version="2.9.5"/>
+		<unit id="com.fasterxml.jackson.core.jackson-databind" version="2.9.5"/>
+		<unit id="com.fasterxml.jackson.core.jackson-databind.source" version="2.9.5"/>
+		<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-xml" version="2.9.5"/>
+		<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-xml.source" version="2.9.5"/>
+		<unit id="com.fasterxml.jackson.datatype.jackson-datatype-guava" version="2.9.5"/>
+		<unit id="com.fasterxml.jackson.datatype.jackson-datatype-guava.source" version="2.9.5"/>
+		<unit id="com.fasterxml.jackson.datatype.jackson-datatype-joda" version="2.9.5"/>
+		<unit id="com.fasterxml.jackson.datatype.jackson-datatype-joda.source" version="2.9.5"/>
+		<unit id="com.fasterxml.jackson.datatype.jackson-datatype-json-org" version="2.9.5"/>
+		<unit id="com.fasterxml.jackson.datatype.jackson-datatype-json-org.source" version="2.9.5"/>
+		<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base" version="2.9.5"/>
+		<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base.source" version="2.9.5"/>
+		<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" version="2.9.5"/>
+		<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider.source" version="2.9.5"/>
+		<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-xml-provider" version="2.9.5"/>
+		<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-xml-provider.source" version="2.9.5"/>
+		<unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations" version="2.9.5"/>
+		<unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations.source" version="2.9.5"/>
+		<unit id="com.fasterxml.jackson.module.jackson-module-jsonSchema" version="2.9.5"/>
+		<unit id="com.fasterxml.jackson.module.jackson-module-jsonSchema.source" version="2.9.5"/>
+		<unit id="com.fasterxml.woodstox.woodstox-core" version="5.0.3"/>
+		<unit id="com.fasterxml.woodstox.woodstox-core.source" version="5.0.3"/>
+		<unit id="com.google.zxing.core" version="3.2.1"/>
+		<unit id="com.google.zxing.core.source" version="3.2.1"/>
+		<unit id="com.ibm.icu" version="60.2.0"/>
+		<unit id="com.ibm.icu.source" version="60.2.0"/>
+		<unit id="com.itextpdf" version="5.5.12"/>
+		<unit id="com.itextpdf.source" version="5.5.12"/>
+		<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.mail.javax.mail" version="1.6.0"/>
+		<unit id="com.sun.mail.javax.mail.source" version="1.6.0"/>
+		<unit id="groovy-all" version="2.4.13"/>
+		<unit id="groovy-all.source" version="2.4.13"/>
+		<unit id="javax.annotation-api" version="1.3.1"/>
+		<unit id="javax.annotation-api.source" version="1.3.1"/>
+		<unit id="javax.management.j2ee-api" version="1.1.1"/>
+		<unit id="javax.management.j2ee-api.source" version="1.1.1"/>
+		<unit id="javax.validation.api" 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.source" version="1.1.0"/>
+		<unit id="joda-time" version="2.9.9"/>
+		<unit id="joda-time.source" version="2.9.9"/>
+		<unit id="json" version="20171018.0.0"/>
+		<unit id="json.source" version="20171018.0.0"/>
+		<unit id="net.sf.jasperreports.engine" version="6.6.0"/>
+		<unit id="net.sf.jasperreports.engine.source" version="6.6.0"/>
+		<unit id="net.sf.supercsv.super-csv" version="2.4.0"/>
+		<unit id="net.sf.supercsv.super-csv.source" version="2.4.0"/>
+		<unit id="org.apache.activemq.activemq-core" version="5.7.0"/>
+		<unit id="org.apache.activemq.activemq-core.source" version="5.7.0"/>
+		<unit id="org.apache.activemq.kahadb" version="5.7.0"/>
+		<unit id="org.apache.activemq.kahadb.source" version="5.7.0"/>
+		<unit id="org.apache.aries.spifly.dynamic.bundle" version="1.0.10"/>
+		<unit id="org.apache.aries.spifly.dynamic.bundle.source" version="1.0.10"/>
+		<unit id="org.apache.aries.util" version="1.1.3"/>
+		<unit id="org.apache.aries.util.source" version="1.1.3"/>
+		<unit id="org.apache.batik.anim" version="1.9.1.v20180528-1434"/>
+		<unit id="org.apache.batik.bridge" version="1.9.1.v20180313-1559"/>
+		<unit id="org.apache.batik.codec" version="1.9.1.v20180313-1559"/>
+		<unit id="org.apache.batik.constants" version="1.9.1.v20180227-1645"/>
+		<unit id="org.apache.batik.css" version="1.9.1.v20180313-1559"/>
+		<unit id="org.apache.batik.dom" version="1.9.1.v20180528-1434"/>
+		<unit id="org.apache.batik.dom.svg" version="1.9.1.v20180313-1559"/>
+		<unit id="org.apache.batik.ext.awt" version="1.9.1.v20180227-1645"/>
+		<unit id="org.apache.batik.extension" version="1.9.1.v20180313-1559"/>
+		<unit id="org.apache.batik.gvt" version="1.9.1.v20180227-1645"/>
+		<unit id="org.apache.batik.i18n" version="1.9.1.v20180227-1645"/>
+		<unit id="org.apache.batik.parser" version="1.9.1.v20180313-1559"/>
+		<unit id="org.apache.batik.pdf" version="1.9.1.v20180417-1407"/>
+		<unit id="org.apache.batik.script" version="1.9.1.v20180313-1559"/>
+		<unit id="org.apache.batik.svggen" version="1.9.1.v20180313-1559"/>
+		<unit id="org.apache.batik.swing" version="1.9.1.v20180313-1559"/>
+		<unit id="org.apache.batik.transcoder" version="1.9.1.v20180313-1559"/>
+		<unit id="org.apache.batik.util" version="1.9.1.v20180227-1645"/>
+		<unit id="org.apache.batik.util.gui" version="1.9.1.v20180227-1645"/>
+		<unit id="org.apache.batik.xml" version="1.9.1.v20180227-1645"/>
+		<unit id="org.apache.commons.commons-collections4" version="4.2.0"/>
+		<unit id="org.apache.commons.commons-collections4.source" version="4.2.0"/>
+		<unit id="org.apache.commons.configuration" version="2.2.0"/>
+		<unit id="org.apache.commons.configuration.source" version="2.2.0"/>
+		<unit id="org.apache.commons.digester" version="2.1.0"/>
+		<unit id="org.apache.commons.digester.source" version="2.1.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.felix.inventory" version="1.0.6"/>
+		<unit id="org.apache.felix.inventory.source" version="1.0.6"/>
+		<unit id="org.apache.felix.webconsole" version="4.3.4"/>
+		<unit id="org.apache.felix.webconsole.plugins.ds" version="2.0.8"/>
+		<unit id="org.apache.felix.webconsole.plugins.ds.source" version="2.0.8"/>
+		<unit id="org.apache.felix.webconsole.plugins.memoryusage" version="1.0.6"/>
+		<unit id="org.apache.felix.webconsole.plugins.memoryusage.source" version="1.0.6"/>
+		<unit id="org.apache.felix.webconsole.plugins.packageadmin" version="1.0.4"/>
+		<unit id="org.apache.felix.webconsole.plugins.packageadmin.source" version="1.0.4"/>
+		<unit id="org.apache.felix.webconsole.source" version="4.3.4"/>
+		<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-schemas" 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.servicemix.bundles.cglib" version="3.2.5.1"/>
+		<unit id="org.apache.servicemix.bundles.cglib.source" version="3.2.5.1"/>
+		<unit id="org.apache.servicemix.bundles.jaxen" version="1.1.1.2"/>
+		<unit id="org.apache.servicemix.bundles.rhino" version="1.7.6.1"/>
+		<unit id="org.apache.servicemix.bundles.rhino.source" version="1.7.6.1"/>
+		<unit id="org.apache.taglibs.standard-impl" version="1.2.5"/>
+		<unit id="org.apache.taglibs.standard-impl.source" version="1.2.5"/>
+		<unit id="org.apache.taglibs.standard-jstlel" version="1.2.5"/>
+		<unit id="org.apache.taglibs.standard-jstlel.source" version="1.2.5"/>
+		<unit id="org.apache.taglibs.taglibs-standard-spec" version="1.2.5"/>
+		<unit id="org.apache.taglibs.taglibs-standard-spec.source" version="1.2.5"/>
+		<unit id="org.apache.velocity" version="1.7.0"/>
+		<unit id="org.apache.velocity.source" version="1.7.0"/>
+		<unit id="org.apache.xmlgraphics" version="2.2.0.v20180410-1551"/>
+		<unit id="org.atmosphere.runtime" version="2.4.16"/>
+		<unit id="org.atmosphere.runtime.source" version="2.4.16"/>
+		<unit id="org.cryptacular" version="1.2.1"/>
+		<unit id="org.cryptacular.source" version="1.2.1"/>
+		<unit id="org.eclipse.jdt.core.compiler.batch" version="3.8.2.v20130121-145325"/>
+		<unit id="org.eclipse.jdt.core.compiler.batch.source" version="3.8.2.v20130121-145325"/>
+		<unit id="org.eclipse.jetty.alpn.api" version="1.1.3.v20160715"/>
+		<unit id="org.eclipse.jetty.alpn.api.source" version="1.1.3.v20160715"/>
+		<unit id="org.eclipse.jetty.alpn.conscrypt.server" version="9.4.11.v20180605"/>
+		<unit id="org.eclipse.jetty.alpn.conscrypt.server.source" version="9.4.11.v20180605"/>
+		<unit id="org.eclipse.jetty.alpn.openjdk8.server" version="9.4.11.v20180605"/>
+		<unit id="org.eclipse.jetty.alpn.openjdk8.server.source" version="9.4.11.v20180605"/>
+		<unit id="org.eclipse.jetty.osgi-servlet-api" version="3.1.0.M3"/>
+		<unit id="org.eclipse.jetty.osgi-servlet-api.source" version="3.1.0.M3"/>
+		<unit id="org.idempiere.org.conscrypt.openjdk-uber" version="1.1.0"/>
+		<unit id="org.idempiere.org.conscrypt.openjdk-uber.source" version="1.1.0"/>
+		<unit id="org.jfree.chart-osgi" version="1.0.19"/>
+		<unit id="org.jfree.jcommon-osgi" version="1.0.23"/>
+		<unit id="org.krysalis.barcode4j" version="2.1.0"/>
+		<unit id="org.mortbay.jasper.apache-el" version="8.5.24"/>
+		<unit id="org.mortbay.jasper.apache-el.source" version="8.5.24"/>
+		<unit id="org.mortbay.jasper.apache-jsp" version="8.5.24"/>
+		<unit id="org.passay" version="1.3.0"/>
+		<unit id="org.passay.source" version="1.3.0"/>
+		<unit id="org.w3c.dom.svg.patch" version="1.1.0.b02"/>
+		<unit id="stax2-api" version="3.1.4"/>
+		<unit id="stax2-api.source" version="3.1.4"/>
+		<unit id="zcommon" version="8.5.0"/>
+		<unit id="zcommon.sources" version="8.5.0"/>
+		<unit id="zel" version="8.5.0"/>
+		<unit id="zel.sources" version="8.5.0"/>
+		<unit id="zhtml" version="8.5.0"/>
+		<unit id="zhtml.sources" version="8.5.0"/>
+		<unit id="zjavassist" version="8.5.0"/>
+		<unit id="zjavassist.sources" version="8.5.0"/>
+		<unit id="zk" version="8.5.0"/>
+		<unit id="zk.sources" version="8.5.0"/>
+		<unit id="zkbind" version="8.5.0"/>
+		<unit id="zkbind.sources" version="8.5.0"/>
+		<unit id="zkplus" version="8.5.0"/>
+		<unit id="zkplus.sources" version="8.5.0"/>
+		<unit id="zul" version="8.5.0"/>
+		<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-R20180911"/>
+	</location>
 </locations>
 <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 </target>

org.idempiere.p2/category.xml

@@ -36,36 +36,6 @@
    <feature url="features/org.compiere.db.provider.feature_5.1.0.qualifier.jar" id="org.compiere.db.provider.feature" version="5.1.0.qualifier">
       <category name="idempiere.core"/>
    </feature>
-   <feature url="features/org.eclipse.ecf.core.feature_1.4.0.v20170516-2248.jar" id="org.eclipse.ecf.core.feature" version="1.4.0.v20170516-2248">
-      <category name="idempiere.core"/>
-   </feature>
-   <feature url="features/org.eclipse.ecf.core.ssl.feature_1.1.0.v20170110-1317.jar" id="org.eclipse.ecf.core.ssl.feature" version="1.1.0.v20170110-1317">
-      <category name="idempiere.core"/>
-   </feature>
-   <feature url="features/org.eclipse.ecf.filetransfer.feature_3.13.7.v20170516-2248.jar" id="org.eclipse.ecf.filetransfer.feature" version="3.13.7.v20170516-2248">
-      <category name="idempiere.core"/>
-   </feature>
-   <feature url="features/org.eclipse.ecf.filetransfer.httpclient4.feature_3.13.7.v20170516-2248.jar" id="org.eclipse.ecf.filetransfer.httpclient4.feature" version="3.13.7.v20170516-2248">
-      <category name="idempiere.core"/>
-   </feature>
-   <feature url="features/org.eclipse.ecf.filetransfer.httpclient4.ssl.feature_1.1.0.v20170110-1317.jar" id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature" version="1.1.0.v20170110-1317">
-      <category name="idempiere.core"/>
-   </feature>
-   <feature url="features/org.eclipse.ecf.filetransfer.ssl.feature_1.1.0.v20170110-1317.jar" id="org.eclipse.ecf.filetransfer.ssl.feature" version="1.1.0.v20170110-1317">
-      <category name="idempiere.core"/>
-   </feature>
-   <feature url="features/org.eclipse.equinox.executable_3.7.2.v20171108-1834.jar" id="org.eclipse.equinox.executable" version="3.7.2.v20171108-1834">
-      <category name="idempiere.core"/>
-   </feature>
-   <feature url="features/org.eclipse.equinox.server.core_1.5.3.v20180210-1608.jar" id="org.eclipse.equinox.server.core" version="1.5.3.v20180210-1608">
-      <category name="idempiere.core"/>
-   </feature>
-   <feature url="features/org.eclipse.equinox.server.p2_1.3.1.v20170928-1405.jar" id="org.eclipse.equinox.server.p2" version="1.3.1.v20170928-1405">
-      <category name="idempiere.core"/>
-   </feature>
-   <feature url="features/org.eclipse.osgi.compatibility.plugins.feature_1.1.1.v20170811-1325.jar" id="org.eclipse.osgi.compatibility.plugins.feature" version="1.1.1.v20170811-1325">
-      <category name="idempiere.core"/>
-   </feature>
    <feature url="features/org.idempiere.eclipse.platform.feature_5.1.0.qualifier.jar" id="org.idempiere.eclipse.platform.feature" version="5.1.0.qualifier">
       <category name="idempiere.core"/>
    </feature>
@@ -84,5 +54,32 @@
    <feature url="features/org.idempiere.zk.feature_5.1.0.qualifier.jar" id="org.idempiere.zk.feature" version="5.1.0.qualifier">
       <category name="idempiere.core"/>
    </feature>
+   <feature url="features/org.eclipse.ecf.core.feature_1.5.0.v20180426-1936.jar" id="org.eclipse.ecf.core.feature" version="1.5.0.v20180426-1936">
+      <category name="idempiere.core"/>
+   </feature>
+   <feature url="features/org.eclipse.ecf.core.ssl.feature_1.1.100.v20180301-0201.jar" id="org.eclipse.ecf.core.ssl.feature" version="1.1.100.v20180301-0201">
+      <category name="idempiere.core"/>
+   </feature>
+   <feature url="features/org.eclipse.ecf.filetransfer.feature_3.14.0.v20180306-0429.jar" id="org.eclipse.ecf.filetransfer.feature" version="3.14.0.v20180306-0429">
+      <category name="idempiere.core"/>
+   </feature>
+   <feature url="features/org.eclipse.ecf.filetransfer.httpclient4.feature_3.14.0.v20180301-0132.jar" id="org.eclipse.ecf.filetransfer.httpclient4.feature" version="3.14.0.v20180301-0132">
+      <category name="idempiere.core"/>
+   </feature>
+   <feature url="features/org.eclipse.ecf.filetransfer.httpclient4.ssl.feature_1.1.100.v20180301-0132.jar" id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature" version="1.1.100.v20180301-0132">
+      <category name="idempiere.core"/>
+   </feature>
+   <feature url="features/org.eclipse.ecf.filetransfer.ssl.feature_1.1.100.v20180301-0132.jar" id="org.eclipse.ecf.filetransfer.ssl.feature" version="1.1.100.v20180301-0132">
+      <category name="idempiere.core"/>
+   </feature>
+   <feature url="features/org.eclipse.equinox.executable_3.8.0.v20180518-2029.jar" id="org.eclipse.equinox.executable" version="3.8.0.v20180518-2029">
+      <category name="idempiere.core"/>
+   </feature>
+   <feature url="features/org.eclipse.equinox.server.core_1.6.0.v20180502-1828.jar" id="org.eclipse.equinox.server.core" version="1.6.0.v20180502-1828">
+      <category name="idempiere.core"/>
+   </feature>
+   <feature url="features/org.eclipse.equinox.server.p2_1.4.0.v20180515-2149.jar" id="org.eclipse.equinox.server.p2" version="1.4.0.v20180515-2149">
+      <category name="idempiere.core"/>
+   </feature>
    <category-def name="idempiere.core" label="idempiere core"/>
 </site>

org.idempiere.p2/server.product

@@ -9,7 +9,7 @@
    <launcherArgs>
       <programArgs>-console
       </programArgs>
-      <vmArgs>-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
+      <vmArgs>-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
       </vmArgs>
       <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
       </vmArgsMac>

org.idempiere.parent/pom.xml

@@ -10,11 +10,11 @@
 	<name>Maven parent project for idempiere</name>
 
 	<properties>
-		<tycho.version>1.1.0</tycho.version>
+		<tycho.version>1.2.0</tycho.version>
 		<tycho.extras.version>${tycho.version}</tycho.extras.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<jetty.version>9.4.11.v20180605</jetty.version>
-		<jp.version>6.3.1</jp.version>
+		<jp.version>6.7.0</jp.version>
 		<zk.version>8.5.0</zk.version>
 		<zk.javassist.src.version>3.18.2-GA</zk.javassist.src.version>
 		<maven.dependency.version>3.0.2</maven.dependency.version>
@@ -493,6 +493,8 @@
 						            <arch>x86_64</arch>
 					            </environment>
 				            </environments>
+                            <executionEnvironmentDefault>JavaSE-1.8</executionEnvironmentDefault>
+                            <executionEnvironment>JavaSE-1.8</executionEnvironment>
 			            </configuration>
 		            </plugin>
                 </plugins>