From 4cb07478e906a5103980b9110b49a477cf7a5f0b Mon Sep 17 00:00:00 2001
From: "Oliver.Warz@pdv.de" <Oliver.Warz@pdv.de>
Date: Sun, 1 May 2022 13:01:05 +0200
Subject: [PATCH] 0.9.5

---
 .github/dependabot.yml    |  2 +-
 CHANGELOG                 | 13 ++++--
 pom.xml                   | 51 ++++++++++++---------
 src/main/webapp/index.jsp | 93 ++++++++++++++++++++++++---------------
 4 files changed, 99 insertions(+), 60 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 4eeafeb..5b06320 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -5,7 +5,7 @@
 
 version: 2
 updates:
-  - package-ecosystem: "" # See documentation for possible values
+  - package-ecosystem: "maven" # See documentation for possible values
     directory: "/" # Location of package manifests
     schedule:
       interval: "daily"
diff --git a/CHANGELOG b/CHANGELOG
index 579bdda..05f7edf 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.9.5] - 2022-05-01
+### Changed
+- uptake fontbox 2.0.26
+- uptake pdfbox 2.0.26
+- uptake dependency-check-maven 7.1.0
+
+## [0.9.4] - 2022-04-28
+### Added
+- picocss 1.5
+
 ## [0.9.3] - 2022-04-04
 ### Changed
 - uptake javamelody 1.91.0
@@ -25,6 +35,3 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - initial version
 - apache fop 2.6
 
-[Unreleased]: http://gitlab.pdv.lan/oliver1/fop4apex/compare/0.9.3...master
-[0.9.3]: http://gitlab.pdv.lan/oliver1/fop4apex/compare/0.9.2...0.9.3
-[0.9.2]: hhttp://gitlab.pdv.lan/oliver1/fop4apex/-/tags/0.9.2
diff --git a/pom.xml b/pom.xml
index c85a3b2..cde5321 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>de.pdv.apex</groupId>
     <artifactId>fop4apex</artifactId>
-    <version>0.9.3</version>
+    <version>0.9.5</version>
     <name>fop4apex</name>
     <packaging>war</packaging>
     <url>https://www.pdv.de</url>
@@ -41,7 +41,7 @@
         <dependency>
             <groupId>org.apache.pdfbox</groupId>
             <artifactId>pdfbox</artifactId>
-            <version>2.0.25</version>
+            <version>2.0.26</version>
             <scope>test</scope>
         </dependency>
 
@@ -61,12 +61,19 @@
             <scope>compile</scope>
         </dependency>
 
+        <!-- https://mvnrepository.com/artifact/org.webjars.bowergithub.picocss/pico -->
+        <dependency>
+            <groupId>org.webjars.bowergithub.picocss</groupId>
+            <artifactId>pico</artifactId>
+            <version>1.5.0</version>
+        </dependency>
+
         <!-- Start: Security fixes -->
         <!-- https://mvnrepository.com/artifact/org.apache.pdfbox/fontbox -->
         <dependency>
             <groupId>org.apache.pdfbox</groupId>
             <artifactId>fontbox</artifactId>
-            <version>2.0.25</version>
+            <version>2.0.26</version>
             <scope>compile</scope>
         </dependency>
         <!-- https://mvnrepository.com/artifact/commons-io/commons-io -->
@@ -88,15 +95,17 @@
 
     <build>
         <plugins>
+            <!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-war-plugin -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
                 <version>3.3.2</version>
             </plugin>
+            <!-- https://mvnrepository.com/artifact/org.owasp/dependency-check-maven -->
             <plugin>
                 <groupId>org.owasp</groupId>
                 <artifactId>dependency-check-maven</artifactId>
-                <version>7.0.4</version>
+                <version>7.1.0</version>
                 <executions>
                     <execution>
                         <goals>
@@ -105,29 +114,31 @@
                     </execution>
                 </executions>
             </plugin>
+            <!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-surefire-plugin -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>3.0.0-M6</version>
             </plugin>
 
+            <!-- https://mvnrepository.com/artifact/com.google.cloud.tools/jib-maven-plugin -->
             <!--
