fix(jakarta): upgrade GraphQL dependencies for Jakarta Servlet 6.x support

Upgrade graphql-java-kickstart/graphql-java-servlet from 14.0.0 to
16.0.0 which supports Jakarta Servlet 6.x. Also upgrade graphql-java
from 19.11 to 22.3 (required by kickstart 16.0.0).

- Update graphql-java version across all example modules
- Switch from javax.servlet to jakarta.servlet in servlet example
- Update feature XML with proper OSGi bundle for graphql-java 22.3
  (no longer needs wrap:) and add jakarta.websocket API dependencies
- Re-enable GraphQLExampleTest (testServlet and testCommand pass)
- Keep testWebSocket @ignore due to Pax Web 11.1.0 whiteboard
  websocket upgrade limitation

Author: jbonofre

examples/karaf-graphql-example/karaf-graphql-example-api/pom.xml

@@ -36,7 +36,7 @@
         <dependency>
             <groupId>com.graphql-java</groupId>
             <artifactId>graphql-java</artifactId>
-            <version>19.11</version>
+            <version>22.3</version>
         </dependency>
     </dependencies>
 

examples/karaf-graphql-example/karaf-graphql-example-commands/pom.xml

@@ -41,7 +41,7 @@
         <dependency>
             <groupId>com.graphql-java</groupId>
             <artifactId>graphql-java</artifactId>
-            <version>19.11</version>
+            <version>22.3</version>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>

examples/karaf-graphql-example/karaf-graphql-example-core/pom.xml

@@ -47,7 +47,7 @@
         <dependency>
             <groupId>com.graphql-java</groupId>
             <artifactId>graphql-java</artifactId>
-            <version>19.11</version>
+            <version>22.3</version>
         </dependency>
         <dependency>
             <groupId>io.reactivex.rxjava3</groupId>

examples/karaf-graphql-example/karaf-graphql-example-features/src/main/feature/feature.xml

@@ -28,16 +28,18 @@
 
         <bundle dependency="true">wrap:mvn:com.graphql-java/java-dataloader/3.3.0</bundle>
         <bundle dependency="true">mvn:org.reactivestreams/reactive-streams/1.0.4</bundle>
-        <bundle dependency="true">wrap:mvn:com.graphql-java/graphql-java/19.11$overwrite=merge&amp;Import-Package=android.os;resolution:=optional,org.slf4j.*,org.dataloader.*,org.reactivestreams.*</bundle>
+        <bundle dependency="true">mvn:com.graphql-java/graphql-java/22.3</bundle>
 
         <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version}</bundle>
         <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.annotations.version}</bundle>
         <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version}</bundle>
         <bundle dependency="true">mvn:com.fasterxml.jackson.datatype/jackson-datatype-jdk8/${jackson.version}</bundle>
         <bundle dependency="true">mvn:jakarta.servlet/jakarta.servlet-api/6.1.0</bundle>
+        <bundle dependency="true">mvn:jakarta.websocket/jakarta.websocket-api/2.2.0</bundle>
+        <bundle dependency="true">mvn:jakarta.websocket/jakarta.websocket-client-api/2.2.0</bundle>
 
-        <bundle dependency="true">mvn:com.graphql-java-kickstart/graphql-java-kickstart/14.0.0</bundle>
-        <bundle dependency="true">mvn:com.graphql-java-kickstart/graphql-java-servlet/14.0.0</bundle>
+        <bundle dependency="true">mvn:com.graphql-java-kickstart/graphql-java-kickstart/16.0.0</bundle>
+        <bundle dependency="true">mvn:com.graphql-java-kickstart/graphql-java-servlet/16.0.0</bundle>
 
         <bundle dependency="true">mvn:io.reactivex.rxjava3/rxjava/3.1.5</bundle>
 

examples/karaf-graphql-example/karaf-graphql-example-scr-servlet/pom.xml

@@ -42,17 +42,17 @@
         <dependency>
             <groupId>com.graphql-java</groupId>
             <artifactId>graphql-java</artifactId>
-            <version>19.11</version>
+            <version>22.3</version>
         </dependency>
         <dependency>
             <groupId>com.graphql-java-kickstart</groupId>
             <artifactId>graphql-java-servlet</artifactId>
-            <version>14.0.0</version>
+            <version>16.0.0</version>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>4.0.1</version>
+            <groupId>${servlet.spec.groupId}</groupId>
+            <artifactId>${servlet.spec.artifactId}</artifactId>
+            <version>${servlet.spec.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

examples/karaf-graphql-example/karaf-graphql-example-scr-servlet/src/main/java/org/apache/karaf/examples/graphql/servlet/ExampleGraphQLHttpServlet.java

@@ -22,7 +22,7 @@
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 
-import javax.servlet.Servlet;
+import jakarta.servlet.Servlet;
 
 @Component(service = Servlet.class, property = {"alias=/graphql", "servlet-name=GraphQL"})
 public class ExampleGraphQLHttpServlet extends GraphQLHttpServlet {

itests/test/src/test/java/org/apache/karaf/itests/examples/GraphQLExampleTest.java

@@ -17,7 +17,6 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.apache.karaf.itests.BaseTest;
 import org.apache.karaf.itests.util.SimpleSocket;
-import org.eclipse.jetty.websocket.client.ClientUpgradeRequest;
 import org.eclipse.jetty.websocket.client.WebSocketClient;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -40,7 +39,6 @@
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerMethod.class)
-@Ignore("graphql-java-servlet 14.0.0 requires javax.servlet, incompatible with Jakarta Servlet 6.x")
 public class GraphQLExampleTest extends BaseTest {
 
     private void setUp() throws Exception {
@@ -78,6 +76,7 @@ public void testCommand() throws Exception {
         System.out.println(output);
     }
 
+    @Ignore("WebSocket upgrade via Pax Web 11.1.0 OSGi HTTP Whiteboard returns 404")
     @Test
     public void testWebSocket() throws Exception {
         setUp();
@@ -86,12 +85,11 @@ public void testWebSocket() throws Exception {
         SimpleSocket socket = new SimpleSocket();
         client.start();
         URI uri = new URI("ws://localhost:" + getHttpPort() + "/graphql-websocket");
-        ClientUpgradeRequest request = new ClientUpgradeRequest();
-        client.connect(socket, uri, request);
+        client.connect(socket, uri).get(10, TimeUnit.SECONDS);
 
         sendPostRequest("mutation { addBook(name:\"Lord of the Rings\" pageCount:100) { id name } }");
 
-        socket.awaitClose(10, TimeUnit.SECONDS);
+        Thread.sleep(3000);
 
         assertTrue(socket.messages.size() > 0);