From e1afd784195e2a0d9d510360b4f628f9d56b422c Mon Sep 17 00:00:00 2001
From: Carlos Ruiz <carg67@gmail.com>
Date: Wed, 29 Aug 2018 20:37:39 +0200
Subject: [PATCH] IDEMPIERE-3136 update jasper report to use P2 / enable DejaVu
 Sans and DejaVu Serif default jasper to render bold/italic properly at least
 with these two - same as 450fe05 but for dev/maven

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

diff --git a/org.adempiere.report.jasper.library/.classpath b/org.adempiere.report.jasper.library/.classpath
index 0ae9142b3c..16c2549b14 100644
--- a/org.adempiere.report.jasper.library/.classpath
+++ b/org.adempiere.report.jasper.library/.classpath
@@ -4,6 +4,7 @@
 	<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-functions.jar"/>
diff --git a/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF b/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
index c86ceef00c..234bb97ad7 100644
--- a/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
+++ b/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
@@ -10,6 +10,7 @@ Bundle-ClassPath: .,
  lib/castor-xml.jar,
  lib/jasperreports-chart-customizers.jar,
  lib/jasperreports-chart-themes.jar,
+ lib/jasperreports-fonts.jar,
  lib/jasperreports-functions.jar,
  lib/olap4j.jar,
  lib/rhino.jar,
diff --git a/org.adempiere.report.jasper.library/build.properties b/org.adempiere.report.jasper.library/build.properties
index 917a447cc9..87bc134010 100644
--- a/org.adempiere.report.jasper.library/build.properties
+++ b/org.adempiere.report.jasper.library/build.properties
@@ -4,6 +4,7 @@ bin.includes = META-INF/,\
                lib/castor-xml.jar,\
                lib/jasperreports-chart-customizers.jar,\
                lib/jasperreports-chart-themes.jar,\
+               lib/jasperreports-fonts.jar,\
                lib/jasperreports-functions.jar,\
                lib/olap4j.jar,\
                lib/rhino.jar,\
diff --git a/org.adempiere.report.jasper.library/copyjars.xml b/org.adempiere.report.jasper.library/copyjars.xml
index 2aa085f8bc..aab9a9db48 100644
--- a/org.adempiere.report.jasper.library/copyjars.xml
+++ b/org.adempiere.report.jasper.library/copyjars.xml
@@ -5,6 +5,7 @@
 	<target name="copy">
       <get src="${url.maven2}/org/codehaus/castor/castor-core/1.3.3/castor-core-1.3.3.jar" dest="lib/castor-core.jar" usetimestamp="true" verbose="true" retries="5" />
       <get src="${url.maven2}/org/codehaus/castor/castor-xml/1.3.3/castor-xml-1.3.3.jar" dest="lib/castor-xml.jar" usetimestamp="true" verbose="true" retries="5" />
+      <get src="${url.file.jp.lib}/jasperreports-fonts-${jp-verion}.jar" dest="lib/jasperreports-fonts.jar" usetimestamp="true" verbose="true" retries="5" />
       <get src="${url.maven2.jp}/net/sf/jasperreports/jasperreports-chart-themes/${jp-verion}/jasperreports-chart-themes-${jp-verion}.jar" dest="lib/jasperreports-chart-themes.jar" usetimestamp="true" verbose="true" retries="5" />
       <get src="${url.maven2.jp}/net/sf/jasperreports/jasperreports-chart-customizers/${jp-verion}/jasperreports-chart-customizers-${jp-verion}.jar" dest="lib/jasperreports-chart-customizers.jar" usetimestamp="true" verbose="true" retries="5" />
       <get src="${url.maven2.jp}/net/sf/jasperreports/jasperreports-functions/${jp-verion}/jasperreports-functions-${jp-verion}.jar" dest="lib/jasperreports-functions.jar" usetimestamp="true" verbose="true" retries="5" />
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
index 5293d7804a..c0d28b3183 100644
--- a/org.adempiere.report.jasper.library/note_for_update_jr_library.readme
+++ b/org.adempiere.report.jasper.library/note_for_update_jr_library.readme
@@ -11,7 +11,7 @@ guide for update:
 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
+3. also download jasperreports-functions-x.x.x.jar and jasperreports-fonts-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
@@ -50,4 +50,4 @@ note: net.sf.jasperreports.engine_6.3.1.jar use package dynamic import
 
 6. com.jaspersoft.studio.bundles.itext_2.1.7.js5 already have bcprov-jdk14-139 on Bundle-ClassPath, but manifest still import package from bcprov-jdk14-139. so i modify its manifest before call ${ECLIPSE_FOLDER}/eclipse -application org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher
 
-7. org.krysalis.barcode4j_2.1.0.jar have osgi version on maven but it dependency to org.apache.avalon, so use version from jasper report. it modify manifest.mf to don't depend to org.apache.avalon 
\ No newline at end of file
+7. org.krysalis.barcode4j_2.1.0.jar have osgi version on maven but it dependency to org.apache.avalon, so use version from jasper report. it modify manifest.mf to don't depend to org.apache.avalon 
diff --git a/org.adempiere.report.jasper.library/pom.xml b/org.adempiere.report.jasper.library/pom.xml
index 2385027db6..16f6d92364 100644
--- a/org.adempiere.report.jasper.library/pom.xml
+++ b/org.adempiere.report.jasper.library/pom.xml
@@ -87,6 +87,26 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>com.googlecode.maven-download-plugin</groupId>
+				<artifactId>download-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>download-db-seed-oracle</id>
+						<phase>validate</phase>
+						<goals>
+							<goal>wget</goal>
+						</goals>
+						<configuration>
+							<url>${url.file.srv}/jarfile/jp-6.3.1/jasperreports-fonts-6.3.1.jar</url>
+							<unpack>false</unpack>
+							<outputDirectory>lib</outputDirectory>
+							<outputFileName>jasperreports-fonts.jar</outputFileName>
+							<retries>5</retries>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
-</project>
\ No newline at end of file
+</project>