From d7dd95c2a63988c36856c2d60213a2cda2355a1e Mon Sep 17 00:00:00 2001
From: oliver1 <oliver.warz@pdv.de>
Date: Wed, 24 Jul 2024 22:12:01 +0200
Subject: [PATCH] servlet60 / jetty 12

---
 .github/dependabot.yml              |  1 +
 .github/workflows/maven-publish.yml |  4 ++--
 .github/workflows/maven.yml         |  2 +-
 README.md                           |  6 +++---
 pom.xml                             | 19 ++++++++++++-------
 5 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 5b06320..c18b52f 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -9,3 +9,4 @@ updates:
     directory: "/" # Location of package manifests
     schedule:
       interval: "daily"
+        target-branch: "SERVLET60"
diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml
index 351c60d..ef2f3c5 100644
--- a/.github/workflows/maven-publish.yml
+++ b/.github/workflows/maven-publish.yml
@@ -25,10 +25,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - 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
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index d6cc2ed..27b87c4 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
         distribution: [ 'temurin' ]
-        java: [ '11', '17', '21' ]
+        java: [ '17', '21' ]
     steps:
     - uses: actions/checkout@v3
     - name: Setup java
diff --git a/README.md b/README.md
index 5b581f9..bd44eaf 100644
--- a/README.md
+++ b/README.md
@@ -8,8 +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 LTS and Java 21 LTS)
-* Use Tomcat 10.1.x (Jakarta EE) 
+* Use Java 17 LTS (also tested with Java 21 LTS)
+* Use Tomcat 10.1.x+ (Jakarta EE / Servlet 6.0)  or Jetty 12
 ## Run tests
 `mvn test`
 
@@ -42,7 +42,7 @@ org.apache.tomcat.util.http.Parameters.level = ALL
 de.pdv.apex.level = ALL
 ```
 
-### Deploy to tomcat 9.x (IntelliJ / Netbeans)
+### Deploy to tomcat 10.1.x+ or Jetty 12 (IntelliJ / Netbeans)
 Run http://localhost:port/
 
 Example:
diff --git a/pom.xml b/pom.xml
index 0b32ebc..3190882 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>de.pdv.apex</groupId>
     <artifactId>fop4apex</artifactId>
-    <version>0.13.4-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <name>fop4apex</name>
     <packaging>war</packaging>
     <url>https://www.pdv.de</url>
@@ -18,6 +18,7 @@
         <junit.version>5.10.2</junit.version>
         <batik.version>1.16</batik.version>
         <pdfbox.version>3.0.2</pdfbox.version>
+        <jettyVersion>12.0.11</jettyVersion>
         <sonar.organization>omaster395464gh</sonar.organization>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
     </properties>
@@ -118,7 +119,7 @@
             <plugin>
                 <groupId>org.cyclonedx</groupId>
                 <artifactId>cyclonedx-maven-plugin</artifactId>
-                <version>2.7.9</version>
+                <version>2.8.0</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -129,7 +130,7 @@
                 </executions>
                 <configuration>
                     <projectType>library</projectType>
-                    <schemaVersion>1.4</schemaVersion>
+                    <schemaVersion>1.5</schemaVersion>
                     <includeBomSerialNumber>true</includeBomSerialNumber>
                     <includeCompileScope>true</includeCompileScope>
                     <includeProvidedScope>true</includeProvidedScope>
@@ -147,20 +148,24 @@
             <plugin>
                 <groupId>com.google.cloud.tools</groupId>
                 <artifactId>jib-maven-plugin</artifactId>
-                <version>3.4.0</version>
+                <version>3.4.3</version>
                 <configuration>
                     <from>
-                        <image>compile.pdv.lan:8001/product/base/vis-tomcat:9.0</image>
+                        <image>jetty:12.0-jdk17-alpine-eclipse-temurin</image>
                     </from>
                     <to>
                         <image>fop4apex</image>
                     </to>
                     <container>
-                        <appRoot>/opt/pdv/webapps/fop4apex</appRoot>
+                        <entrypoint>java,-jar,/usr/local/jetty/start.jar</entrypoint>
                     </container>
                 </configuration>
             </plugin>
-
+            <plugin>
+                <groupId>org.eclipse.jetty.ee10</groupId>
+                <artifactId>jetty-ee10-maven-plugin</artifactId>
+                <version>${jettyVersion}</version>
+            </plugin>
         </plugins>
     </build>
     <profiles>