diff --git a/org.adempiere.report.jasper.library/.classpath b/org.adempiere.report.jasper.library/.classpath
index 1fbcb49f25..d2dd51c2f5 100644
--- a/org.adempiere.report.jasper.library/.classpath
+++ b/org.adempiere.report.jasper.library/.classpath
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry exported="true" kind="lib" path="lib/core-3.2.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jasperreports-6.3.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jasperreports-fonts-6.3.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jasperreports-functions-6.3.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/bcprov-jdk14-139.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/batik-anim-1.8.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/batik-awt-util-1.8.jar"/>
@@ -23,13 +27,9 @@
 	<classpathentry exported="true" kind="lib" path="lib/castor-xml-1.3.3.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-digester-2.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-javaflow-20160505.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/core-2.3.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/fop-transcoder-allinone-1.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/hibernate-core-3.3.2.GA.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/itext-2.1.7.js5.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jasperreports-6.3.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jasperreports-fonts-6.3.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jasperreports-functions-6.3.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jaxen-1.1.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jcommon-1.0.23.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jfreechart-1.0.19.jar"/>
diff --git a/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF b/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
index 452ee3df31..f0d001711e 100644
--- a/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
+++ b/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
@@ -4,7 +4,8 @@ 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/batik-anim-1.8.jar,
+Bundle-ClassPath: .,
+ 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,
@@ -26,13 +27,9 @@ Bundle-ClassPath: lib/batik-anim-1.8.jar,
  lib/castor-xml-1.3.3.jar,
  lib/commons-digester-2.1.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,
@@ -53,8 +50,11 @@ Bundle-ClassPath: lib/batik-anim-1.8.jar,
  lib/xml-apis-ext-1.3.04.jar,
  lib/xmlgraphics-commons-1.5.jar,
  lib/xmpcore-5.1.1.jar,
- .,
- lib/bcprov-jdk14-139.jar
+ lib/bcprov-jdk14-139.jar,
+ lib/core-3.2.1.jar,
+ lib/jasperreports-6.3.1.jar,
+ lib/jasperreports-fonts-6.3.1.jar,
+ lib/jasperreports-functions-6.3.1.jar
 Export-Package: net.sf.jasperreports.ant,
  net.sf.jasperreports.charts,
  net.sf.jasperreports.charts.base,
diff --git a/org.adempiere.report.jasper.library/build.properties b/org.adempiere.report.jasper.library/build.properties
index 6dbc67f21e..236cd73fe9 100644
--- a/org.adempiere.report.jasper.library/build.properties
+++ b/org.adempiere.report.jasper.library/build.properties
@@ -22,13 +22,9 @@ bin.includes = META-INF/,\
                lib/castor-xml-1.3.3.jar,\
                lib/commons-digester-2.1.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,\
@@ -49,4 +45,8 @@ bin.includes = META-INF/,\
                lib/xml-apis-ext-1.3.04.jar,\
                lib/xmlgraphics-commons-1.5.jar,\
                lib/xmpcore-5.1.1.jar,\
-               lib/bcprov-jdk14-139.jar
+               lib/bcprov-jdk14-139.jar,\
+               lib/core-3.2.1.jar,\
+               lib/jasperreports-6.3.1.jar,\
+               lib/jasperreports-fonts-6.3.1.jar,\
+               lib/jasperreports-functions-6.3.1.jar
diff --git a/org.adempiere.report.jasper.library/copyjars.xml b/org.adempiere.report.jasper.library/copyjars.xml
index c471271b8d..8b50ad9815 100644
--- a/org.adempiere.report.jasper.library/copyjars.xml
+++ b/org.adempiere.report.jasper.library/copyjars.xml
@@ -23,13 +23,13 @@
 		<get src="${url.file.jp.lib}/castor-xml-1.3.3.jar" dest="lib/castor-xml-1.3.3.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.file.jp.lib}/commons-digester-2.1.jar" dest="lib/commons-digester-2.1.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.file.jp.lib}/commons-javaflow-20160505.jar" dest="lib/commons-javaflow-20160505.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.file.jp.lib}/core-2.3.0.jar" dest="lib/core-2.3.0.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/core-3.2.1.jar" dest="lib/core-3.2.1.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.file.jp.lib}/fop-transcoder-allinone-1.1.jar" dest="lib/fop-transcoder-allinone-1.1.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.file.jp.lib}/hibernate-core-3.3.2.GA.jar" dest="lib/hibernate-core-3.3.2.GA.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.file.jp.lib}/itext-2.1.7.js5.jar" dest="lib/itext-2.1.7.js5.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.file.jp.lib}/jasperreports-6.3.0.jar" dest="lib/jasperreports-6.3.0.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.file.jp.lib}/jasperreports-fonts-6.3.0.jar" dest="lib/jasperreports-fonts-6.3.0.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.file.jp.lib}/jasperreports-functions-6.3.0.jar" dest="lib/jasperreports-functions-6.3.0.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/jasperreports-6.3.1.jar" dest="lib/jasperreports-6.3.1.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/jasperreports-fonts-6.3.1.jar" dest="lib/jasperreports-fonts-6.3.1.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/jasperreports-functions-6.3.1.jar" dest="lib/jasperreports-functions-6.3.1.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.file.jp.lib}/jaxen-1.1.1.jar" dest="lib/jaxen-1.1.1.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.file.jp.lib}/jcommon-1.0.23.jar" dest="lib/jcommon-1.0.23.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.file.jp.lib}/jfreechart-1.0.19.jar" dest="lib/jfreechart-1.0.19.jar" usetimestamp="true" verbose="true" retries="5" />