(sling-org-apache-sling-servlets-resolver) branch master updated: SLING-12643 : Support Jakarta ServletAPI in Scripting (Initial support)

[cziegeler]

This is an automated email from the ASF dual-hosted git repository.

cziegeler pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-resolver.git


The following commit(s) were added to refs/heads/master by this push:
     new ea47944  SLING-12643 : Support Jakarta ServletAPI in Scripting 
(Initial support)
ea47944 is described below

commit ea47944d1f9ee364ebb9b56e5e59981ef7667ad1
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Thu Apr 24 07:26:17 2025 +0200

    SLING-12643 : Support Jakarta ServletAPI in Scripting (Initial support)
---
 pom.xml                                                           | 2 +-
 .../apache/sling/servlets/resolver/internal/ScriptResource.java   | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 32f2758..e945aeb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -200,7 +200,7 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.testing.paxexam</artifactId>
-            <version>4.1.1-SNAPSHOT</version>
+            <version>4.1.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git 
a/src/main/java/org/apache/sling/servlets/resolver/internal/ScriptResource.java 
b/src/main/java/org/apache/sling/servlets/resolver/internal/ScriptResource.java
index 9975dba..604f70f 100644
--- 
a/src/main/java/org/apache/sling/servlets/resolver/internal/ScriptResource.java
+++ 
b/src/main/java/org/apache/sling/servlets/resolver/internal/ScriptResource.java
@@ -115,6 +115,10 @@ public class ScriptResource extends AbstractResource {
                 if (s != null) {
                     return (T) s;
                 }
+                final Servlet sj = (Servlet) super.adaptTo(Servlet.class);
+                if (sj != null) {
+                    return (T) ServletWrapperUtil.toJavaxServlet(sj);
+                }
             }
         } else if (type == Servlet.class) {
             Resource activeResource = this.getActiveResource();
@@ -126,6 +130,10 @@ public class ScriptResource extends AbstractResource {
                 if (s != null) {
                     return (T) s;
                 }
+                final javax.servlet.Servlet sx = (javax.servlet.Servlet) 
super.adaptTo(javax.servlet.Servlet.class);
+                if (sx != null) {
+                    return (T) ServletWrapperUtil.toJakartaServlet(sx);
+                }
             }
         } else if (type == SlingJakartaScript.class) {
             final SlingJakartaScript s = (SlingJakartaScript) 
super.adaptTo(type);