Merge pull request #248 from omaster395464gh/dependabot/maven/main/junit.version-5.12.2

Bumps `junit.version` from 5.12.1 to 5.12.2.

Updates `org.junit.jupiter:junit-jupiter-api` from 5.12.1 to 5.12.2
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.12.1...r5.12.2)

Updates `org.junit.jupiter:junit-jupiter-engine` from 5.12.1 to 5.12.2
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.12.1...r5.12.2)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-api
  dependency-version: 5.12.2
  dependency-type: direct:development
  update-type: version-update:semver-patch
- dependency-name: org.junit.jupiter:junit-jupiter-engine
  dependency-version: 5.12.2
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/dependabot.yml

@@ -13,6 +13,8 @@ updates:
     ignore:
       - dependency-name: "net.bull.javamelody:javamelody-core"
         versions: ["2.x"]
+    assignees:
+      - omaster395464gh
 
   - package-ecosystem: "maven" # See documentation for possible values
     directory: "/" # Location of package manifests
@@ -21,3 +23,5 @@ updates:
     target-branch: "SERVLET60"
     labels:
       - "servlet60"
+    assignees:
+      - omaster395464gh

README.md

@@ -1,31 +1,36 @@
-# fop4apex [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=omaster395464gh_fop4apex&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=omaster395464gh_fop4apex)[![Technical Debt](https://sonarcloud.io/api/project_badges/measure?project=omaster395464gh_fop4apex&metric=sqale_index)](https://sonarcloud.io/summary/new_code?id=omaster395464gh_fop4apex)  
+# fop4apex [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=omaster395464gh_fop4apex&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=omaster395464gh_fop4apex)[![Technical Debt](https://sonarcloud.io/api/project_badges/measure?project=omaster395464gh_fop4apex&metric=sqale_index)](https://sonarcloud.io/summary/new_code?id=omaster395464gh_fop4apex)  [![Codacy Badge](https://app.codacy.com/project/badge/Grade/922bb36eaea346e3871fbb4564ad55f6)](https://app.codacy.com/gh/omaster395464gh/fop4apex/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade)
 
 Servlet for Oracle APEX to run PDF Reports based on Apache FOP
 
 Fahrdienst-Anwendung / Kostenblatt 
 
 * Uses Apache FOP for rendering
-https://xmlgraphics.apache.org/fop/
+<https://xmlgraphics.apache.org/fop/>
 * Uses JavaMelody for monitoring
-https://github.com/javamelody/javamelody/wiki
+<https://github.com/javamelody/javamelody/wiki>
 * Use Java 11 LTS (also tested with Java 17 LTS and Java 21 LTS)
  
 ## Run tests
+
 `mvn test`
 
 ## Build
+
 `mvn package verify`
 
 ## Upgrade
+
 * set new version in pom.xml
 * check dependent libraries for updates
 * run tests and build
 
 ## Release
+
 * create a tag with version number
 * create a github release
 
 ## Installation
+
 * rename target/fop4apex*.war to fop4apex.war
 * copy fop4apex.war to tomcat webapps folder
 * Oracle APEX - Sample Settings
@@ -35,7 +40,9 @@ https://github.com/javamelody/javamelody/wiki
   * Port 8080
   * Script: /fop4apex/pdf
   * Timeout 300
+
 ### Debugging
+
 Add to Tomcat logging.properties:
 ```
 org.apache.tomcat.util.http.Parameters.level = ALL
@@ -43,6 +50,7 @@ de.pdv.apex.level = ALL
 ```
 
 ### Deploy to tomcat 9.x (IntelliJ / Netbeans) / Jetty 10.x
+
 Run http://localhost:port/
 
 Example:
@@ -50,6 +58,7 @@ Example:
 * http://localhost:8080/fop4apex_war_exploded/monitoring
 
 ## Conversion using Apache fop (windows powershell)