-                        <plugin>
-                            <groupId>com.google.cloud.tools</groupId>
-                            <artifactId>jib-maven-plugin</artifactId>
-                            <version>3.2.0</version>
-                            <configuration>
-                                <from>
-                                    <image>compile.pdv.lan:8001/product/base/vis-tomcat:9.0</image>
-                                </from>
-                                <to>
-                                    <image>fop4apex</image>
-                                </to>
-                                <container>
-                                    <appRoot>/opt/pdv/webapps/fop4apex</appRoot>
-                                </container>
-                            </configuration>
-                        </plugin>
+                <plugin>
+                    <groupId>com.google.cloud.tools</groupId>
+                    <artifactId>jib-maven-plugin</artifactId>
+                    <version>3.2.1</version>
+                    <configuration>
+                        <from>
+                            <image>compile.pdv.lan:8001/product/base/vis-tomcat:9.0</image>
+                        </from>
+                        <to>
+                            <image>fop4apex</image>
+                        </to>
+                        <container>
+                            <appRoot>/opt/pdv/webapps/fop4apex</appRoot>
+                        </container>
+                    </configuration>
+                </plugin>
             -->
         </plugins>
     </build>
diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp
index 6274d83..d570e6c 100644
--- a/src/main/webapp/index.jsp
+++ b/src/main/webapp/index.jsp
@@ -1,47 +1,55 @@
-<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
-<!DOCTYPE html>
-<html>
+<!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">
     <title>Apache FOP for Oracle APEX</title>
-    <style>
-        body {background-color: powderblue;}
-        h1   {color: blue;}
-        p    {color: red;}
-    </style>
 </head>
 <body>
-<h1>JSP - Apache FOP  (Formatting Objects Processor) integration for Oracle APEX</h1>
-<br/>
-<%--suppress HtmlUnknownTarget --%>
-<a href="pdf">pdf Servlet / Hello World / fo2pdf</a><br/>
-<%--suppress HtmlUnknownTarget --%>
-<a href="monitoring">JavaMelody Monitoring</a>
-<h2>Sample APEX Settings</h2>
-    <table>
+<main class="container">
+    <hgroup>
+        <h1>Apache FOP integration for Oracle APEX</h1>
+        <h2>FOP = Formatting Objects Processor</h2>
+    </hgroup>
+    <ul>
+        <li>Demo: <a href="pdf" data-tooltip="Run pdf servlet with demo data">pdf servlet / fo2pdf</a></li>
+        <li>Monitoring: <a href="monitoring" data-tooltip="Go to JavaMelody Monitoring page">JavaMelody</a></li>
+    </ul>
+
+    <!-- <a href="pdf">pdf Servlet / Hello World / fo2pdf</a><br/> -->
+    <%--suppress HtmlUnknownTarget --%>
+    <!-- <a href="monitoring">JavaMelody Monitoring</a> -->
+    <hgroup>
+        <h2>Sample APEX Settings</h2>
+        <h3>Internal Workspace / Instance Settings / Report Printing</h3>
+    </hgroup>
+    <table role="grid">
         <thead>
         <tr>
-        <td><b>Parameter</b></td>
-        <td><b>Value</b></td>
+            <th scope="col">Parameter</th>
+            <th scope="col">Value</th>
         </tr>
         </thead>
         <tr>
-            <td>PrintServer</td>
+            <th scope="row">PrintServer</th>
             <td>External (Apache FOP)</td>
         </tr>
         <tr>
-            <td>Protocol</td>
+            <th scope="row">Protocol</th>
             <td>HTTP / HTTPS</td>
         </tr>
         <tr>
-            <td>Host</td>
+            <th scope="row">Host</th>
             <td>127.0.0.1</td>
         </tr>
         <tr>
-            <td>Port</td>
+            <th scope="row">Port</th>
             <td>8080</td>
         </tr>
         <tr>
-            <td>Script</td>
+            <th scope="row">Script</th>
             <td>${pageContext.request.contextPath}/pdf</td>
         </tr>
         <tr>
@@ -50,19 +58,32 @@
         </tr>
     </table>
 
-<h2>Debugging</h2>
-<span>
-# Add to logging.properties<br/>
-org.apache.tomcat.util.http.Parameters.level = ALL<br/>
-de.pdv.apex.level = ALL
-</span>
+    <hgroup>
+        <h2>Debugging</h2>
+        <h3>Add to tomcat conf/logging.properties</h3>
+    </hgroup>
+    <pre>org.apache.tomcat.util.http.Parameters.level = ALL
+de.pdv.apex.level = ALL</pre>
 
-<span>
-<h2>Server Info</h2>
-Server Version: <%= application.getServerInfo() %><br/>
-Servlet Version: <%= application.getMajorVersion() %>.<%= application.getMinorVersion() %><br/>
-JSP Version: <%= JspFactory.getDefaultFactory().getEngineInfo().getSpecificationVersion() %><br/>
-Web Application Context Path = ${pageContext.request.contextPath}<br/>
-</span>
+    <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}
+
+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>
+    <p>page build 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>
 </html>
\ No newline at end of file