From 82746faecd824368b141fe4e5794c691be046efe Mon Sep 17 00:00:00 2001
From: Paul <paul@blueconic.com>
Date: Wed, 8 May 2024 18:12:29 +0200
Subject: [PATCH 01/59] Create build.yml

---
 .github/workflows/build.yml | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 .github/workflows/build.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 0000000000..8b400e564e
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,35 @@
+# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven
+
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Java CI with Maven
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up JDK 8
+      uses: actions/setup-java@v3
+      with:
+        java-version: '8'
+        distribution: 'temurin'
+        cache: maven
+    - name: Build with Maven
+      run: mvn clean package 
+
+    # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
+    - name: Update dependency graph
+      uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6

From dcc0980f4388f2e2dba7a4db7b9ab01f5be92a90 Mon Sep 17 00:00:00 2001
From: Paul <paul@blueconic.com>
Date: Wed, 8 May 2024 18:17:26 +0200
Subject: [PATCH 02/59] Create root pom.xml

---
 pom.xml | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 pom.xml

diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000000..94b2eda667
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,38 @@
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <name>Apache Felix</name>
+    <groupId>org.apache.felix</groupId>
+    <artifactId>org.apache.felix</artifactId>
+    <version>7-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <scm>
+        <connection>scm:git:https://github.com/apache/felix-dev.git</connection>
+        <developerConnection>scm:git:https://github.com/apache/felix-dev.git</developerConnection>
+        <url>https://gitbox.apache.org/repos/asf?p=felix-dev.git</url>
+    </scm>
+    
+    <modules>
+        <module>http</module>
+        <!-- other modulea here -->
+    </modules>
+</project>

From 7260696c9be5ed7b27c52102cde976e7111e3197 Mon Sep 17 00:00:00 2001
From: Paul <paul@blueconic.com>
Date: Wed, 8 May 2024 18:19:33 +0200
Subject: [PATCH 03/59] Update build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8b400e564e..d4af72ee9b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -24,7 +24,7 @@ jobs:
     - name: Set up JDK 8
       uses: actions/setup-java@v3
       with:
-        java-version: '8'
+        java-version: '11'
         distribution: 'temurin'
         cache: maven
     - name: Build with Maven

From fba4fc206c93357ee11545b1cedb1e33f50051e0 Mon Sep 17 00:00:00 2001
From: Paul <paul@blueconic.com>
Date: Wed, 8 May 2024 18:19:55 +0200
Subject: [PATCH 04/59] Update build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d4af72ee9b..8d651e31e9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,7 +21,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK 8
+    - name: Set up JDK 11
       uses: actions/setup-java@v3
       with:
         java-version: '11'

From 6a51efe5c5eb3cc5b679f654fee2f06fd7e2cf9c Mon Sep 17 00:00:00 2001
From: Paul <paul@blueconic.com>
Date: Wed, 8 May 2024 18:22:43 +0200
Subject: [PATCH 05/59] Update pom.xml

---
 http/itest/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/http/itest/pom.xml b/http/itest/pom.xml
index 0c22f10f57..e95b183a19 100644
--- a/http/itest/pom.xml
+++ b/http/itest/pom.xml
@@ -33,7 +33,7 @@
     <properties>
         <felix.java.version>11</felix.java.version>
         <http.servlet.api.version>2.1.0</http.servlet.api.version>
-        <http.jetty.version>5.1.13-SNAPSHOT</http.jetty.version>
+        <http.jetty.version>5.1.15-SNAPSHOT</http.jetty.version>
         <http.jetty.id>org.apache.felix.http.jetty</http.jetty.id>
         <pax.exam.version>4.13.1</pax.exam.version>
         <pax.url.aether.version>2.6.14</pax.url.aether.version>

From abc7ecf2483f821ec852c4949e404ea572c97463 Mon Sep 17 00:00:00 2001
From: Paul <paul@blueconic.com>
Date: Wed, 8 May 2024 18:27:04 +0200
Subject: [PATCH 06/59] Update pom.xml

Disable itest for now
---
 http/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/http/pom.xml b/http/pom.xml
index 97f623fe7b..c50076b3e5 100644
--- a/http/pom.xml
+++ b/http/pom.xml
@@ -42,7 +42,7 @@
         <module>base</module>
         <module>bridge</module>
         <module>inventoryprinter</module>
-        <module>itest</module>
+       <!--<module>itest</module>-->
         <module>jetty</module>
         <module>jetty12</module>
         <module>proxy</module>

From 9ff29c9cd0fc5cef37a262e5a2fa1057b38d27a4 Mon Sep 17 00:00:00 2001
From: Paul <paul@blueconic.com>
Date: Wed, 8 May 2024 18:28:57 +0200
Subject: [PATCH 07/59] Update build.yml

---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8d651e31e9..d2fa3cb920 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,10 +21,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v3
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'temurin'
         cache: maven
     - name: Build with Maven

From 2a1e2b47a31866e70b92a4e460b781ffb72593a3 Mon Sep 17 00:00:00 2001
From: Paul <paul@blueconic.com>
Date: Wed, 8 May 2024 18:35:42 +0200
Subject: [PATCH 08/59] Update pom.xml

---
 http/samples/whiteboard/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/http/samples/whiteboard/pom.xml b/http/samples/whiteboard/pom.xml
index d17d2c432d..f82047bc35 100644
--- a/http/samples/whiteboard/pom.xml
+++ b/http/samples/whiteboard/pom.xml
@@ -96,7 +96,7 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.http.jetty12</artifactId>
-            <version>1.0.5-SNAPSHOT</version>
+            <version>1.0.7-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

From 84000cc5e63e1edb2d2e94ec6e05c7c60344f24f Mon Sep 17 00:00:00 2001
From: Paul <paul@blueconic.com>
Date: Wed, 8 May 2024 18:43:12 +0200
Subject: [PATCH 09/59] Update build.yml

---
 .github/workflows/build.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d2fa3cb920..5485adb8d6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -29,7 +29,3 @@ jobs:
         cache: maven
     - name: Build with Maven
       run: mvn clean package 
-
-    # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
-    - name: Update dependency graph
-      uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6

From cae3d088198225054b391dcb753924c76c3e1b57 Mon Sep 17 00:00:00 2001
From: Paul <paul@blueconic.com>
Date: Wed, 8 May 2024 20:12:14 +0200
Subject: [PATCH 10/59] Update build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5485adb8d6..a5e0f5d00f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -28,4 +28,4 @@ jobs:
         distribution: 'temurin'
         cache: maven
     - name: Build with Maven
-      run: mvn clean package 
+      run: mvn clean install verify

From 31cbcabc23da2adc0f5a81cd078f140707557f8e Mon Sep 17 00:00:00 2001
From: Paul <paul@blueconic.com>
Date: Wed, 8 May 2024 21:35:05 +0200
Subject: [PATCH 11/59] Update build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a5e0f5d00f..4366cade1f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -28,4 +28,4 @@ jobs:
         distribution: 'temurin'
         cache: maven
     - name: Build with Maven
-      run: mvn clean install verify
+      run: mvn -B clean install verify

From 2174c837ecd831829aa7fc6f3af50e802092efc6 Mon Sep 17 00:00:00 2001
From: Paul <paul@blueconic.com>
Date: Thu, 9 May 2024 09:59:29 +0200
Subject: [PATCH 12/59] Update pom.xml

---
 http/jetty12/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/http/jetty12/pom.xml b/http/jetty12/pom.xml
index 50b35582dd..9d94a7e152 100644
--- a/http/jetty12/pom.xml
+++ b/http/jetty12/pom.xml
@@ -26,7 +26,7 @@
         <relativePath>../../pom/pom.xml</relativePath>
     </parent>
 
