From 553495cf97065609ad347f9826fe375a6b0a4fe6 Mon Sep 17 00:00:00 2001
From: Daniel Giribet <dani@calidos.cat>
Date: Fri, 19 Apr 2024 16:50:21 +0100
Subject: [PATCH 1/3] Adding jakarta servlet API 6

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 73b6685..9006b65 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>org.mitre.dsmiley.httpproxy</groupId>
   <artifactId>smiley-http-proxy-servlet</artifactId>
-  <version>2.1-SNAPSHOT</version>
+  <version>3.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Smiley's HTTP Proxy Servlet</name>
@@ -57,7 +57,7 @@
     <dependency>
       <groupId>jakarta.servlet</groupId>
       <artifactId>jakarta.servlet-api</artifactId>
-      <version>5.0.0</version>
+      <version>6.0.0</version>
       <scope>provided</scope>
     </dependency>
 

From a07ace37567840c55e1d626a5b433d0ad00102f5 Mon Sep 17 00:00:00 2001
From: Daniel Giribet <dani@calidos.cat>
Date: Thu, 25 Apr 2024 10:38:04 +0100
Subject: [PATCH 2/3] ensuring compatibility with jakarta 6 and 5

---
 .github/workflows/maven.yml | 4 +++-
 pom.xml                     | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 55dbd47..7d3f7de 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -15,6 +15,7 @@ jobs:
        include:
          - HTTPCLIENT_VERSION: 4.5.13
            HTTPCLIENT_TEST_VERSION: 4.3.6
+           JAKARTA_VERSION: [5.0.0, 6.0.0]
            JDOC: "site"           
            
     steps:
@@ -27,6 +28,7 @@ jobs:
       env:
           HTTPCLIENT_VERSION: ${{ matrix.HTTPCLIENT_VERSION }}
           HTTPCLIENT_TEST_VERSION: ${{ matrix.HTTPCLIENT_TEST_VERSION }}
+          JAKARTA_VERSION: ${{ matrix.JAKARTA_VERSION }}
           JDOC: ${{ matrix.JDOC }}
-      run: mvn -B -Dhttpclient.version=$HTTPCLIENT_VERSION -Dhttpclient.test.version=$HTTPCLIENT_TEST_VERSION verify $JDOC
+      run: mvn -B -Dhttpclient.version=$HTTPCLIENT_VERSION -Dhttpclient.test.version=$HTTPCLIENT_TEST_VERSION -Djakarta.version=$JAKARTA_VERSION verify $JDOC
         
diff --git a/pom.xml b/pom.xml
index 9006b65..061aa0f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>org.mitre.dsmiley.httpproxy</groupId>
   <artifactId>smiley-http-proxy-servlet</artifactId>
-  <version>3.0-SNAPSHOT</version>
+  <version>2.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Smiley's HTTP Proxy Servlet</name>
@@ -41,6 +41,8 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
+    <!-- should work with the following versions of jakarta -->
+    <jakarta.version>[5.0.0, 6.0.0]</jakarta.version>
     <!-- works with v4.3 and forward; see .github/workflows/maven.yml -->
     <httpclient.version>[4.5.14,5.0)</httpclient.version>
     <!-- the last version to provide LocalTestServer.java -->

From b02fca066949a0d191a0a4df79df3981fc472ce7 Mon Sep 17 00:00:00 2001
From: Daniel Giribet <dani@calidos.cat>
Date: Fri, 26 Apr 2024 09:03:25 +0100
Subject: [PATCH 3/3] setting jakarta version list in matrix

---
 .github/workflows/maven.yml | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 7d3f7de..ee49dba 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -9,26 +9,26 @@ jobs:
   build:
 
     runs-on: ubuntu-latest
-    
+
     strategy:
       matrix:
-       include:
-         - HTTPCLIENT_VERSION: 4.5.13
-           HTTPCLIENT_TEST_VERSION: 4.3.6
-           JAKARTA_VERSION: [5.0.0, 6.0.0]
-           JDOC: "site"           
-           
+        JAKARTA_VERSION: [5.0.0, 6.0.0]
+        include:
+          - HTTPCLIENT_VERSION: 4.5.13
+            HTTPCLIENT_TEST_VERSION: 4.3.6
+            JDOC: "site"
+
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 11
-      uses: actions/setup-java@v1
-      with:
-        java-version: 11     
-    - name: Build with Maven
-      env:
+      - uses: actions/checkout@v2
+      - name: Set up JDK 11
+        uses: actions/setup-java@v1
+        with:
+          java-version: 11
+      - name: Build with Maven
+        env:
           HTTPCLIENT_VERSION: ${{ matrix.HTTPCLIENT_VERSION }}
           HTTPCLIENT_TEST_VERSION: ${{ matrix.HTTPCLIENT_TEST_VERSION }}
           JAKARTA_VERSION: ${{ matrix.JAKARTA_VERSION }}
           JDOC: ${{ matrix.JDOC }}
-      run: mvn -B -Dhttpclient.version=$HTTPCLIENT_VERSION -Dhttpclient.test.version=$HTTPCLIENT_TEST_VERSION -Djakarta.version=$JAKARTA_VERSION verify $JDOC
-        
+        run: mvn -B -Dhttpclient.version=$HTTPCLIENT_VERSION -Dhttpclient.test.version=$HTTPCLIENT_TEST_VERSION -Djakarta.version=$JAKARTA_VERSION verify $JDOC
+