Merge branch 'master' into feature/FELIX-6720-Enable-virtual-thread-support-in-Jetty12

# Conflicts:
#	http/README.md

Author: paulrutter

.github/workflows/maven.yml

@@ -3,8 +3,12 @@ name: Github CI Build
 on:
   push:
     branches: [ "master" ]
+    paths:
+      - 'scr/**'
   pull_request:
     branches: [ "master" ]
+    paths:
+      - 'scr/**'
 
 permissions: {}
 

configurator/src/main/java/org/apache/felix/configurator/impl/ServicesListener.java

@@ -171,7 +171,7 @@ public void start() {
                         + Constants.OBJECTCLASS + "=" + serviceName + ")");
             } catch (final InvalidSyntaxException ise) {
                 // this should really never happen
-                throw new RuntimeException("Unexpected exception occured.", ise);
+                throw new RuntimeException("Unexpected exception occurred.", ise);
             }
             this.retainService();
         }

dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectRaceTest.java

@@ -92,7 +92,7 @@ public void testConcurrentAspects() {
                 }
 
                 if (super.errorsLogged()) {
-                    throw new IllegalStateException("Race test interrupted (some error occured, see previous logs)");
+                    throw new IllegalStateException("Race test interrupted (some error occurred, see previous logs)");
                 }
             }
         }

dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ServiceRaceTest.java

@@ -227,7 +227,7 @@ public void run() {
         m_threadPool.awaitQuiescence(5000, TimeUnit.MILLISECONDS);
 
         if (super.errorsLogged()) {
-            throw new IllegalStateException("Race test interrupted (some error occured, see previous logs)");
+            throw new IllegalStateException("Race test interrupted (some error occurred, see previous logs)");
         }
 
         debug("finished one test loop");

dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ServiceRaceWithOrderedUnbindTest.java

@@ -206,7 +206,7 @@ void doTest(int loop) throws Throwable {
         }
 
         if (super.errorsLogged()) {
-            throw new IllegalStateException("Race test interrupted (some error occured, see previous logs)");
+            throw new IllegalStateException("Race test interrupted (some error occurred, see previous logs)");
         }
 
         debug("finished one test loop");

fileinstall/pom.xml

@@ -62,7 +62,7 @@
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.utils</artifactId>
-      <version>1.11.2</version>
+      <version>1.11.8</version>
     </dependency>
     <dependency>
       <groupId>org.easymock</groupId>

gogo/jline/src/test/java/org/apache/felix/gogo/jline/telnet/ConnectionListener.java

@@ -64,39 +64,39 @@
 public interface ConnectionListener {
 
     /**
-     * Called when a CONNECTION_IDLE event occured.
+     * Called when a CONNECTION_IDLE event occurred.
      *
      * @param ce ConnectionEvent instance.
      * @see ConnectionEvent.Type#CONNECTION_IDLE
      */
     void connectionIdle(ConnectionEvent ce);
 
     /**
-     * Called when a CONNECTION_TIMEDOUT event occured.
+     * Called when a CONNECTION_TIMEDOUT event occurred.
      *
      * @param ce ConnectionEvent instance.
      * @see ConnectionEvent.Type#CONNECTION_TIMEDOUT
      */
     void connectionTimedOut(ConnectionEvent ce);
 
     /**
-     * Called when a CONNECTION_LOGOUTREQUEST occured.
+     * Called when a CONNECTION_LOGOUTREQUEST occurred.
      *
      * @param ce ConnectionEvent instance.
      * @see ConnectionEvent.Type#CONNECTION_LOGOUTREQUEST
      */
     void connectionLogoutRequest(ConnectionEvent ce);
 
     /**
-     * Called when a CONNECTION_BREAK event occured.
+     * Called when a CONNECTION_BREAK event occurred.
      *
      * @param ce ConnectionEvent instance.
      * @see ConnectionEvent.Type#CONNECTION_BREAK
      */
     void connectionSentBreak(ConnectionEvent ce);
 
     /**
-     * Called when a CONNECTION_TERMINAL_GEOMETRY_CHANGED event occured.
+     * Called when a CONNECTION_TERMINAL_GEOMETRY_CHANGED event occurred.
      *
      * @param ce ConnectionEvent instance.
      * @see ConnectionEvent.Type#CONNECTION_TERMINAL_GEOMETRY_CHANGED

healthcheck/generalchecks/pom.xml

@@ -224,7 +224,7 @@
         <dependency>
           <groupId>org.codehaus.groovy</groupId>
           <artifactId>groovy-all</artifactId>
-          <version>2.4.13</version>
+          <version>2.4.21</version>
           <scope>test</scope>
         </dependency>
         <dependency>

http/README.md

@@ -440,7 +440,7 @@ properties can be used (some legacy property names still exist but are not docum
 | `org.apache.felix.jetty.alpn.defaultProtocol`            | The default protocol when negotiation fails. Default is http/1.1.                                                                                                                                                                                                                                                                                                                                                                                                    |
 | `org.apache.felix.jakarta.websocket.enable`              | Enables Jakarta websocket support. Default is false.                                                                                                                                                                                                                                                                                                                                                                                                                 |
 | `org.apache.felix.jetty.websocket.enable`                | Enables Jetty websocket support. Default is false.                                                                                                                                                                                                                                                                                                                                                                                                                   |
-| `org.apache.felix.http.jetty.virtualthreads.enable`      | Enables using virtual threads in Jetty 12 (JDK 21 required). Default is false.                                                                                                                                                                                                                                                                                                                                                                                        |
+| `org.apache.felix.http.jetty.virtualthreads.enable`      | Enables using virtual threads in Jetty 12 (JDK 21 required). Default is false.                                                                                                                                                                                                                                                                                                                                                                                       |
 ### Multiple Servers
 
 It is possible to configure several Http Services, each running on a different port. The first service can be configured as outlined above using the service PID for `"org.apache.felix.http"`. Additional servers can be configured through OSGi factory configurations using `"org.apache.felix.http"` as the factory PID. The properties for the configuration are outlined as above.

http/base/src/main/java/org/apache/felix/http/base/internal/handler/HttpServiceServletHandler.java

@@ -38,7 +38,7 @@ public HttpServiceServletHandler(final ExtServletContext context,
             final ServletInfo servletInfo,
             final javax.servlet.Servlet servlet)
     {
-        this(HttpServiceFactory.HTTP_SERVICE_CONTEXT_SERVICE_ID, context, servletInfo, ServletWrapper.getRegisteredServlet(servlet));
+        this(HttpServiceFactory.HTTP_SERVICE_CONTEXT_SERVICE_ID, context, servletInfo, new ServletWrapper(servlet));
     }
 
     /**