-    <name>Apache Felix Http Jetty</name>
+    <name>Apache Felix Http Jetty 12</name>
     <description>This is an implementation of the R8.1 OSGi Servlet Service, the R7 OSGi Http Service and the R7 OSGi Http Whiteboard Specification</description>
 
     <artifactId>org.apache.felix.http.jetty12</artifactId>

From a2a3ff3539b28fa37e1ec420049598f58c58f607 Mon Sep 17 00:00:00 2001
From: Paul <paul@blueconic.com>
Date: Mon, 13 May 2024 08:30:46 +0200
Subject: [PATCH 13/59] Update build.yml

Try with Java21
---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4366cade1f..3da3f6bcc3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,10 +21,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v3
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'temurin'
         cache: maven
     - name: Build with Maven

From 04d85b5a2ca49e85f5b896c6407ef9af1e6fb95a Mon Sep 17 00:00:00 2001
From: Paul <paul@blueconic.com>
Date: Mon, 13 May 2024 08:34:11 +0200
Subject: [PATCH 14/59] Update build.yml

Ignore test for PoC
---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3da3f6bcc3..b31e170631 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -28,4 +28,4 @@ jobs:
         distribution: 'temurin'
         cache: maven
     - name: Build with Maven
-      run: mvn -B clean install verify
+      run: mvn -Dtest=\!MissingWebsocketDependenciesIT* -B clean install verify

From 1b1fb88a22aab52aa03efd7149bff5fad4ace00d Mon Sep 17 00:00:00 2001
From: Paul <paul@blueconic.com>
Date: Mon, 13 May 2024 08:37:44 +0200
Subject: [PATCH 15/59] Update build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b31e170631..4f685d1e28 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -28,4 +28,4 @@ jobs:
         distribution: 'temurin'
         cache: maven
     - name: Build with Maven
-      run: mvn -Dtest=\!MissingWebsocketDependenciesIT* -B clean install verify
+      run: mvn -Dsurefire.failIfNoSpecifiedTests=false -Dtest=\!MissingWebsocketDependenciesIT* -B clean install verify

From 1da24c072b562e596ddd3c41ba94985f528e5195 Mon Sep 17 00:00:00 2001
From: Paul <paul@blueconic.com>
Date: Mon, 13 May 2024 08:39:34 +0200
Subject: [PATCH 16/59] Update build.yml

Revert to 17
---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4f685d1e28..f03d1cf165 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,10 +21,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK 21
+    - name: Set up JDK 17
       uses: actions/setup-java@v3
       with:
-        java-version: '21'
+        java-version: '17'
         distribution: 'temurin'
         cache: maven
     - name: Build with Maven

From 4d1c192c222c8c267d8c571c5631b3c1adb4e168 Mon Sep 17 00:00:00 2001
From: Paul <paul@blueconic.com>
Date: Mon, 13 May 2024 08:51:18 +0200
Subject: [PATCH 17/59] Update build.yml

Try with Corretto 21
---
 .github/workflows/build.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f03d1cf165..55a58549f2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,11 +21,11 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v3
       with:
-        java-version: '17'
-        distribution: 'temurin'
+        java-version: '21'
+        distribution: 'corretto'
         cache: maven
     - name: Build with Maven
       run: mvn -Dsurefire.failIfNoSpecifiedTests=false -Dtest=\!MissingWebsocketDependenciesIT* -B clean install verify

From cd7df20abbf5f57b72d55a1c973ca464af18c00f Mon Sep 17 00:00:00 2001
From: Paul <paul@blueconic.com>
Date: Mon, 13 May 2024 09:33:46 +0200
Subject: [PATCH 18/59] Update build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 55a58549f2..06e80f6373 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -28,4 +28,4 @@ jobs:
         distribution: 'corretto'
         cache: maven
     - name: Build with Maven
-      run: mvn -Dsurefire.failIfNoSpecifiedTests=false -Dtest=\!MissingWebsocketDependenciesIT* -B clean install verify
+      run: mvn -Dsurefire.failIfNoSpecifiedTests=false -Dtest=\!MissingWebsocketDependenciesIT* -B clean install integration-test verify

From d74716d0f2c803e4ccb8bcc5c0192b3f2613ba27 Mon Sep 17 00:00:00 2001
From: Paul <paul@blueconic.com>
Date: Mon, 13 May 2024 09:36:26 +0200
Subject: [PATCH 19/59] Update build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 06e80f6373..72cea03b17 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -28,4 +28,4 @@ jobs:
         distribution: 'corretto'
         cache: maven
     - name: Build with Maven
-      run: mvn -Dsurefire.failIfNoSpecifiedTests=false -Dtest=\!MissingWebsocketDependenciesIT* -B clean install integration-test verify
+      run: mvn -Dsurefire.failIfNoSpecifiedTests=false -Dtest=\!MissingWebsocketDependenciesIT* -B clean install

From 8044e9cdb9624c72362d68b5fad06c3cf04616c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20R=C3=BCtter?= <paul@blueconic.com>
Date: Mon, 13 May 2024 09:39:06 +0200
Subject: [PATCH 20/59] Set plugin version

---
 http/jetty/pom.xml   | 1 +
 http/jetty12/pom.xml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/http/jetty/pom.xml b/http/jetty/pom.xml
index 9965f27e3a..286d619de7 100644
--- a/http/jetty/pom.xml
+++ b/http/jetty/pom.xml
@@ -346,6 +346,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
+                <version>3.2.5</version>
                 <executions>
                     <execution>
                         <id>integration-test</id>
diff --git a/http/jetty12/pom.xml b/http/jetty12/pom.xml
index 9d94a7e152..fef9ba6c67 100644
--- a/http/jetty12/pom.xml
+++ b/http/jetty12/pom.xml
@@ -561,6 +561,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
+                <version>3.2.5</version>
                 <executions>
                     <execution>
                         <id>integration-test</id>

From 0ab6886dc9ee6480d8a80c322237a9c6a7cd8b2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20R=C3=BCtter?= <paul@blueconic.com>
Date: Mon, 13 May 2024 09:42:59 +0200
Subject: [PATCH 21/59] Follow
 https://sling.apache.org/documentation/development/testing-paxexam.html#2-configure-the-build-artifact-to-use-in-integration-testing-1

---
 http/jetty/pom.xml   | 3 ++-
 http/jetty12/pom.xml | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/http/jetty/pom.xml b/http/jetty/pom.xml
index 286d619de7..3ad2c34467 100644
--- a/http/jetty/pom.xml
+++ b/http/jetty/pom.xml
@@ -353,6 +353,7 @@
                         <phase>integration-test</phase>
                         <goals>
                             <goal>integration-test</goal>
+                            <goal>verify</goal>
                         </goals>
                     </execution>
                     <execution>
@@ -365,7 +366,7 @@
                 </executions>
                 <configuration>
                     <redirectTestOutputToFile>true</redirectTestOutputToFile>
-                    <systemPropertyVariables>
+                    <systemPropertyVariables combine.children="append">
                         <jetty.version>${jetty.version}</jetty.version>
                         <bundle.filename>${basedir}/target/${project.build.finalName}.jar</bundle.filename>
                         <pax.vm.options>${pax.vm.options}</pax.vm.options>
diff --git a/http/jetty12/pom.xml b/http/jetty12/pom.xml
index fef9ba6c67..1a404774d8 100644
--- a/http/jetty12/pom.xml
+++ b/http/jetty12/pom.xml
@@ -568,6 +568,7 @@
                         <phase>integration-test</phase>
                         <goals>
                             <goal>integration-test</goal>
+                            <goal>verify</goal>
                         </goals>
                     </execution>
                     <execution>
