From 8b1c834442ce7d1c5a2391de425efd3dff37569d Mon Sep 17 00:00:00 2001
From: Jan Martiska <jmartisk@redhat.com>
Date: Tue, 6 Aug 2024 08:42:35 +0200
Subject: [PATCH] Upgrade to WF 33 and SR-GQL 2.9.1

---
 .github/workflows/build.yml                          |  6 +++---
 pom.xml                                              | 12 ++++++------
 .../MicroProfileGraphQLSubsystemDefinition.java      |  1 -
 .../test/resources/overrides/basicScalarTests.csv    |  3 +++
 .../src/test/resources/overrides/schemaTests.csv     |  2 +-
 5 files changed, 13 insertions(+), 11 deletions(-)
 create mode 100644 testsuite/server-tck/src/test/resources/overrides/basicScalarTests.csv

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3511d71..d7e245e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -49,12 +49,12 @@ jobs:
           mvn -B install
 
   older-wildfly:
-# uncomment the following line when this FP branch supports only one WF version and thus testing with older WF builds isn't needed
-    if: false
+# comment-out the following line when this FP branch supports only one WF version and thus testing with older WF builds isn't needed
+#    if: false
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        wildfly: [28.0.1.Final, 29.0.1.Final]
+        wildfly: [32.0.1.Final, 31.0.1.Final, 30.0.1.Final]
     name: build with wildfly ${{matrix.wildfly}}
 
     steps:
diff --git a/pom.xml b/pom.xml
index e6b6cbd..95a4585 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,17 +39,17 @@
 
     <properties>
 	<!-- Target WildFly version, and other parts needed for the Galleon maven plugin -->
-        <version.org.wildfly>31.0.1.Final</version.org.wildfly>
-        <version.org.wildfly.core>23.0.3.Final</version.org.wildfly.core>
+        <version.org.wildfly>33.0.0.Final</version.org.wildfly>
+        <version.org.wildfly.core>25.0.0.Final</version.org.wildfly.core>
         <version.org.wildfly.common>1.6.0.Final</version.org.wildfly.common>
-        <version.org.jboss.galleon>5.2.2.Final</version.org.jboss.galleon>
+        <version.org.jboss.galleon>6.0.2.Final</version.org.jboss.galleon>
 
         <!-- Other WildFly feature pack that we depend on -->
         <version.org.wildfly.reactive-feature-pack>3.0.0.Final</version.org.wildfly.reactive-feature-pack> 
 
         <!-- Libraries provided by this feature pack. These variables directly affect what will be in
              the built feature pack. -->
-        <version.io.smallrye.graphql>2.9.0</version.io.smallrye.graphql>
+        <version.io.smallrye.graphql>2.9.1</version.io.smallrye.graphql>
         <version.org.eclipse.microprofile.graphql>2.0</version.org.eclipse.microprofile.graphql>
         <version.com.graphql-java>22.1</version.com.graphql-java>
         <version.com.graphql-java.dataloader>3.2.1</version.com.graphql-java.dataloader>
@@ -78,11 +78,11 @@
         <version.junit>4.13.1</version.junit>
         <version.rest-assured>5.3.0</version.rest-assured>
         <version.arquillian-junit>1.7.0.Alpha12</version.arquillian-junit>
-        <version.wildfly.glow>1.0.0.Alpha7</version.wildfly.glow>
+        <version.wildfly.glow>1.1.0.Final</version.wildfly.glow>
 
         <!-- Plugin versions and their dependency versions -->
         <version.org.wildfly.checkstyle-config>1.0.8.Final</version.org.wildfly.checkstyle-config>
-        <version.org.wildfly.galleon-plugins>6.4.2.Final</version.org.wildfly.galleon-plugins>
+        <version.org.wildfly.galleon-plugins>7.1.2.Final</version.org.wildfly.galleon-plugins>
         <version.wildfly.maven.plugin>4.1.1.Final</version.wildfly.maven.plugin>
 
         <!-- Misc. -->
diff --git a/subsystem/src/main/java/org/wildfly/extension/microprofile/graphql/MicroProfileGraphQLSubsystemDefinition.java b/subsystem/src/main/java/org/wildfly/extension/microprofile/graphql/MicroProfileGraphQLSubsystemDefinition.java
index 7b91f39..eb87ac4 100644
--- a/subsystem/src/main/java/org/wildfly/extension/microprofile/graphql/MicroProfileGraphQLSubsystemDefinition.java
+++ b/subsystem/src/main/java/org/wildfly/extension/microprofile/graphql/MicroProfileGraphQLSubsystemDefinition.java
@@ -46,7 +46,6 @@ public class MicroProfileGraphQLSubsystemDefinition extends PersistentResourceDe
             .of(GRAPHQL_CAPABILITY_NAME)
             .addRequirements(WELD_CAPABILITY_NAME)
             .addRequirements(CONFIG_CAPABILITY_NAME)
-            .addRequirements()
             .build();
 
     public MicroProfileGraphQLSubsystemDefinition() {
diff --git a/testsuite/server-tck/src/test/resources/overrides/basicScalarTests.csv b/testsuite/server-tck/src/test/resources/overrides/basicScalarTests.csv
new file mode 100644
index 0000000..1ba1cfe
--- /dev/null
+++ b/testsuite/server-tck/src/test/resources/overrides/basicScalarTests.csv
@@ -0,0 +1,3 @@
+# Basic Scalar Types                                                                                                   
+23| type ScalarHolder       |   charArray: [String!]                                                                                                     |   Expecting a String Array Scalar (for Java Char[]) Type in type ScalarHolder       
+47| type Query              |   testCharArray: [String!]                                                                                                 |   Expecting a non null Stirng Array (for Java Char[]) Scalar Type in type Query
diff --git a/testsuite/server-tck/src/test/resources/overrides/schemaTests.csv b/testsuite/server-tck/src/test/resources/overrides/schemaTests.csv
index 33ebd17..700db9c 100644
--- a/testsuite/server-tck/src/test/resources/overrides/schemaTests.csv
+++ b/testsuite/server-tck/src/test/resources/overrides/schemaTests.csv
@@ -1,2 +1,2 @@
 # testJsonDefault
-59|type Mutation       |   provisionHero(hero: String, item: ItemInput = {dateCreated : "19 February 1900 at 12:00 in Africa/Johannesburg", dateLastUsed : "29 Jan 2020 at 09:45 in zone +0200", height : 1.2, id : 1000, name : "Cape", powerLevel : 3, supernatural : false, weight : 0.3}): SuperHero | Expecting a default value for item for provisionHero
+60|type Mutation       |   id : "1000"                                                | Expecting an id=1000 in the default value for item for provisionHero