+
 ```
 $env:PATH="c:\Users\oliver1\Downloads\_tools\fop-2.9\fop;$env:PATH"
 cd src\test\ressources\samples

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>de.pdv.apex</groupId>
     <artifactId>fop4apex</artifactId>
-    <version>0.13.4-SNAPSHOT</version>
+    <version>0.14.2-SNAPSHOT</version>
     <name>fop4apex</name>
     <packaging>war</packaging>
     <url>https://www.pdv.de</url>
@@ -15,9 +15,9 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.target>11</maven.compiler.target>
         <maven.compiler.source>11</maven.compiler.source>
-        <junit.version>5.10.3</junit.version>
+        <junit.version>5.12.2</junit.version>
         <batik.version>1.16</batik.version>
-        <pdfbox.version>3.0.2</pdfbox.version>
+        <pdfbox.version>3.0.4</pdfbox.version>
         <sonar.organization>omaster395464gh</sonar.organization>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
     </properties>
@@ -29,6 +29,12 @@
             <version>4.0.1</version>
             <scope>provided</scope>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/javax.servlet/jstl -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jstl</artifactId>
+            <version>1.2</version>
+        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
@@ -52,7 +58,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>5.12.0</version>
+            <version>5.17.0</version>
             <scope>test</scope>
         </dependency>
 
@@ -60,7 +66,7 @@
         <dependency>
             <groupId>org.apache.xmlgraphics</groupId>
             <artifactId>fop-core</artifactId>
-            <version>2.9</version>
+            <version>2.10</version>
             <scope>compile</scope>
             <exclusions>
                 <exclusion>
@@ -83,7 +89,7 @@
         <dependency>
             <groupId>net.bull.javamelody</groupId>
             <artifactId>javamelody-core</artifactId>
-            <version>1.99.0</version>
+            <version>1.99.3</version>
             <scope>compile</scope>
         </dependency>
 
@@ -95,6 +101,16 @@
             <scope>compile</scope>
         </dependency>
 
+        <!-- https://mvnrepository.com/artifact/com.github.librepdf/openpdf -->
+        <!-- updates to 1.4 and 2.x currently not possible https://github.com/javamelody/javamelody/pull/1182 -->
+        <!-- Optional: support pdf export for javamelody
+        <dependency>
+            <groupId>com.github.librepdf</groupId>
+            <artifactId>openpdf</artifactId>
+            <version>1.3.43</version>
+        </dependency>
+        -->
+
     </dependencies>
 
     <build>
@@ -111,14 +127,14 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.3.1</version>
+                <version>3.5.3</version>
             </plugin>
 
             <!-- https://mvnrepository.com/artifact/org.cyclonedx/cyclonedx-maven-plugin -->
             <plugin>
                 <groupId>org.cyclonedx</groupId>
                 <artifactId>cyclonedx-maven-plugin</artifactId>
-                <version>2.8.0</version>
+                <version>2.9.1</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -146,7 +162,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.13.0</version>
+                <version>3.14.0</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -158,7 +174,7 @@
             <plugin>
                 <groupId>com.google.cloud.tools</groupId>
                 <artifactId>jib-maven-plugin</artifactId>
-                <version>3.4.3</version>
+                <version>3.4.5</version>
                 <configuration>
                     <from>
                         <image>jetty:10-jre17-alpine</image>
@@ -175,7 +191,7 @@
             <plugin>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-maven-plugin</artifactId>
-                <version>11.0.22</version>
+                <version>11.0.25</version>
             </plugin>
         </plugins>
     </build>
@@ -187,7 +203,7 @@
                     <plugin>
                         <groupId>org.jacoco</groupId>
                         <artifactId>jacoco-maven-plugin</artifactId>
-                        <version>0.8.12</version>
+                        <version>0.8.13</version>
                         <executions>
                             <execution>
                                 <id>prepare-agent</id>
@@ -218,7 +234,7 @@
                     <plugin>
                         <groupId>org.owasp</groupId>
                         <artifactId>dependency-check-maven</artifactId>
-                        <version>10.0.3</version>
+                        <version>12.1.1</version>
                         <configuration>
                             <nvdApiServerId>nvd</nvdApiServerId>
                             <formats>

src/main/webapp/index.jsp

@@ -1,10 +1,16 @@
+<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<%@ page import="java.util.Map" %>
+<%@ page import="java.util.LinkedHashMap" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+
 <!doctype html>
 <html lang="en" data-theme="dark">
 <head>
     <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <meta name="description" content="Apache Formatting Objects Processor integration for Oracle Application Express, converts xml and fop to pdf">
-    <link rel="stylesheet" href="webjars/pico/css/pico.min.css">
+    <meta http-equiv="Content-Type"  content="text/html; charset=UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="description" content="Apache Formatting Objects Processor integration for Oracle Application Express, converts xml and fop to pdf" />
+    <link rel="stylesheet" href="webjars/pico/css/pico.min.css" />
     <title>Apache FOP for Oracle APEX</title>
 </head>
 <body>
@@ -42,11 +48,11 @@
         </tr>
         <tr>
             <th scope="row">Port</th>
-            <td>8080</td>
+            <td><c:out value="${pageContext.request.serverPort}"/></td>
         </tr>
         <tr>
             <th scope="row">Script</th>
-            <td>${pageContext.request.contextPath}/pdf</td>
+            <td><c:out value="${pageContext.request.contextPath}"/>/pdf</td>
         </tr>
         <tr>
             <td>Timeout</td>
@@ -61,24 +67,42 @@
     <pre>org.apache.tomcat.util.http.Parameters.level = ALL
 de.pdv.apex.level = ALL</pre>
 
-    <h2>Server Info / Environment</h2>
 <%--@elvariable id="System" type=""--%>
-    <pre>
-Server Version:   <%= application.getServerInfo() %>
-Servlet Version:  <%= application.getMajorVersion() %>.<%= application.getMinorVersion() %>
-JSP Version:      <%= JspFactory.getDefaultFactory().getEngineInfo().getSpecificationVersion() %>
-Context Path:     ${pageContext.request.contextPath}
+<%
+    Map<String,String> systemProperties = new LinkedHashMap<>();
+    systemProperties.put("Server Version",application.getServerInfo());
+    systemProperties.put("Servlet Version",String.format("%d.%d",application.getMajorVersion(),application.getMinorVersion()));
+    systemProperties.put("JSP Version",JspFactory.getDefaultFactory().getEngineInfo().getSpecificationVersion());
+    systemProperties.put("Context Path", request.getContextPath() );
+    systemProperties.put("","");
+    systemProperties.put("java.version",System.getProperty("java.version"));
+    systemProperties.put("java.vm.vendor",System.getProperty("java.vm.vendor"));
+    systemProperties.put("user.country",System.getProperty("user.country"));
+    systemProperties.put("user.language",System.getProperty("user.language"));
+    systemProperties.put("user.name",System.getProperty("user.name"));
+    systemProperties.put("user.timezone",System.getProperty("user.timezone"));
+    systemProperties.put("os.name",System.getProperty("os.name"));
+    systemProperties.put("os.version",System.getProperty("os.version"));
+    systemProperties.put("file.encoding",System.getProperty("file.encoding"));
+    systemProperties.put("sun.jnu.encoding",System.getProperty("sun.jnu.encoding"));
+    request.setAttribute("systemProperties",systemProperties);
+%>
 
-java.version:     ${System.getProperty("java.version")}
-java.vm.vendor:   ${System.getProperty("java.vm.vendor")}
-user.country:     ${System.getProperty("user.country")}
-user.language:    ${System.getProperty("user.language")}
-user.name:        ${System.getProperty("user.name")}
-user.timezone:    ${System.getProperty("user.timezone")}
-os.name:          ${System.getProperty("os.name")}
-os.version:       ${System.getProperty("os.version")}
-file.encoding:    ${System.getProperty("file.encoding")}
-sun.jnu.encoding: ${System.getProperty("sun.jnu.encoding")}</pre>
+    <h2>Server Info / Environment</h2>
+    <table role="grid">
+        <thead>
+        <tr>
+            <th scope="col">Parameter</th>
+            <th scope="col">Value</th>
+        </tr>
+        </thead>
+        <c:forEach var="property" items="${systemProperties}">
+            <tr>
+                <th scope="row"><c:out value="${property.key}"/></th>
+                <td><c:out value="${property.value}"/></td>
+            </tr>
+        </c:forEach>
+    </table>
     <p>page built with <a href="https://picocss.com/">Pico.css</a>, fop conversion with <a href="https://xmlgraphics.apache.org/fop/">Apache FOP</a> </p>
 </main>
 </body>

src/test/java/de/pdv/apex/ExampleFO2PDFTest.java

@@ -109,8 +109,7 @@ class ExampleFO2PDFTest {
 
         app.convertFO2PDFHelper(inputStream, pdfFile);
 
-        if (!pdfFile.exists())
-            throw new Exception("result file missing");
+        Assertions.assertTrue(pdfFile.exists(), "Error: result file missing");
 
         try (PDDocument document = Loader.loadPDF(new RandomAccessReadBufferedFile(pdfFile)))
         {

src/test/java/de/pdv/apex/ExampleXML2PDFTest.java

@@ -84,8 +84,7 @@ class ExampleXML2PDFTest {
         //close
         out.close();
 
-        if (!pdfFile.exists())
-            throw new Exception("result file missing");
+        Assertions.assertTrue(pdfFile.exists(), "Error: result file missing");
         try (PDDocument document = Loader.loadPDF(new RandomAccessReadBufferedFile(pdfFile))) {
             System.out.println("Pages: " + document.getNumberOfPages());
             System.out.println("Filesize (Bytes): " + Files.size(pdfFile.toPath()));