Merge branch 'main' into dependabot/maven/net.bull.javamelody-javamelody-core-2.0.1

# Conflicts:
#	README.md
#	pom.xml

.github/workflows/maven.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
         distribution: [ 'temurin' ]
-        java: [ '11', '17' ]
+        java: [ '11', '17', '21' ]
     steps:
     - uses: actions/checkout@v3
     - name: Setup java

.github/workflows/sonarcloud.yaml

@@ -13,10 +13,10 @@ jobs:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
           server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
           settings-path: ${{ github.workspace }} # location for the settings.xml file

CHANGELOG

@@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+see https://github.com/omaster395464gh/fop4apex/releases for newer release notes
+
 ## [0.10.2] - 2022-09-09
 ### Changed
 - remove junit 4

README.md

@@ -8,9 +8,8 @@ Fahrdienst-Anwendung / Kostenblatt
 https://xmlgraphics.apache.org/fop/
 * Uses JavaMelody for monitoring
 https://github.com/javamelody/javamelody/wiki
-* Use Java 11 LTS (also tested with Java 17)
+* Use Java 11 LTS (also tested with Java 17 LTS and Java 21 LTS)
 * Use Tomcat 10.1.x (Jakarta EE) 
-
 ## Run tests
 `mvn test`
 

pom.xml

@@ -6,15 +6,15 @@
 
     <groupId>de.pdv.apex</groupId>
     <artifactId>fop4apex</artifactId>
-    <version>0.12.1-SNAPSHOT</version>
+    <version>0.13.1-SNAPSHOT</version>
     <name>fop4apex</name>
     <packaging>war</packaging>
     <url>https://www.pdv.de</url>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.source>11</maven.compiler.source>
         <junit.version>5.10.0</junit.version>
         <batik.version>1.16</batik.version>
         <pdfbox.version>3.0.0</pdfbox.version>
@@ -52,7 +52,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>5.4.0</version>
+            <version>5.6.0</version>
             <scope>test</scope>
         </dependency>
 
@@ -60,7 +60,7 @@
         <dependency>
             <groupId>org.apache.xmlgraphics</groupId>
             <artifactId>fop-core</artifactId>
-            <version>2.8</version>
+            <version>2.9</version>
             <scope>compile</scope>
             <exclusions>
                 <exclusion>
@@ -147,7 +147,7 @@
             <plugin>
                 <groupId>com.google.cloud.tools</groupId>
                 <artifactId>jib-maven-plugin</artifactId>
-                <version>3.3.2</version>
+                <version>3.4.0</version>
                 <configuration>
                     <from>
                         <image>compile.pdv.lan:8001/product/base/vis-tomcat:9.0</image>
@@ -202,7 +202,7 @@
                     <plugin>
                         <groupId>org.owasp</groupId>
                         <artifactId>dependency-check-maven</artifactId>
-                        <version>8.3.1</version>
+                        <version>8.4.0</version>
                         <configuration>
                             <formats>
                                 <format>html</format>
@@ -221,4 +221,4 @@
             <url>https://maven.pkg.github.com/omaster395464gh/fop4apex</url>
         </repository>
     </distributionManagement>
-</project>
+</project>