@@ -580,7 +581,7 @@
                 </executions>
                 <configuration>
                     <redirectTestOutputToFile>true</redirectTestOutputToFile>
-                    <systemPropertyVariables>
+                    <systemPropertyVariables combine.children="append">
                         <jetty.version>${jetty.version}</jetty.version>
                         <bundle.filename>${basedir}/target/${project.build.finalName}.jar</bundle.filename>
                         <pax.vm.options>${pax.vm.options}</pax.vm.options>

From d7851520fb733d623e15e786820cb3edf3edc083 Mon Sep 17 00:00:00 2001
From: Paul <paul@blueconic.com>
Date: Wed, 15 May 2024 08:28:32 +0200
Subject: [PATCH 22/59] Update build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 72cea03b17..2fd427466b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -28,4 +28,4 @@ jobs:
         distribution: 'corretto'
         cache: maven
     - name: Build with Maven
-      run: mvn -Dsurefire.failIfNoSpecifiedTests=false -Dtest=\!MissingWebsocketDependenciesIT* -B clean install
+      run: mvn --debug -Dsurefire.failIfNoSpecifiedTests=false -Dtest=\!MissingWebsocketDependenciesIT* -B clean install

From 8a43eaf0c397592c3c30be68cfab21cb16cbd7d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20R=C3=BCtter?= <paul@blueconic.com>
Date: Wed, 15 May 2024 08:43:00 +0200
Subject: [PATCH 23/59] Remove combine

---
 http/jetty/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/http/jetty/pom.xml b/http/jetty/pom.xml
index 3ad2c34467..24c091191c 100644
--- a/http/jetty/pom.xml
+++ b/http/jetty/pom.xml
@@ -366,7 +366,7 @@
                 </executions>
                 <configuration>
                     <redirectTestOutputToFile>true</redirectTestOutputToFile>
-                    <systemPropertyVariables combine.children="append">
+                    <systemPropertyVariables>
                         <jetty.version>${jetty.version}</jetty.version>
                         <bundle.filename>${basedir}/target/${project.build.finalName}.jar</bundle.filename>
                         <pax.vm.options>${pax.vm.options}</pax.vm.options>

From 77c68d5b8248e87c0cfe5d2aa6ce3d0022a7f58c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20R=C3=BCtter?= <paul@blueconic.com>
Date: Wed, 15 May 2024 08:48:54 +0200
Subject: [PATCH 24/59] Update maven

---
 .github/workflows/build.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2fd427466b..2c5e2a59bf 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,11 +21,12 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK 21
-      uses: actions/setup-java@v3
+    - name: Setup Maven Action
+      uses: s4u/setup-maven-action@v1.7.0
       with:
-        java-version: '21'
-        distribution: 'corretto'
-        cache: maven
+       checkout-fetch-depth: 0
+       java-version: 17
+       java-distribution: temurin
+       maven-version: 3.9.6
     - name: Build with Maven
       run: mvn --debug -Dsurefire.failIfNoSpecifiedTests=false -Dtest=\!MissingWebsocketDependenciesIT* -B clean install

From d2e958cede7ee90bf9bf3c2a8b8ed5f23e64ee5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20R=C3=BCtter?= <paul@blueconic.com>
Date: Wed, 15 May 2024 16:10:12 +0200
Subject: [PATCH 25/59] Remove root pom and replace with -f command

---
 .github/workflows/build.yml |  2 +-
 pom.xml                     | 38 -------------------------------------
 2 files changed, 1 insertion(+), 39 deletions(-)
 delete mode 100644 pom.xml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2c5e2a59bf..f3b69bbbb2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -29,4 +29,4 @@ jobs:
        java-distribution: temurin
        maven-version: 3.9.6
     - name: Build with Maven
-      run: mvn --debug -Dsurefire.failIfNoSpecifiedTests=false -Dtest=\!MissingWebsocketDependenciesIT* -B clean install
+      run: mvn --debug -Dsurefire.failIfNoSpecifiedTests=false -Dtest=\!MissingWebsocketDependenciesIT* -f http -B clean install
diff --git a/pom.xml b/pom.xml
deleted file mode 100644
index 94b2eda667..0000000000
--- a/pom.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-    
-    http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <name>Apache Felix</name>
-    <groupId>org.apache.felix</groupId>
-    <artifactId>org.apache.felix</artifactId>
-    <version>7-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <scm>
-        <connection>scm:git:https://github.com/apache/felix-dev.git</connection>
-        <developerConnection>scm:git:https://github.com/apache/felix-dev.git</developerConnection>
-        <url>https://gitbox.apache.org/repos/asf?p=felix-dev.git</url>
-    </scm>
-    
-    <modules>
-        <module>http</module>
-        <!-- other modulea here -->
-    </modules>
-</project>

From 1651b5951951affbe553d15539727f049417a4ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20R=C3=BCtter?= <paul@blueconic.com>
Date: Wed, 15 May 2024 16:18:15 +0200
Subject: [PATCH 26/59] Move configuration to execution

---
 http/jetty/pom.xml   | 26 ++++++++------------------
 http/jetty12/pom.xml | 26 ++++++++------------------
 2 files changed, 16 insertions(+), 36 deletions(-)

diff --git a/http/jetty/pom.xml b/http/jetty/pom.xml
index 24c091191c..0819b24ecc 100644
--- a/http/jetty/pom.xml
+++ b/http/jetty/pom.xml
@@ -346,32 +346,22 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
-                <version>3.2.5</version>
                 <executions>
                     <execution>
-                        <id>integration-test</id>
-                        <phase>integration-test</phase>
                         <goals>
                             <goal>integration-test</goal>
                             <goal>verify</goal>
                         </goals>
-                    </execution>
-                    <execution>
-                        <id>verify</id>
-                        <phase>integration-test</phase>
-                        <goals>
-                            <goal>verify</goal>
-                        </goals>
+                        <configuration>
+                            <redirectTestOutputToFile>true</redirectTestOutputToFile>
+                            <systemPropertyVariables>
+                                <jetty.version>${jetty.version}</jetty.version>
+                                <bundle.filename>${basedir}/target/${project.build.finalName}.jar</bundle.filename>
+                                <pax.vm.options>${pax.vm.options}</pax.vm.options>
+                            </systemPropertyVariables>
+                        </configuration>
                     </execution>
                 </executions>
-                <configuration>
-                    <redirectTestOutputToFile>true</redirectTestOutputToFile>
-                    <systemPropertyVariables>
-                        <jetty.version>${jetty.version}</jetty.version>
-                        <bundle.filename>${basedir}/target/${project.build.finalName}.jar</bundle.filename>
-                        <pax.vm.options>${pax.vm.options}</pax.vm.options>
-                    </systemPropertyVariables>
-                </configuration>
             </plugin>
         </plugins>
     </build>
diff --git a/http/jetty12/pom.xml b/http/jetty12/pom.xml
index 1a404774d8..499af8de25 100644
--- a/http/jetty12/pom.xml
+++ b/http/jetty12/pom.xml
@@ -561,32 +561,22 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
-                <version>3.2.5</version>
                 <executions>
                     <execution>
-                        <id>integration-test</id>
-                        <phase>integration-test</phase>
                         <goals>
                             <goal>integration-test</goal>
                             <goal>verify</goal>
                         </goals>
-                    </execution>
-                    <execution>
-                        <id>verify</id>
-                        <phase>integration-test</phase>
-                        <goals>
-                            <goal>verify</goal>
-                        </goals>
+                        <configuration>
+                            <redirectTestOutputToFile>true</redirectTestOutputToFile>
+                            <systemPropertyVariables>
+                                <jetty.version>${jetty.version}</jetty.version>
+                                <bundle.filename>${basedir}/target/${project.build.finalName}.jar</bundle.filename>
+                                <pax.vm.options>${pax.vm.options}</pax.vm.options>
+                            </systemPropertyVariables>
+                        </configuration>
                     </execution>
                 </executions>
