Merge branch 'main' into issue7206_4x

Signed-off-by: Jorge Bescos Gascon <jorge.bescos.gascon@oracle.com>
jbescos · Aug 7, 2024 · b44938d · b44938d
2 parents 8247e52 + 3fd0f91
commit b44938d
Show file tree

Hide file tree

Showing 14 changed files with 1,749 additions and 84 deletions.
diff --git a/all/pom.xml b/all/pom.xml
@@ -1130,16 +1130,4 @@
         </dependency>
     </dependencies>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <!--
-                    Work-around for https://github.com/helidon-io/helidon/issues/8172
-                 -->
-                <groupId>org.antlr</groupId>
-                <artifactId>antlr4-runtime</artifactId>
-                <version>4.10.1</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
 </project>
diff --git a/config/metadata/docs/pom.xml b/config/metadata/docs/pom.xml
@@ -103,21 +103,6 @@
         </dependency>
     </dependencies>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <!--
-                    Work-around for https://github.com/helidon-io/helidon/issues/8172
-                    dependency convergence of antlr, where graphql uses an older version
-                    and fails when we upgrade antlr
-                 -->
-                <groupId>org.antlr</groupId>
-                <artifactId>antlr4-runtime</artifactId>
-                <version>4.10.1</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <build>
         <plugins>
             <plugin>

diff --git a/dependencies/pom.xml b/dependencies/pom.xml
@@ -55,8 +55,8 @@
         <version.lib.google-error-prone>2.3.3</version.lib.google-error-prone>
         <version.lib.google-protobuf>4.27.3</version.lib.google-protobuf>
         <version.lib.graalvm>23.1.0</version.lib.graalvm>
-        <version.lib.graphql-java>18.6</version.lib.graphql-java>
-        <version.lib.graphql-java.extended.scalars>18.3</version.lib.graphql-java.extended.scalars>
+        <version.lib.graphql-java>22.1</version.lib.graphql-java>
+        <version.lib.graphql-java.extended.scalars>22.0</version.lib.graphql-java.extended.scalars>
         <version.lib.gson>2.9.0</version.lib.gson>
         <version.lib.grpc>1.65.1</version.lib.grpc>
         <version.lib.guava>32.0.1-jre</version.lib.guava>