From 5244dcc70e0de007fb2cb3ebf0c592fff0d5ca51 Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Sun, 10 Jul 2016 18:38:01 +0700
Subject: [PATCH] IDEMPIERE-3136:all stuff relate library of idempiere replace
 bundle dependency by use import package for jasper report

---
 org.adempiere.report.jasper.library/.classpath           | 1 +
 org.adempiere.report.jasper.library/META-INF/MANIFEST.MF | 6 ++++--
 org.adempiere.report.jasper.library/build.properties     | 3 ++-
 org.adempiere.report.jasper.library/copyjars.xml         | 4 ++--
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/org.adempiere.report.jasper.library/.classpath b/org.adempiere.report.jasper.library/.classpath
index b2401114f1..1d10a6d6cc 100644
--- a/org.adempiere.report.jasper.library/.classpath
+++ b/org.adempiere.report.jasper.library/.classpath
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<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"/>
 	<classpathentry exported="true" kind="lib" path="lib/batik-bridge-1.8.jar"/>
diff --git a/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF b/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
index 8a4f52a9b8..bf0dfb7c4b 100644
--- a/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
+++ b/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
@@ -54,7 +54,8 @@ 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
 Export-Package: net.sf.jasperreports.ant,
  net.sf.jasperreports.charts,
  net.sf.jasperreports.charts.base,
@@ -222,7 +223,8 @@ Require-Bundle: bcprov;bundle-version="1.54.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",
- org.apache.xalan;bundle-version="2.7.1"
+ org.apache.xalan;bundle-version="2.7.1",
+ org.apache.xerces;bundle-version="2.9.0"
 Import-Package: bsh,
  bsh.classpath,
  bsh.collection,
diff --git a/org.adempiere.report.jasper.library/build.properties b/org.adempiere.report.jasper.library/build.properties
index c67dd47a62..d6d106ad90 100644
--- a/org.adempiere.report.jasper.library/build.properties
+++ b/org.adempiere.report.jasper.library/build.properties
@@ -49,4 +49,5 @@ bin.includes = META-INF/,\
                lib/velocity-1.7.jar,\
                lib/xml-apis-ext-1.3.04.jar,\
                lib/xmlgraphics-commons-1.5.jar,\
-               lib/xmpcore-5.1.1.jar
+               lib/xmpcore-5.1.1.jar,\
+               lib/bcprov-jdk14-139.jar
diff --git a/org.adempiere.report.jasper.library/copyjars.xml b/org.adempiere.report.jasper.library/copyjars.xml
index 0180c155de..ce36732ecd 100644
--- a/org.adempiere.report.jasper.library/copyjars.xml
+++ b/org.adempiere.report.jasper.library/copyjars.xml
@@ -27,7 +27,6 @@
 		<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}/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}/httpcore-4.3.2.jar" dest="lib/httpcore-4.3.2.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" />
@@ -51,6 +50,7 @@
 		<get src="${url.file.jp.lib}/velocity-1.7.jar" dest="lib/velocity-1.7.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.file.jp.lib}/xml-apis-ext-1.3.04.jar" dest="lib/xml-apis-ext-1.3.04.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.file.jp.lib}/xmlgraphics-commons-1.5.jar" dest="lib/xmlgraphics-commons-1.5.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.file.jp.lib}/xmpcore-5.1.1.jar" dest="lib/xmpcore-5.1.1.jar" usetimestamp="true" verbose="true" retries="5" />	
+		<get src="${url.file.jp.lib}/xmpcore-5.1.1.jar" dest="lib/xmpcore-5.1.1.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/bcprov-jdk14-139.jar" dest="lib/bcprov-jdk14-139.jar" usetimestamp="true" verbose="true" retries="5" />		
 	</target>
 </project>