-                <configuration>
-                    <redirectTestOutputToFile>true</redirectTestOutputToFile>
-                    <systemPropertyVariables combine.children="append">
-                        <jetty.version>${jetty.version}</jetty.version>
-                        <bundle.filename>${basedir}/target/${project.build.finalName}.jar</bundle.filename>
-                        <pax.vm.options>${pax.vm.options}</pax.vm.options>
-                    </systemPropertyVariables>
-                </configuration>
             </plugin>
         </plugins>
     </build>

From bb6324b1e8e1d98954d24a38a2726847002d48e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20R=C3=BCtter?= <paul@blueconic.com>
Date: Wed, 15 May 2024 16:19:24 +0200
Subject: [PATCH 27/59] Remove debug flag

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f3b69bbbb2..86f272900b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -29,4 +29,4 @@ jobs:
        java-distribution: temurin
        maven-version: 3.9.6
     - name: Build with Maven
-      run: mvn --debug -Dsurefire.failIfNoSpecifiedTests=false -Dtest=\!MissingWebsocketDependenciesIT* -f http -B clean install
+      run: mvn -Dsurefire.failIfNoSpecifiedTests=false -Dtest=\!MissingWebsocketDependenciesIT* -f http -B clean install

From b1d337765cd03b4dbcef6022b337d5505e37261c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20R=C3=BCtter?= <paul@blueconic.com>
Date: Wed, 15 May 2024 16:27:50 +0200
Subject: [PATCH 28/59] Use argLine
 (https://maven.apache.org/surefire/maven-failsafe-plugin/integration-test-mojo.html#argline)
 which might work better in Github Actions

---
 http/jetty/pom.xml   | 2 +-
 http/jetty12/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/http/jetty/pom.xml b/http/jetty/pom.xml
index 0819b24ecc..42d6e8b53a 100644
--- a/http/jetty/pom.xml
+++ b/http/jetty/pom.xml
@@ -356,9 +356,9 @@
                             <redirectTestOutputToFile>true</redirectTestOutputToFile>
                             <systemPropertyVariables>
                                 <jetty.version>${jetty.version}</jetty.version>
-                                <bundle.filename>${basedir}/target/${project.build.finalName}.jar</bundle.filename>
                                 <pax.vm.options>${pax.vm.options}</pax.vm.options>
                             </systemPropertyVariables>
+                            <argLine>"-Dbundle.filename=${basedir}/target/${project.build.finalName}.jar"</argLine>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/http/jetty12/pom.xml b/http/jetty12/pom.xml
index 499af8de25..651946eb81 100644
--- a/http/jetty12/pom.xml
+++ b/http/jetty12/pom.xml
@@ -571,9 +571,9 @@
                             <redirectTestOutputToFile>true</redirectTestOutputToFile>
                             <systemPropertyVariables>
                                 <jetty.version>${jetty.version}</jetty.version>
-                                <bundle.filename>${basedir}/target/${project.build.finalName}.jar</bundle.filename>
                                 <pax.vm.options>${pax.vm.options}</pax.vm.options>
                             </systemPropertyVariables>
+                            <argLine>"-Dbundle.filename=${basedir}/target/${project.build.finalName}.jar"</argLine>
                         </configuration>
                     </execution>
                 </executions>

From 49c7359d36e664d66d9ee5b1861b947a655ae01c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20R=C3=BCtter?= <paul@blueconic.com>
Date: Wed, 15 May 2024 16:31:09 +0200
Subject: [PATCH 29/59] Try env variables instead

---
 http/jetty/pom.xml                                            | 4 +++-
 .../apache/felix/http/jetty/it/AbstractJettyTestSupport.java  | 2 +-
 http/jetty12/pom.xml                                          | 4 +++-
 .../apache/felix/http/jetty/it/AbstractJettyTestSupport.java  | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/http/jetty/pom.xml b/http/jetty/pom.xml
index 42d6e8b53a..799e7e6217 100644
--- a/http/jetty/pom.xml
+++ b/http/jetty/pom.xml
@@ -358,7 +358,9 @@
                                 <jetty.version>${jetty.version}</jetty.version>
                                 <pax.vm.options>${pax.vm.options}</pax.vm.options>
                             </systemPropertyVariables>
-                            <argLine>"-Dbundle.filename=${basedir}/target/${project.build.finalName}.jar"</argLine>
+                            <environmentVariables>
+                                <bundle.filename>${basedir}/target/${project.build.finalName}.jar</bundle.filename>
+                            </environmentVariables>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/http/jetty/src/test/java/org/apache/felix/http/jetty/it/AbstractJettyTestSupport.java b/http/jetty/src/test/java/org/apache/felix/http/jetty/it/AbstractJettyTestSupport.java
index 58b2c39e3f..bf1c3709e4 100644
--- a/http/jetty/src/test/java/org/apache/felix/http/jetty/it/AbstractJettyTestSupport.java
+++ b/http/jetty/src/test/java/org/apache/felix/http/jetty/it/AbstractJettyTestSupport.java
@@ -154,7 +154,7 @@ public static OptionalCompositeOption localMavenRepo() {
      * @return the provisioning option
      */
     protected UrlProvisionOption testBundle(final String systemProperty) {
-        final String pathname = System.getProperty(systemProperty);
+        final String pathname = System.getenv(systemProperty);
         final File file = new File(pathname);
         return bundle(file.toURI().toString());
     }
diff --git a/http/jetty12/pom.xml b/http/jetty12/pom.xml
index 651946eb81..c0b2051c24 100644
--- a/http/jetty12/pom.xml
+++ b/http/jetty12/pom.xml
@@ -573,7 +573,9 @@
                                 <jetty.version>${jetty.version}</jetty.version>
                                 <pax.vm.options>${pax.vm.options}</pax.vm.options>
                             </systemPropertyVariables>
-                            <argLine>"-Dbundle.filename=${basedir}/target/${project.build.finalName}.jar"</argLine>
+                            <environmentVariables>
+                                <bundle.filename>${basedir}/target/${project.build.finalName}.jar</bundle.filename>
+                            </environmentVariables>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/AbstractJettyTestSupport.java b/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/AbstractJettyTestSupport.java
index 862ee429df..9c0b0de8ba 100644
--- a/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/AbstractJettyTestSupport.java
+++ b/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/AbstractJettyTestSupport.java
@@ -154,7 +154,7 @@ public static OptionalCompositeOption localMavenRepo() {
      * @return the provisioning option
      */
     protected UrlProvisionOption testBundle(final String systemProperty) {
-        final String pathname = System.getProperty(systemProperty);
+        final String pathname = System.getenv(systemProperty);
         final File file = new File(pathname);
         return bundle(file.toURI().toString());
     }

From e624f79654b3bc9147d1ccbf2144f2fa845e5e64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20R=C3=BCtter?= <paul@blueconic.com>
Date: Wed, 15 May 2024 16:31:54 +0200
Subject: [PATCH 30/59] Fix light test

---
 .../java/org/apache/felix/http/jetty/it/LightClassifierIT.java  | 2 +-
 .../java/org/apache/felix/http/jetty/it/LightClassifierIT.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/http/jetty/src/test/java/org/apache/felix/http/jetty/it/LightClassifierIT.java b/http/jetty/src/test/java/org/apache/felix/http/jetty/it/LightClassifierIT.java
index e93aee6962..03776aa677 100644
--- a/http/jetty/src/test/java/org/apache/felix/http/jetty/it/LightClassifierIT.java
+++ b/http/jetty/src/test/java/org/apache/felix/http/jetty/it/LightClassifierIT.java
@@ -85,7 +85,7 @@ protected Option[] additionalOptions() throws IOException {
      */
     @Override
     protected UrlProvisionOption testBundle(String systemProperty) {
-        String pathname = System.getProperty(systemProperty);
+        String pathname = System.getenv(systemProperty);
         pathname = pathname.replace(".jar", "-light.jar");
         final File file = new File(pathname);
         return bundle(file.toURI().toString());
diff --git a/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/LightClassifierIT.java b/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/LightClassifierIT.java
index 12bea36137..2ae434371b 100644
--- a/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/LightClassifierIT.java
+++ b/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/LightClassifierIT.java
@@ -86,7 +86,7 @@ protected Option[] additionalOptions() throws IOException {
      */
     @Override
     protected UrlProvisionOption testBundle(String systemProperty) {
-        String pathname = System.getProperty(systemProperty);
+        String pathname = System.getenv(systemProperty);
         pathname = pathname.replace(".jar", "-light.jar");
         final File file = new File(pathname);
         return bundle(file.toURI().toString());

From 46fb9d7a9fb2a0e0e84b55d40d4f09c2758ab275 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20R=C3=BCtter?= <paul@blueconic.com>
Date: Wed, 15 May 2024 16:38:29 +0200
Subject: [PATCH 31/59] Add framework to test

---
 .github/workflows/build.yml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 86f272900b..8ee4233cf5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,12 +21,13 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Setup Maven Action
-      uses: s4u/setup-maven-action@v1.7.0
+    - name: Set up JDK 17
+      uses: actions/setup-java@v3
       with:
-       checkout-fetch-depth: 0
-       java-version: 17
-       java-distribution: temurin
-       maven-version: 3.9.6
-    - name: Build with Maven
-      run: mvn -Dsurefire.failIfNoSpecifiedTests=false -Dtest=\!MissingWebsocketDependenciesIT* -f http -B clean install
+        java-version: '17'
+        distribution: 'temurin'
+        cache: maven
+    - name: Felix Main Framework
+      run: mvn --file framework -B clean install
+    - name: Felix HTTP
+      run: mvn --file http -B clean install
\ No newline at end of file

From 2c7e21af0c0bab8b6820ee7c085e79713003362b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20R=C3=BCtter?= <paul@blueconic.com>
Date: Wed, 15 May 2024 16:44:59 +0200
Subject: [PATCH 32/59] useSystemClassLoader

---
 .github/workflows/build.yml | 4 +---
 http/jetty/pom.xml          | 1 +
 http/jetty12/pom.xml        | 1 +
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8ee4233cf5..5eb513867f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -27,7 +27,5 @@ jobs:
         java-version: '17'
         distribution: 'temurin'
         cache: maven
-    - name: Felix Main Framework
-      run: mvn --file framework -B clean install
     - name: Felix HTTP
-      run: mvn --file http -B clean install
\ No newline at end of file
+      run: mvn --file http -B clean install 
\ No newline at end of file
diff --git a/http/jetty/pom.xml b/http/jetty/pom.xml
index 799e7e6217..837b986aa9 100644
--- a/http/jetty/pom.xml
+++ b/http/jetty/pom.xml
@@ -361,6 +361,7 @@
                             <environmentVariables>
                                 <bundle.filename>${basedir}/target/${project.build.finalName}.jar</bundle.filename>
                             </environmentVariables>
+                            <useSystemClassLoader>false</useSystemClassLoader>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/http/jetty12/pom.xml b/http/jetty12/pom.xml
index c0b2051c24..782e3cb75b 100644
--- a/http/jetty12/pom.xml
+++ b/http/jetty12/pom.xml
@@ -576,6 +576,7 @@
                             <environmentVariables>
                                 <bundle.filename>${basedir}/target/${project.build.finalName}.jar</bundle.filename>
                             </environmentVariables>
+                            <useSystemClassLoader>false</useSystemClassLoader>
                         </configuration>
                     </execution>
                 </executions>

From 605848b1be2a730b9064bff9fec2fd0ab6eab499 Mon Sep 17 00:00:00 2001
From: Paul <paul@blueconic.com>
Date: Wed, 15 May 2024 18:02:11 +0200
Subject: [PATCH 33/59] Update build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5eb513867f..cc7cb10101 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -28,4 +28,4 @@ jobs:
         distribution: 'temurin'
         cache: maven
     - name: Felix HTTP
-      run: mvn --file http -B clean install 
\ No newline at end of file
+      run: mvn --file http clean install 

From 5211fffc27450d2c34efb873fd6c38608ec61898 Mon Sep 17 00:00:00 2001
From: Paul <paul@blueconic.com>
Date: Wed, 15 May 2024 20:33:04 +0200
Subject: [PATCH 34/59] Update build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index cc7cb10101..56608b10eb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,7 +17,7 @@ on:
 jobs:
   build:
 
-    runs-on: ubuntu-latest
+    runs-on: windows-latest
 
     steps:
     - uses: actions/checkout@v4

From e54ac5f3866ef9bebb5a70fe68c05be7e88b3e1f Mon Sep 17 00:00:00 2001
From: Paul <paul@blueconic.com>
Date: Wed, 15 May 2024 20:34:26 +0200
Subject: [PATCH 35/59] Update build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 56608b10eb..5fd5b40538 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -28,4 +28,4 @@ jobs:
         distribution: 'temurin'
         cache: maven
     - name: Felix HTTP
-      run: mvn --file http clean install 
+      run: mvn -B --file http clean install 

From cc33d821bd3bb0d9703472cff8e9b310519632ea Mon Sep 17 00:00:00 2001
From: Paul <paul@blueconic.com>
Date: Wed, 15 May 2024 20:36:08 +0200
Subject: [PATCH 36/59] Update build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5fd5b40538..d1aafe6206 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,7 +17,7 @@ on:
 jobs:
   build:
 
-    runs-on: windows-latest
+    runs-on: macos-latest
 
     steps:
     - uses: actions/checkout@v4

From 0a93c6341ed35031b1c2998b9c7f503633bab33c Mon Sep 17 00:00:00 2001
From: Paul <paul@blueconic.com>
Date: Wed, 15 May 2024 20:39:14 +0200
Subject: [PATCH 37/59] Update build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d1aafe6206..744b7bd918 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -28,4 +28,4 @@ jobs:
         distribution: 'temurin'
         cache: maven
     - name: Felix HTTP
-      run: mvn -B --file http clean install 
+      run: mvn -Dsurefire.failIfNoSpecifiedTests=false -Dtest=\!MissingWebsocketDependenciesIT* -B --file http clean install 

From 9a85720ba331e8ea30569c139f3b981cd7e41587 Mon Sep 17 00:00:00 2001
From: Paul <paul@blueconic.com>
Date: Wed, 15 May 2024 20:39:47 +0200
Subject: [PATCH 38/59] Update build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 744b7bd918..b28f2a61f5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,7 +17,7 @@ on:
 jobs:
   build:
 
-    runs-on: macos-latest
+    runs-on: ubuntu-20.04
 
     steps:
     - uses: actions/checkout@v4

From fa76f867b49932f34f8e6cbf1dcd2a95680779f5 Mon Sep 17 00:00:00 2001
From: Paul <paul@blueconic.com>
Date: Wed, 15 May 2024 20:41:31 +0200
Subject: [PATCH 39/59] Update build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b28f2a61f5..744b7bd918 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,7 +17,7 @@ on:
 jobs:
   build:
 
-    runs-on: ubuntu-20.04
+    runs-on: macos-latest
 
     steps:
     - uses: actions/checkout@v4

From d9617875ed86cbdf085fa8625e77957ba1e68e16 Mon Sep 17 00:00:00 2001
From: Paul <paul@blueconic.com>
Date: Wed, 15 May 2024 20:44:24 +0200
Subject: [PATCH 40/59] Update build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 744b7bd918..57c16ba153 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -28,4 +28,4 @@ jobs:
         distribution: 'temurin'
         cache: maven
     - name: Felix HTTP
-      run: mvn -Dsurefire.failIfNoSpecifiedTests=false -Dtest=\!MissingWebsocketDependenciesIT* -B --file http clean install 
+      run: mvn -Dsurefire.failIfNoSpecifiedTests=false -Dtest=!MissingWebsocketDependenciesIT* -B --file http clean install 

From bcff47abf2087591acf717ba60c0a05f102d55ad Mon Sep 17 00:00:00 2001
From: Paul <paul@blueconic.com>
Date: Wed, 15 May 2024 20:46:10 +0200
Subject: [PATCH 41/59] Update build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 57c16ba153..955a1d3c31 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -28,4 +28,4 @@ jobs:
         distribution: 'temurin'
         cache: maven
     - name: Felix HTTP
-      run: mvn -Dsurefire.failIfNoSpecifiedTests=false -Dtest=!MissingWebsocketDependenciesIT* -B --file http clean install 
+      run: mvn -B --file http clean install verify

From dc9f076eb744b3f4b0a0d255333961cdc59d7c86 Mon Sep 17 00:00:00 2001
From: Paul <paul@blueconic.com>
Date: Wed, 15 May 2024 20:49:39 +0200
Subject: [PATCH 42/59] Update build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 955a1d3c31..d461f8938b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -28,4 +28,4 @@ jobs:
         distribution: 'temurin'
         cache: maven
     - name: Felix HTTP
-      run: mvn -B --file http clean install verify
+      run: mvn -Dtest=!MissingWebsocketDependenciesIT* -B --file http clean install verify

From 82ec8d2e1bbe043507182733ef1f557edd350535 Mon Sep 17 00:00:00 2001
From: Paul <paul@blueconic.com>
Date: Wed, 15 May 2024 20:51:41 +0200
Subject: [PATCH 43/59] Update build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d461f8938b..6792cf43f2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -28,4 +28,4 @@ jobs:
         distribution: 'temurin'
         cache: maven
     - name: Felix HTTP
-      run: mvn -Dtest=!MissingWebsocketDependenciesIT* -B --file http clean install verify
+      run: mvn Dsurefire.failIfNoSpecifiedTests=false -Dtest=!MissingWebsocketDependenciesIT* -B --file http clean install verify

From b6ae1a326ac164812d8eb8ea7dae4bdf15f6809b Mon Sep 17 00:00:00 2001
From: Paul <paul@blueconic.com>
Date: Wed, 15 May 2024 20:52:34 +0200
Subject: [PATCH 44/59] Update build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6792cf43f2..a9178f65de 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -28,4 +28,4 @@ jobs:
         distribution: 'temurin'
         cache: maven
     - name: Felix HTTP
-      run: mvn Dsurefire.failIfNoSpecifiedTests=false -Dtest=!MissingWebsocketDependenciesIT* -B --file http clean install verify
+      run: mvn -Dsurefire.failIfNoSpecifiedTests=false -Dtest=!MissingWebsocketDependenciesIT* -B --file http clean install verify

From c196114ee47f3e1ff7de8b66d3ccd3ae4b867916 Mon Sep 17 00:00:00 2001
From: Paul <paul@blueconic.com>
Date: Wed, 15 May 2024 20:54:28 +0200
Subject: [PATCH 45/59] Update build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a9178f65de..aecb212e3d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,7 +17,7 @@ on:
 jobs:
   build:
 
-    runs-on: macos-latest
+    runs-on: windows-latest
 
     steps:
     - uses: actions/checkout@v4

From abf6a363c4cc8b03fee313bf886d6fa59f3549ed Mon Sep 17 00:00:00 2001
From: Paul <paul@blueconic.com>
Date: Wed, 15 May 2024 20:57:13 +0200
Subject: [PATCH 46/59] Update build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index aecb212e3d..de3dd63a5d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -28,4 +28,4 @@ jobs:
         distribution: 'temurin'
         cache: maven
     - name: Felix HTTP
-      run: mvn -Dsurefire.failIfNoSpecifiedTests=false -Dtest=!MissingWebsocketDependenciesIT* -B --file http clean install verify
+      run: mvn "-Dsurefire.failIfNoSpecifiedTests=false" "-Dtest=!MissingWebsocketDependenciesIT*" -B --file http clean install verify

From e450eab6e8791eb27ab6defab99553fcce86bd21 Mon Sep 17 00:00:00 2001
From: Paul <paul@blueconic.com>
Date: Wed, 15 May 2024 21:00:29 +0200
Subject: [PATCH 47/59] Update build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index de3dd63a5d..3ae896b2a1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -28,4 +28,4 @@ jobs:
         distribution: 'temurin'
         cache: maven
     - name: Felix HTTP
-      run: mvn "-Dsurefire.failIfNoSpecifiedTests=false" "-Dtest=!MissingWebsocketDependenciesIT*" -B --file http clean install verify
+      run: mvn "-Dsurefire.failIfNoSpecifiedTests=false" "-Dtest=!MissingWebsocketDependenciesIT*" -B --file http clean install 

From 5bd087c91fde895898bfa79b759e38c80a072aa3 Mon Sep 17 00:00:00 2001
From: Paul <paul@blueconic.com>
Date: Wed, 15 May 2024 21:05:29 +0200
Subject: [PATCH 48/59] Update build.yml

---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3ae896b2a1..1e8b002d0c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,7 +17,7 @@ on:
 jobs:
   build:
 
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v4
@@ -28,4 +28,4 @@ jobs:
         distribution: 'temurin'
         cache: maven
     - name: Felix HTTP
-      run: mvn "-Dsurefire.failIfNoSpecifiedTests=false" "-Dtest=!MissingWebsocketDependenciesIT*" -B --file http clean install 
+      run: mvn --debug -B --file http clean install 

From 92206e4cae70cf0c51e08a5f105db5a986b85c3e Mon Sep 17 00:00:00 2001
From: Paul <paul@blueconic.com>
Date: Wed, 15 May 2024 21:10:42 +0200
Subject: [PATCH 49/59] Update build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1e8b002d0c..93dfaf543e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -28,4 +28,4 @@ jobs:
         distribution: 'temurin'
         cache: maven
     - name: Felix HTTP
-      run: mvn --debug -B --file http clean install 
+      run: mvn -B --file http clean install 

From 8038ad93b20b097362914fe23931e468a33f9286 Mon Sep 17 00:00:00 2001
From: Paul <paul@blueconic.com>
Date: Wed, 15 May 2024 21:12:58 +0200
Subject: [PATCH 50/59] Update build.yml

---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 93dfaf543e..47f8c204fc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,10 +21,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v3
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'temurin'
         cache: maven
     - name: Felix HTTP

From ce1dbdb0dc96dda64a7030720054a52a7ab54f9c Mon Sep 17 00:00:00 2001
From: Paul <paul@blueconic.com>
Date: Wed, 15 May 2024 21:18:27 +0200
Subject: [PATCH 51/59] Update pom.xml

---
 http/jetty/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/http/jetty/pom.xml b/http/jetty/pom.xml
index 837b986aa9..d6178ef0e1 100644
--- a/http/jetty/pom.xml
+++ b/http/jetty/pom.xml
@@ -44,7 +44,7 @@
         <felix.java.version>11</felix.java.version>
         <jetty.version>11.0.20</jetty.version>
         <baseline.skip>true</baseline.skip>
-        <org.ops4j.pax.exam.version>4.13.3</org.ops4j.pax.exam.version>
+        <org.ops4j.pax.exam.version>4.13.5</org.ops4j.pax.exam.version>
         <!-- To debug the pax process, override this with -D -->
         <pax.vm.options>-Xmx512M</pax.vm.options>
     </properties>

From 5a607420e04e5d44fdc4537ef3fbbe8652ccc8b4 Mon Sep 17 00:00:00 2001
From: Paul <paul@blueconic.com>
Date: Wed, 15 May 2024 21:21:05 +0200
Subject: [PATCH 52/59] Update pom.xml

---
 http/jetty/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/http/jetty/pom.xml b/http/jetty/pom.xml
index d6178ef0e1..82e51fc750 100644
--- a/http/jetty/pom.xml
+++ b/http/jetty/pom.xml
@@ -46,7 +46,7 @@
         <baseline.skip>true</baseline.skip>
         <org.ops4j.pax.exam.version>4.13.5</org.ops4j.pax.exam.version>
         <!-- To debug the pax process, override this with -D -->
-        <pax.vm.options>-Xmx512M</pax.vm.options>
+        <pax.vm.options>-D</pax.vm.options>
     </properties>
 
     <build>

From 90aa249ef447e78f785ae20dd68c43415297b8a0 Mon Sep 17 00:00:00 2001
From: Paul <paul@blueconic.com>
Date: Wed, 15 May 2024 21:48:16 +0200
Subject: [PATCH 53/59] Update build.yml

---
 .github/workflows/build.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 47f8c204fc..248a5be8e0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,11 +21,11 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK 21
+    - name: Set up JDK 17
       uses: actions/setup-java@v3
       with:
-        java-version: '21'
+        java-version: '17'
         distribution: 'temurin'
         cache: maven
     - name: Felix HTTP
-      run: mvn -B --file http clean install 
+      run: mvn -B -DskipIT=true --file http clean install 

From 28343eba9426e98b173a8f638db4c4d8c6392bbd Mon Sep 17 00:00:00 2001
From: Paul <paul@blueconic.com>
Date: Wed, 15 May 2024 21:50:18 +0200
Subject: [PATCH 54/59] Update build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 248a5be8e0..6c08d9fd4f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -28,4 +28,4 @@ jobs:
         distribution: 'temurin'
         cache: maven
     - name: Felix HTTP
-      run: mvn -B -DskipIT=true --file http clean install 
+      run: mvn -B -DskipITs --file http clean install 

From f55faa14aba47a4a58744e948406fe8cc59e71c1 Mon Sep 17 00:00:00 2001
From: Paul <paul@blueconic.com>
Date: Wed, 15 May 2024 21:58:57 +0200
Subject: [PATCH 55/59] Update build.yml

---
 .github/workflows/build.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6c08d9fd4f..229914b01f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -29,3 +29,6 @@ jobs:
         cache: maven
     - name: Felix HTTP
       run: mvn -B -DskipITs --file http clean install 
+    - name: Felix Framework
+      run: mvn -B -DskipITs --file framework clean install 
+      

From c8ae47e4e0feaa243f8c50945da57f95ff4a0bf0 Mon Sep 17 00:00:00 2001
From: Paul <paul@blueconic.com>
Date: Wed, 15 May 2024 22:02:54 +0200
Subject: [PATCH 56/59] Update pom.xml

---
 framework/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/pom.xml b/framework/pom.xml
index 7e541f323a..78c42edf39 100644
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -126,7 +126,7 @@
                 osgi.service;objectClass:List&lt;String&gt;="org.osgi.service.startlevel.StartLevel"
             </Provide-Capability>
               <Add-opens>
-                  java.base/java.net java.base/sun.net.www.protocol.file java.base/sun.net.www.protocol.ftp java.base/sun.net.www.protocol.http java.base/sun.net.www.protocol.https java.base/sun.net.www.protocol.jar java.base/sun.net.www.protocol.jmod java.base/sun.net.www.protocol.mailto java.base/sun.net.www.protocol.jrt java.base/jdk.internal.loader java.base/java.security
+                  java.base/java.net java.base/java.lang java.base/sun.net.www.protocol.file java.base/sun.net.www.protocol.ftp java.base/sun.net.www.protocol.http java.base/sun.net.www.protocol.https java.base/sun.net.www.protocol.jar java.base/sun.net.www.protocol.jmod java.base/sun.net.www.protocol.mailto java.base/sun.net.www.protocol.jrt java.base/jdk.internal.loader java.base/java.security
               </Add-opens>
           </instructions>
         </configuration>

From 3a3947147240d7ee0f0ed2e9e82c93af87f350bc Mon Sep 17 00:00:00 2001
From: Paul <paul@blueconic.com>
Date: Wed, 15 May 2024 22:05:12 +0200
Subject: [PATCH 57/59] Update build.yml

---
 .github/workflows/build.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 229914b01f..56519c2220 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -29,6 +29,4 @@ jobs:
         cache: maven
     - name: Felix HTTP
       run: mvn -B -DskipITs --file http clean install 
-    - name: Felix Framework
-      run: mvn -B -DskipITs --file framework clean install 
       

From e4035f1a6e7a9322cfee66ccaa2d4eff70d004b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20R=C3=BCtter?= <paul@blueconic.com>
Date: Thu, 16 May 2024 08:11:01 +0200
Subject: [PATCH 58/59] Revert unnecessary changes

---
 framework/pom.xml                             |  2 +-
 http/itest/pom.xml                            |  2 +-
 http/jetty/pom.xml                            | 31 +++++++++++--------
 .../jetty/it/AbstractJettyTestSupport.java    |  2 +-
 .../http/jetty/it/LightClassifierIT.java      |  2 +-
 http/jetty12/pom.xml                          | 27 +++++++++-------
 .../jetty/it/AbstractJettyTestSupport.java    |  2 +-
 .../http/jetty/it/LightClassifierIT.java      |  2 +-
 8 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/framework/pom.xml b/framework/pom.xml
index 78c42edf39..7e541f323a 100644
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -126,7 +126,7 @@
                 osgi.service;objectClass:List&lt;String&gt;="org.osgi.service.startlevel.StartLevel"
             </Provide-Capability>
               <Add-opens>
-                  java.base/java.net java.base/java.lang java.base/sun.net.www.protocol.file java.base/sun.net.www.protocol.ftp java.base/sun.net.www.protocol.http java.base/sun.net.www.protocol.https java.base/sun.net.www.protocol.jar java.base/sun.net.www.protocol.jmod java.base/sun.net.www.protocol.mailto java.base/sun.net.www.protocol.jrt java.base/jdk.internal.loader java.base/java.security
+                  java.base/java.net java.base/sun.net.www.protocol.file java.base/sun.net.www.protocol.ftp java.base/sun.net.www.protocol.http java.base/sun.net.www.protocol.https java.base/sun.net.www.protocol.jar java.base/sun.net.www.protocol.jmod java.base/sun.net.www.protocol.mailto java.base/sun.net.www.protocol.jrt java.base/jdk.internal.loader java.base/java.security
               </Add-opens>
           </instructions>
         </configuration>
diff --git a/http/itest/pom.xml b/http/itest/pom.xml
index e95b183a19..de0026cb2b 100644
--- a/http/itest/pom.xml
+++ b/http/itest/pom.xml
@@ -45,7 +45,7 @@
             <properties>
                 <felix.java.version>17</felix.java.version>
                 <http.servlet.api.version>3.0.0</http.servlet.api.version>
-                <http.jetty.version>1.0.5-SNAPSHOT</http.jetty.version>
+                <http.jetty.version>1.0.7-SNAPSHOT</http.jetty.version>
                 <http.jetty.id>org.apache.felix.http.jetty12</http.jetty.id>
             </properties>
         </profile>
diff --git a/http/jetty/pom.xml b/http/jetty/pom.xml
index 82e51fc750..9965f27e3a 100644
--- a/http/jetty/pom.xml
+++ b/http/jetty/pom.xml
@@ -44,9 +44,9 @@
         <felix.java.version>11</felix.java.version>
         <jetty.version>11.0.20</jetty.version>
         <baseline.skip>true</baseline.skip>
-        <org.ops4j.pax.exam.version>4.13.5</org.ops4j.pax.exam.version>
+        <org.ops4j.pax.exam.version>4.13.3</org.ops4j.pax.exam.version>
         <!-- To debug the pax process, override this with -D -->
-        <pax.vm.options>-D</pax.vm.options>
+        <pax.vm.options>-Xmx512M</pax.vm.options>
     </properties>
 
     <build>
@@ -348,23 +348,28 @@
                 <artifactId>maven-failsafe-plugin</artifactId>
                 <executions>
                     <execution>
+                        <id>integration-test</id>
+                        <phase>integration-test</phase>
                         <goals>
                             <goal>integration-test</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>verify</id>
+                        <phase>integration-test</phase>
+                        <goals>
                             <goal>verify</goal>
                         </goals>
-                        <configuration>
-                            <redirectTestOutputToFile>true</redirectTestOutputToFile>
-                            <systemPropertyVariables>
-                                <jetty.version>${jetty.version}</jetty.version>
-                                <pax.vm.options>${pax.vm.options}</pax.vm.options>
-                            </systemPropertyVariables>
-                            <environmentVariables>
-                                <bundle.filename>${basedir}/target/${project.build.finalName}.jar</bundle.filename>
-                            </environmentVariables>
-                            <useSystemClassLoader>false</useSystemClassLoader>
-                        </configuration>
                     </execution>
                 </executions>
+                <configuration>
+                    <redirectTestOutputToFile>true</redirectTestOutputToFile>
+                    <systemPropertyVariables>
+                        <jetty.version>${jetty.version}</jetty.version>
+                        <bundle.filename>${basedir}/target/${project.build.finalName}.jar</bundle.filename>
+                        <pax.vm.options>${pax.vm.options}</pax.vm.options>
+                    </systemPropertyVariables>
+                </configuration>
             </plugin>
         </plugins>
     </build>
diff --git a/http/jetty/src/test/java/org/apache/felix/http/jetty/it/AbstractJettyTestSupport.java b/http/jetty/src/test/java/org/apache/felix/http/jetty/it/AbstractJettyTestSupport.java
index bf1c3709e4..58b2c39e3f 100644
--- a/http/jetty/src/test/java/org/apache/felix/http/jetty/it/AbstractJettyTestSupport.java
+++ b/http/jetty/src/test/java/org/apache/felix/http/jetty/it/AbstractJettyTestSupport.java
@@ -154,7 +154,7 @@ public static OptionalCompositeOption localMavenRepo() {
      * @return the provisioning option
      */
     protected UrlProvisionOption testBundle(final String systemProperty) {
-        final String pathname = System.getenv(systemProperty);
+        final String pathname = System.getProperty(systemProperty);
         final File file = new File(pathname);
         return bundle(file.toURI().toString());
     }
diff --git a/http/jetty/src/test/java/org/apache/felix/http/jetty/it/LightClassifierIT.java b/http/jetty/src/test/java/org/apache/felix/http/jetty/it/LightClassifierIT.java
index 03776aa677..e93aee6962 100644
--- a/http/jetty/src/test/java/org/apache/felix/http/jetty/it/LightClassifierIT.java
+++ b/http/jetty/src/test/java/org/apache/felix/http/jetty/it/LightClassifierIT.java
@@ -85,7 +85,7 @@ protected Option[] additionalOptions() throws IOException {
      */
     @Override
     protected UrlProvisionOption testBundle(String systemProperty) {
-        String pathname = System.getenv(systemProperty);
+        String pathname = System.getProperty(systemProperty);
         pathname = pathname.replace(".jar", "-light.jar");
         final File file = new File(pathname);
         return bundle(file.toURI().toString());
diff --git a/http/jetty12/pom.xml b/http/jetty12/pom.xml
index 782e3cb75b..9d94a7e152 100644
--- a/http/jetty12/pom.xml
+++ b/http/jetty12/pom.xml
@@ -563,23 +563,28 @@
                 <artifactId>maven-failsafe-plugin</artifactId>
                 <executions>
                     <execution>
+                        <id>integration-test</id>
+                        <phase>integration-test</phase>
                         <goals>
                             <goal>integration-test</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>verify</id>
+                        <phase>integration-test</phase>
+                        <goals>
                             <goal>verify</goal>
                         </goals>
-                        <configuration>
-                            <redirectTestOutputToFile>true</redirectTestOutputToFile>
-                            <systemPropertyVariables>
-                                <jetty.version>${jetty.version}</jetty.version>
-                                <pax.vm.options>${pax.vm.options}</pax.vm.options>
-                            </systemPropertyVariables>
-                            <environmentVariables>
-                                <bundle.filename>${basedir}/target/${project.build.finalName}.jar</bundle.filename>
-                            </environmentVariables>
-                            <useSystemClassLoader>false</useSystemClassLoader>
-                        </configuration>
                     </execution>
                 </executions>
+                <configuration>
+                    <redirectTestOutputToFile>true</redirectTestOutputToFile>
+                    <systemPropertyVariables>
+                        <jetty.version>${jetty.version}</jetty.version>
+                        <bundle.filename>${basedir}/target/${project.build.finalName}.jar</bundle.filename>
+                        <pax.vm.options>${pax.vm.options}</pax.vm.options>
+                    </systemPropertyVariables>
+                </configuration>
             </plugin>
         </plugins>
     </build>
diff --git a/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/AbstractJettyTestSupport.java b/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/AbstractJettyTestSupport.java
index 9c0b0de8ba..862ee429df 100644
--- a/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/AbstractJettyTestSupport.java
+++ b/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/AbstractJettyTestSupport.java
@@ -154,7 +154,7 @@ public static OptionalCompositeOption localMavenRepo() {
      * @return the provisioning option
      */
     protected UrlProvisionOption testBundle(final String systemProperty) {
-        final String pathname = System.getenv(systemProperty);
+        final String pathname = System.getProperty(systemProperty);
         final File file = new File(pathname);
         return bundle(file.toURI().toString());
     }
diff --git a/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/LightClassifierIT.java b/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/LightClassifierIT.java
index 2ae434371b..12bea36137 100644
--- a/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/LightClassifierIT.java
+++ b/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/LightClassifierIT.java
@@ -86,7 +86,7 @@ protected Option[] additionalOptions() throws IOException {
      */
     @Override
     protected UrlProvisionOption testBundle(String systemProperty) {
-        String pathname = System.getenv(systemProperty);
+        String pathname = System.getProperty(systemProperty);
         pathname = pathname.replace(".jar", "-light.jar");
         final File file = new File(pathname);
         return bundle(file.toURI().toString());

From 37cbfca0e8eda44b29c10356f8a8290466b6e0fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20R=C3=BCtter?= <paul@blueconic.com>
Date: Thu, 16 May 2024 09:05:01 +0200
Subject: [PATCH 59/59] Revert unnecessary changes

---
 http/samples/whiteboard/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/http/samples/whiteboard/pom.xml b/http/samples/whiteboard/pom.xml
index f82047bc35..d17d2c432d 100644
--- a/http/samples/whiteboard/pom.xml
+++ b/http/samples/whiteboard/pom.xml
@@ -96,7 +96,7 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.http.jetty12</artifactId>
-            <version>1.0.7-SNAPSHOT</version>
+            <version>1.0.5-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>