Jasper Reports 6.2.14

- Use 6.2.14 jars - Add workaround to delete temporary font files when starting this plug-in - We can't delete them on exit - See TIBCOSoftware/jasperreports#505
archimatetool · Jan 13, 2025 · dcf4eab · dcf4eab
1 parent 93cde61
commit dcf4eab
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 3 deletions.
diff --git a/com.archimatetool.jasperreports/.classpath b/com.archimatetool.jasperreports/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry exported="true" kind="lib" path="lib/jasperreports-6.12.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jasperreports-6.21.4.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>

diff --git a/com.archimatetool.jasperreports/META-INF/MANIFEST.MF b/com.archimatetool.jasperreports/META-INF/MANIFEST.MF
@@ -14,8 +14,8 @@ Bundle-ClassPath: com.archimatetool.jasperreports.jar,
  lib/commons-digester-2.1.jar,
  lib/commons-logging-1.3.4.jar,
  lib/ecj-4.9.jar,
- lib/jasperreports-6.12.2.jar,
- lib/jasperreports-fonts-6.12.2.jar,
+ lib/jasperreports-6.21.4.jar,
+ lib/jasperreports-fonts-6.21.4.jar,
  lib/jackson-core-2.18.2.jar,
  lib/jackson-databind-2.18.2.jar,
  lib/openpdf-2.0.3.jar

diff --git a/com.archimatetool.jasperreports/lib/jasperreports-6.12.2.jar b/com.archimatetool.jasperreports/lib/jasperreports-6.12.2.jar
diff --git a/com.archimatetool.jasperreports/lib/jasperreports-6.21.4.jar b/com.archimatetool.jasperreports/lib/jasperreports-6.21.4.jar
diff --git a/com.archimatetool.jasperreports/lib/jasperreports-fonts-6.12.2.jar b/com.archimatetool.jasperreports/lib/jasperreports-fonts-6.12.2.jar
diff --git a/com.archimatetool.jasperreports/lib/jasperreports-fonts-6.21.4.jar b/com.archimatetool.jasperreports/lib/jasperreports-fonts-6.21.4.jar
diff --git a/com.archimatetool.jasperreports/src/com/archimatetool/jasperreports/JasperReportsPlugin.java b/com.archimatetool.jasperreports/src/com/archimatetool/jasperreports/JasperReportsPlugin.java
@@ -48,6 +48,26 @@ public void start(BundleContext context) throws Exception {
 
         // Create user templates folder
         getUserTemplatesFolder().mkdirs();
+
+        // Temp font files
+        deleteTempFontFiles();
+    }
+
+    /**
+     * Delete Jasper temp font files that may have been left over from last time.
+     * We can't delete them on exit because they are locked at that point.
+     * See https://github.com/TIBCOSoftware/jasperreports/issues/505
+     */
+    static void deleteTempFontFiles() {
+        File tempFolder = new File(System.getProperty("java.io.tmpdir"));
+
+        File[] tempFiles = tempFolder.listFiles((dir, name) -> {
+            return name.startsWith("jr-font") && name.endsWith(".ttf");
+        });
+
+        for(File f : tempFiles) {
+            f.delete();
+        }
     }
 
     /**