diff --git a/org.adempiere.base-feature/model.generator.launch b/org.adempiere.base-feature/model.generator.launch
index 73e58eaab0..183fc2327d 100644
--- a/org.adempiere.base-feature/model.generator.launch
+++ b/org.adempiere.base-feature/model.generator.launch
@@ -21,7 +21,7 @@
-
+
diff --git a/org.adempiere.base-feature/sign.database.build.launch b/org.adempiere.base-feature/sign.database.build.launch
index f5c2e48811..1c4ea275cb 100644
--- a/org.adempiere.base-feature/sign.database.build.launch
+++ b/org.adempiere.base-feature/sign.database.build.launch
@@ -21,7 +21,7 @@
-
+
diff --git a/org.adempiere.base-feature/synchronize-terminology.app.launch b/org.adempiere.base-feature/synchronize-terminology.app.launch
index fa79f2f81a..69c11a275c 100644
--- a/org.adempiere.base-feature/synchronize-terminology.app.launch
+++ b/org.adempiere.base-feature/synchronize-terminology.app.launch
@@ -21,7 +21,7 @@
-
+
diff --git a/org.adempiere.base-feature/translation.app.launch b/org.adempiere.base-feature/translation.app.launch
index b05648936f..507f5f1cb8 100644
--- a/org.adempiere.base-feature/translation.app.launch
+++ b/org.adempiere.base-feature/translation.app.launch
@@ -21,7 +21,7 @@
-
+
diff --git a/org.adempiere.install/install.app.launch b/org.adempiere.install/install.app.launch
index fe488cb30c..bdd21ce681 100644
--- a/org.adempiere.install/install.app.launch
+++ b/org.adempiere.install/install.app.launch
@@ -22,7 +22,7 @@
-
+
diff --git a/org.adempiere.install/install.console.app.launch b/org.adempiere.install/install.console.app.launch
index 2c1863dc01..98d3e83a05 100644
--- a/org.adempiere.install/install.console.app.launch
+++ b/org.adempiere.install/install.console.app.launch
@@ -21,7 +21,7 @@
-
+
diff --git a/org.adempiere.report.jasper-feature/feature.xml b/org.adempiere.report.jasper-feature/feature.xml
index 09ad431af4..102d89e1fc 100644
--- a/org.adempiere.report.jasper-feature/feature.xml
+++ b/org.adempiere.report.jasper-feature/feature.xml
@@ -16,10 +16,6 @@
[Enter License Description here.]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/org.adempiere.report.jasper.library/.classpath b/org.adempiere.report.jasper.library/.classpath
index 4e864b50be..1b7ecbc1b8 100644
--- a/org.adempiere.report.jasper.library/.classpath
+++ b/org.adempiere.report.jasper.library/.classpath
@@ -1,20 +1,58 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.adempiere.report.jasper.library/.project b/org.adempiere.report.jasper.library/.project
index f318b073b7..d03a643160 100644
--- a/org.adempiere.report.jasper.library/.project
+++ b/org.adempiere.report.jasper.library/.project
@@ -5,11 +5,6 @@
-
- org.eclipse.wst.common.project.facet.core.builder
-
-
-
org.eclipse.jdt.core.javabuilder
@@ -27,10 +22,7 @@
- org.eclipse.jem.workbench.JavaEMFNature
- org.eclipse.wst.common.modulecore.ModuleCoreNature
- org.eclipse.jdt.core.javanature
- org.eclipse.wst.common.project.facet.core.nature
org.eclipse.pde.PluginNature
+ org.eclipse.jdt.core.javanature
diff --git a/org.adempiere.report.jasper.library/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.report.jasper.library/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0c68a61dca..0000000000
--- a/org.adempiere.report.jasper.library/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/org.adempiere.report.jasper.library/.settings/org.eclipse.pde.core.prefs b/org.adempiere.report.jasper.library/.settings/org.eclipse.pde.core.prefs
new file mode 100644
index 0000000000..f29e940a00
--- /dev/null
+++ b/org.adempiere.report.jasper.library/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false
diff --git a/org.adempiere.report.jasper.library/.settings/org.eclipse.wst.common.component b/org.adempiere.report.jasper.library/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index d0fc9a58ad..0000000000
--- a/org.adempiere.report.jasper.library/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/org.adempiere.report.jasper.library/.settings/org.eclipse.wst.common.project.facet.core.xml b/org.adempiere.report.jasper.library/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index b84ac01796..0000000000
--- a/org.adempiere.report.jasper.library/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
diff --git a/org.adempiere.report.jasper.library/JasperReportsTools.jardesc b/org.adempiere.report.jasper.library/JasperReportsTools.jardesc
deleted file mode 100644
index 4bb366d3c9..0000000000
--- a/org.adempiere.report.jasper.library/JasperReportsTools.jardesc
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF b/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
index 4c88f6dfb8..dd0df1aeab 100644
--- a/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
+++ b/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
@@ -1,28 +1,63 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: iDempiere JasperReports Dependency
-Bundle-SymbolicName: org.adempiere.report.jasper.library
-Bundle-Version: 3.1.0.qualifier
-Bundle-ClassPath: lib/commons-beanutils-1.8.0.jar,
+Bundle-Name: Library
+Bundle-SymbolicName: org.adempiere.report.jasper.library;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-ClassPath: lib/antlr-2.7.5.jar,
+ lib/batik-anim-1.8.jar,
+ lib/batik-awt-util-1.8.jar,
+ lib/batik-bridge-1.8.jar,
+ lib/batik-codec-1.8.jar,
+ lib/batik-css-1.8.jar,
+ lib/batik-dom-1.8.jar,
+ lib/batik-ext-1.8.jar,
+ lib/batik-extension-1.8.jar,
+ lib/batik-gui-util-1.8.jar,
+ lib/batik-gui-util-1.8batik-parser-1.8.jar,
+ lib/batik-gvt-1.8.jar,
+ lib/batik-parser-1.8.jar,
+ lib/batik-script-1.8.jar,
+ lib/batik-svg-dom-1.8.jar,
+ lib/batik-svggen-1.8.jar,
+ lib/batik-swing-1.8.jar,
+ lib/batik-transcoder-1.8.jar,
+ lib/batik-util-1.8.jar,
+ lib/batik-xml-1.8.jar,
+ lib/castor-core-1.3.3.jar,
+ lib/castor-xml-1.3.3.jar,
lib/commons-digester-2.1.jar,
- lib/jasperreports-5.6.1.jar,
- lib/jasperreports-fonts-5.6.1.jar,
- lib/jackson-core-2.1.4.jar,
- lib/xalan-2.7.1.jar,
- lib/jasperreports-functions-5.6.1.jar,
- lib/joda-time-2.1.jar,
- lib/itext-2.1.7.jar,
- lib/bcprov-jdk14-140.jar
-Export-Package: .,
- com.fasterxml.jackson.core,
- com.fasterxml.jackson.core.base,
- com.fasterxml.jackson.core.format,
- com.fasterxml.jackson.core.io,
- com.fasterxml.jackson.core.json,
- com.fasterxml.jackson.core.sym,
- com.fasterxml.jackson.core.type,
- com.fasterxml.jackson.core.util,
- net.sf.jasperreports.ant,
+ lib/commons-javaflow-20160505.jar,
+ lib/core-2.3.0.jar,
+ lib/fop-transcoder-allinone-1.1.jar,
+ lib/hibernate-core-3.3.2.GA.jar,
+ lib/itext-2.1.7.js5.jar,
+ lib/jasperreports-6.3.0.jar,
+ lib/jasperreports-fonts-6.3.0.jar,
+ lib/jasperreports-functions-6.3.0.jar,
+ lib/jaxen-1.1.1.jar,
+ lib/jcommon-1.0.23.jar,
+ lib/jfreechart-1.0.19.jar,
+ lib/js.jar,
+ lib/jxl-2.6.10.jar,
+ lib/lucene-analyzers-common-4.5.1.jar,
+ lib/lucene-core-4.5.1.jar,
+ lib/lucene-queryparser-4.5.1.jar,
+ lib/mondrian-3.1.1.12687.jar,
+ lib/olap4j-0.9.7.309-JS-3.jar,
+ lib/persistence-api-1.0.jar,
+ lib/poi-3.10.1.jar,
+ lib/poi-ooxml-3.10.1.jar,
+ lib/rhino-1.7.6.jar,
+ lib/spring-beans-2.5.jar,
+ lib/spring-core-2.5.jar,
+ lib/velocity-1.7.jar,
+ lib/xalan-2.7.2.jar,
+ lib/xml-apis-ext-1.3.04.jar,
+ lib/xmlgraphics-commons-1.5.jar,
+ lib/xmpcore-5.1.1.jar,
+ .
+Export-Package: net.sf.jasperreports.ant,
net.sf.jasperreports.charts,
net.sf.jasperreports.charts.base,
net.sf.jasperreports.charts.design,
@@ -38,15 +73,20 @@ Export-Package: .,
net.sf.jasperreports.components.headertoolbar,
net.sf.jasperreports.components.headertoolbar.actions,
net.sf.jasperreports.components.headertoolbar.json,
+ net.sf.jasperreports.components.headertoolbar.json.resources,
net.sf.jasperreports.components.headertoolbar.resources,
net.sf.jasperreports.components.headertoolbar.resources.images,
net.sf.jasperreports.components.headertoolbar.resources.images.format,
net.sf.jasperreports.components.headertoolbar.resources.images.jive,
net.sf.jasperreports.components.headertoolbar.resources.images.style,
+ net.sf.jasperreports.components.headertoolbar.resources.require,
net.sf.jasperreports.components.iconlabel,
+ net.sf.jasperreports.components.items,
+ net.sf.jasperreports.components.items.fill,
net.sf.jasperreports.components.list,
net.sf.jasperreports.components.map,
net.sf.jasperreports.components.map.fill,
+ net.sf.jasperreports.components.map.resources.require,
net.sf.jasperreports.components.map.resources.templates,
net.sf.jasperreports.components.map.type,
net.sf.jasperreports.components.sort,
@@ -76,6 +116,7 @@ Export-Package: .,
net.sf.jasperreports.data.excel,
net.sf.jasperreports.data.hibernate,
net.sf.jasperreports.data.hibernate.spring,
+ net.sf.jasperreports.data.http,
net.sf.jasperreports.data.jdbc,
net.sf.jasperreports.data.jndi,
net.sf.jasperreports.data.json,
@@ -117,6 +158,7 @@ Export-Package: .,
net.sf.jasperreports.engine.fill,
net.sf.jasperreports.engine.fonts,
net.sf.jasperreports.engine.images,
+ net.sf.jasperreports.engine.part,
net.sf.jasperreports.engine.print,
net.sf.jasperreports.engine.query,
net.sf.jasperreports.engine.scriptlets,
@@ -134,6 +176,7 @@ Export-Package: .,
net.sf.jasperreports.extensions,
net.sf.jasperreports.fonts,
net.sf.jasperreports.fonts.dejavu,
+ net.sf.jasperreports.fonts.pictonic,
net.sf.jasperreports.functions,
net.sf.jasperreports.functions.annotations,
net.sf.jasperreports.functions.standard,
@@ -145,7 +188,10 @@ Export-Package: .,
net.sf.jasperreports.olap.olap4j,
net.sf.jasperreports.olap.result,
net.sf.jasperreports.olap.xmla,
+ net.sf.jasperreports.parts,
+ net.sf.jasperreports.parts.subreport,
net.sf.jasperreports.renderers,
+ net.sf.jasperreports.renderers.util,
net.sf.jasperreports.repo,
net.sf.jasperreports.search,
net.sf.jasperreports.swing,
@@ -160,89 +206,140 @@ Export-Package: .,
net.sf.jasperreports.web.listeners,
net.sf.jasperreports.web.servlets,
net.sf.jasperreports.web.servlets.resources,
+ net.sf.jasperreports.web.servlets.resources.require.report,
+ net.sf.jasperreports.web.servlets.resources.require.util,
+ net.sf.jasperreports.web.servlets.resources.require.viewer,
net.sf.jasperreports.web.servlets.resources.templates,
net.sf.jasperreports.web.servlets.resources.viewer,
- net.sf.jasperreports.web.util,
- org.apache.bcel,
- org.apache.bcel.classfile,
- org.apache.bcel.generic,
- org.apache.bcel.util,
- org.apache.bcel.verifier,
- org.apache.bcel.verifier.exc,
- org.apache.bcel.verifier.statics,
- org.apache.bcel.verifier.structurals,
- org.apache.commons.beanutils,
- org.apache.commons.beanutils.converters,
- org.apache.commons.beanutils.expression,
- org.apache.commons.beanutils.locale,
- org.apache.commons.beanutils.locale.converters,
- org.apache.commons.collections,
- org.apache.commons.digester,
- org.apache.commons.digester.annotations,
- org.apache.commons.digester.annotations.handlers,
- org.apache.commons.digester.annotations.internal,
- org.apache.commons.digester.annotations.providers,
- org.apache.commons.digester.annotations.reflect,
- org.apache.commons.digester.annotations.rules,
- org.apache.commons.digester.annotations.spi,
- org.apache.commons.digester.annotations.utils,
- org.apache.commons.digester.parser,
- org.apache.commons.digester.plugins,
- org.apache.commons.digester.plugins.strategies,
- org.apache.commons.digester.substitution,
- org.apache.commons.digester.xmlrules,
- org.apache.regexp,
- org.apache.xalan,
- org.apache.xalan.client,
- org.apache.xalan.extensions,
- org.apache.xalan.lib,
- org.apache.xalan.lib.sql,
- org.apache.xalan.processor,
- org.apache.xalan.res,
- org.apache.xalan.serialize,
- org.apache.xalan.templates,
- org.apache.xalan.trace,
- org.apache.xalan.transformer,
- org.apache.xalan.xslt,
- org.apache.xalan.xsltc,
- org.apache.xalan.xsltc.cmdline,
- org.apache.xalan.xsltc.cmdline.getopt,
- org.apache.xalan.xsltc.compiler,
- org.apache.xalan.xsltc.compiler.util,
- org.apache.xalan.xsltc.dom,
- org.apache.xalan.xsltc.runtime,
- org.apache.xalan.xsltc.runtime.output,
- org.apache.xalan.xsltc.trax,
- org.apache.xalan.xsltc.util,
- org.apache.xml.dtm,
- org.apache.xml.dtm.ref,
- org.apache.xml.dtm.ref.dom2dtm,
- org.apache.xml.dtm.ref.sax2dtm,
- org.apache.xml.res,
- org.apache.xml.utils,
- org.apache.xml.utils.res,
- org.apache.xpath,
- org.apache.xpath.axes,
- org.apache.xpath.compiler,
- org.apache.xpath.domapi,
- org.apache.xpath.functions,
- org.apache.xpath.jaxp,
- org.apache.xpath.objects,
- org.apache.xpath.operations,
- org.apache.xpath.patterns,
- org.apache.xpath.res,
- org.joda.time,
- org.joda.time.base,
- org.joda.time.chrono,
- org.joda.time.convert,
- org.joda.time.field,
- org.joda.time.format,
- org.joda.time.tz,
- org.w3c.tools.codec
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: org.apache.commons.collections,
- org.w3c.tools.codec
-DynamicImport-Package: *
-Eclipse-BuddyPolicy: registered
-Require-Bundle: bcprov;bundle-version="1.53.0"
-
+ net.sf.jasperreports.web.util
+Require-Bundle: bcprov;bundle-version="1.54.0",
+ org.apache.commons.beanutils;bundle-version="0.0.0",
+ org.apache.commons.collections;bundle-version="0.0.0",
+ org.eclipse.jdt.core.compiler.batch;bundle-version="0.0.0",
+ org.apache.httpcomponents.httpclient;bundle-version="0.0.0",
+ org.apache.httpcomponents.httpcore;bundle-version="0.0.0",
+ groovy-all;bundle-version="0.0.0",
+ com.fasterxml.jackson.core.jackson-annotations;bundle-version="0.0.0",
+ com.fasterxml.jackson.core.jackson-core;bundle-version="0.0.0",
+ com.fasterxml.jackson.core.jackson-databind;bundle-version="0.0.0",
+ joda-time;bundle-version="0.0.0",
+ com.ibm.icu;bundle-version="0.0.0"
+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",
+ net.sourceforge.barbecue,
+ net.sourceforge.barbecue.env,
+ net.sourceforge.barbecue.formatter,
+ net.sourceforge.barbecue.linear,
+ net.sourceforge.barbecue.linear.codabar,
+ net.sourceforge.barbecue.linear.code128,
+ net.sourceforge.barbecue.linear.code39,
+ net.sourceforge.barbecue.linear.ean,
+ net.sourceforge.barbecue.linear.postnet,
+ net.sourceforge.barbecue.linear.twoOfFive,
+ net.sourceforge.barbecue.linear.upc,
+ net.sourceforge.barbecue.output,
+ net.sourceforge.barbecue.twod.pdf417,
+ 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",
+ org.krysalis.barcode4j,
+ org.krysalis.barcode4j.ant,
+ org.krysalis.barcode4j.cli,
+ org.krysalis.barcode4j.impl,
+ org.krysalis.barcode4j.impl.codabar,
+ org.krysalis.barcode4j.impl.code128,
+ org.krysalis.barcode4j.impl.code39,
+ org.krysalis.barcode4j.impl.datamatrix,
+ org.krysalis.barcode4j.impl.fourstate,
+ org.krysalis.barcode4j.impl.int2of5,
+ org.krysalis.barcode4j.impl.pdf417,
+ org.krysalis.barcode4j.impl.postnet,
+ org.krysalis.barcode4j.impl.upcean,
+ org.krysalis.barcode4j.output,
+ org.krysalis.barcode4j.output.bitmap,
+ org.krysalis.barcode4j.output.eps,
+ org.krysalis.barcode4j.output.java2d,
+ org.krysalis.barcode4j.output.svg,
+ org.krysalis.barcode4j.servlet,
+ org.krysalis.barcode4j.tools,
+ org.krysalis.barcode4j.xalan
diff --git a/org.adempiere.report.jasper.library/bin/.cvsignore b/org.adempiere.report.jasper.library/bin/.cvsignore
deleted file mode 100644
index d3f5a12faa..0000000000
--- a/org.adempiere.report.jasper.library/bin/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/org.adempiere.report.jasper.library/build.properties b/org.adempiere.report.jasper.library/build.properties
index dc4d13af94..fd53389ce7 100644
--- a/org.adempiere.report.jasper.library/build.properties
+++ b/org.adempiere.report.jasper.library/build.properties
@@ -1,11 +1,54 @@
bin.includes = META-INF/,\
- lib/commons-beanutils-1.8.0.jar,\
+ .,\
+ lib/antlr-2.7.5.jar,\
+ lib/batik-anim-1.8.jar,\
+ lib/batik-awt-util-1.8.jar,\
+ lib/batik-bridge-1.8.jar,\
+ lib/batik-codec-1.8.jar,\
+ lib/batik-css-1.8.jar,\
+ lib/batik-dom-1.8.jar,\
+ lib/batik-ext-1.8.jar,\
+ lib/batik-extension-1.8.jar,\
+ lib/batik-gui-util-1.8.jar,\
+ lib/batik-gui-util-1.8batik-parser-1.8.jar,\
+ lib/batik-gvt-1.8.jar,\
+ lib/batik-parser-1.8.jar,\
+ lib/batik-script-1.8.jar,\
+ lib/batik-svg-dom-1.8.jar,\
+ lib/batik-svggen-1.8.jar,\
+ lib/batik-swing-1.8.jar,\
+ lib/batik-transcoder-1.8.jar,\
+ lib/batik-util-1.8.jar,\
+ lib/batik-xml-1.8.jar,\
+ lib/castor-core-1.3.3.jar,\
+ lib/castor-xml-1.3.3.jar,\
lib/commons-digester-2.1.jar,\
- lib/jasperreports-5.6.1.jar,\
- lib/jasperreports-fonts-5.6.1.jar,\
- lib/jackson-core-2.1.4.jar,\
- lib/xalan-2.7.1.jar,\
- lib/jasperreports-functions-5.6.1.jar,\
- lib/joda-time-2.1.jar,\
- lib/itext-2.1.7.jar,\
- lib/bcprov-jdk14-140.jar
+ lib/commons-javaflow-20160505.jar,\
+ lib/core-2.3.0.jar,\
+ lib/fop-transcoder-allinone-1.1.jar,\
+ lib/hibernate-core-3.3.2.GA.jar,\
+ lib/itext-2.1.7.js5.jar,\
+ lib/jasperreports-6.3.0.jar,\
+ lib/jasperreports-fonts-6.3.0.jar,\
+ lib/jasperreports-functions-6.3.0.jar,\
+ lib/jaxen-1.1.1.jar,\
+ lib/jcommon-1.0.23.jar,\
+ lib/jfreechart-1.0.19.jar,\
+ lib/js.jar,\
+ lib/jxl-2.6.10.jar,\
+ lib/lucene-analyzers-common-4.5.1.jar,\
+ lib/lucene-core-4.5.1.jar,\
+ lib/lucene-queryparser-4.5.1.jar,\
+ lib/mondrian-3.1.1.12687.jar,\
+ lib/olap4j-0.9.7.309-JS-3.jar,\
+ lib/persistence-api-1.0.jar,\
+ lib/poi-3.10.1.jar,\
+ lib/poi-ooxml-3.10.1.jar,\
+ lib/rhino-1.7.6.jar,\
+ lib/spring-beans-2.5.jar,\
+ lib/spring-core-2.5.jar,\
+ lib/velocity-1.7.jar,\
+ lib/xalan-2.7.2.jar,\
+ lib/xml-apis-ext-1.3.04.jar,\
+ lib/xmlgraphics-commons-1.5.jar,\
+ lib/xmpcore-5.1.1.jar
diff --git a/org.adempiere.report.jasper.library/copyjars.xml b/org.adempiere.report.jasper.library/copyjars.xml
index 56058ecfef..75a08ac32d 100644
--- a/org.adempiere.report.jasper.library/copyjars.xml
+++ b/org.adempiere.report.jasper.library/copyjars.xml
@@ -1,15 +1,58 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.adempiere.report.jasper.library/note_for_update_jr_library.readme b/org.adempiere.report.jasper.library/note_for_update_jr_library.readme
new file mode 100644
index 0000000000..91a8fad01e
--- /dev/null
+++ b/org.adempiere.report.jasper.library/note_for_update_jr_library.readme
@@ -0,0 +1,25 @@
+jasper report use some library have osgi version on maven or orbit.
+but alot not yet have osgi version or have but outdate.
+it ever use a modify version like itext
+
+guide for update:
+1. download distribute at https://sourceforge.net/projects/jasperreports/files/jasperreports/
+ download file (jasperreports-x.x.x-project.zip)
+
+2. extract it and run ant to get all dependency library
+(ant just get normal library to let Jasperreport do common job,
+for extra like encrypt, have go to sample project to get dependency
+but just focus common job and already know extra like encrypt)
+
+3. also download jasperreports-functions-x.x.x.jar
+
+4. now edit org.adempiere.report.jasper.library follow bellow rule
+ + if library have same version with library already use on idempiere, just use import package or bundle dependency
+ + if library have osgi on net (manven, orbit,...), add to org.adempiere.base-feature or org.adempiere.report.jasper-feature to materialize it
+ + if library not yet have osgi version, push it in lib folder and use Bundle-ClassPath
+
+note for version 6.3.0
+poi-3.10.1 haven't yet osgi version, ever on newest obit repository. so use Bundle-ClassPath
+batik haven't yet osgi version, ever on newest obit repository. so use Bundle-ClassPath
+current batik osgi version isn't use by other bundle, so can remove it.
+itext is very old and have modify code from JP community, so use version from JP
\ No newline at end of file
diff --git a/org.adempiere.report.jasper.library/resource/test/OrderFormat.jrxml b/org.adempiere.report.jasper.library/resource/test/OrderFormat.jrxml
deleted file mode 100644
index 1adbafd85f..0000000000
--- a/org.adempiere.report.jasper.library/resource/test/OrderFormat.jrxml
+++ /dev/null
@@ -1,133 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/org.adempiere.report.jasper.library/resource/test/PurchaseOrder.jrxml b/org.adempiere.report.jasper.library/resource/test/PurchaseOrder.jrxml
deleted file mode 100644
index fba1538c20..0000000000
--- a/org.adempiere.report.jasper.library/resource/test/PurchaseOrder.jrxml
+++ /dev/null
@@ -1,800 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/org.adempiere.report.jasper.library/resource/test/Requisition.jrxml b/org.adempiere.report.jasper.library/resource/test/Requisition.jrxml
deleted file mode 100644
index fabd7db036..0000000000
--- a/org.adempiere.report.jasper.library/resource/test/Requisition.jrxml
+++ /dev/null
@@ -1,431 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/org.adempiere.report.jasper.library/resource/test/VoidedDN.jrxml b/org.adempiere.report.jasper.library/resource/test/VoidedDN.jrxml
deleted file mode 100644
index d558bbc594..0000000000
--- a/org.adempiere.report.jasper.library/resource/test/VoidedDN.jrxml
+++ /dev/null
@@ -1,245 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/org.adempiere.report.jasper/src/org/adempiere/report/jasper/ReportStarter.java b/org.adempiere.report.jasper/src/org/adempiere/report/jasper/ReportStarter.java
index 5e7840195f..670166f218 100644
--- a/org.adempiere.report.jasper/src/org/adempiere/report/jasper/ReportStarter.java
+++ b/org.adempiere.report.jasper/src/org/adempiere/report/jasper/ReportStarter.java
@@ -85,6 +85,7 @@ import net.sf.jasperreports.export.SimplePrintServiceExporterConfiguration;
import net.sf.jasperreports.export.SimpleTextExporterConfiguration;
import net.sf.jasperreports.export.SimpleWriterExporterOutput;
import net.sf.jasperreports.export.SimpleXlsExporterConfiguration;
+import net.sf.jasperreports.export.SimpleXmlExporterOutput;
import org.adempiere.base.Service;
import org.adempiere.exceptions.AdempiereException;
@@ -741,7 +742,7 @@ public class ReportStarter implements ProcessCall, ClientProcess
JRXmlExporter export = new JRXmlExporter(jasperContext);
SimpleExporterConfiguration config = new SimpleExporterConfiguration();
export.setConfiguration(config);
- export.setExporterOutput(new SimpleWriterExporterOutput(strm));
+ export.setExporterOutput(new SimpleXmlExporterOutput(strm));
exporter = export;
} else if (ext.equals("csv") || ext.equals("ssv") ) {
JRCsvExporter export = new JRCsvExporter(jasperContext);
diff --git a/org.adempiere.server-feature/server.product.eventtest.launch b/org.adempiere.server-feature/server.product.eventtest.launch
index 5fa163f036..7b4b4c5c5f 100644
--- a/org.adempiere.server-feature/server.product.eventtest.launch
+++ b/org.adempiere.server-feature/server.product.eventtest.launch
@@ -23,7 +23,7 @@
-
+
diff --git a/org.adempiere.server-feature/server.product.functionaltest.launch b/org.adempiere.server-feature/server.product.functionaltest.launch
index 4c8b4657a2..a5703955dc 100644
--- a/org.adempiere.server-feature/server.product.functionaltest.launch
+++ b/org.adempiere.server-feature/server.product.functionaltest.launch
@@ -23,7 +23,7 @@
-
+
diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch
index deb3559e23..ad89995a22 100644
--- a/org.adempiere.server-feature/server.product.launch
+++ b/org.adempiere.server-feature/server.product.launch
@@ -25,7 +25,7 @@
-
+
diff --git a/org.adempiere.ui.swing-feature/swingclient.product.launch b/org.adempiere.ui.swing-feature/swingclient.product.launch
index 19b17453fe..d68504eb00 100644
--- a/org.adempiere.ui.swing-feature/swingclient.product.launch
+++ b/org.adempiere.ui.swing-feature/swingclient.product.launch
@@ -23,7 +23,7 @@
-
+