update dependencies to the latest versions (#323)

neo4j-graphql · Aug 29, 2024 · a2e0a50 · a2e0a50
1 parent 4f01a5e
commit a2e0a50
Show file tree

Hide file tree

Showing 18 changed files with 393 additions and 578 deletions.
diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java
diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
@@ -1,2 +1,19 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+wrapperVersion=3.3.2
+distributionType=only-script
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
diff --git a/core/pom.xml b/core/pom.xml
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>org.neo4j.driver</groupId>
             <artifactId>neo4j-java-driver</artifactId>
-            <version>5.11.0</version>
+            <version>5.23.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -48,12 +48,12 @@
         <dependency>
             <groupId>org.neo4j</groupId>
             <artifactId>neo4j-cypher-dsl</artifactId>
-            <version>2023.9.5</version>
+            <version>2024.0.3</version>
         </dependency>
         <dependency>
             <groupId>com.graphql-java</groupId>
             <artifactId>graphql-java</artifactId>
-            <version>21.5</version>
+            <version>22.2</version>
         </dependency>
         <dependency>
             <groupId>org.atteo</groupId>
@@ -78,7 +78,7 @@
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>1.4.12</version>
+            <version>1.5.7</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -111,12 +111,12 @@
             <dependency>
                 <groupId>org.assertj</groupId>
                 <artifactId>assertj-core</artifactId>
-                <version>3.24.2</version>
+                <version>3.26.3</version>
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-api</artifactId>
-                <version>2.0.7</version>
+                <version>2.0.16</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

diff --git a/core/src/main/kotlin/org/neo4j/graphql/Predicates.kt b/core/src/main/kotlin/org/neo4j/graphql/Predicates.kt
@@ -8,7 +8,7 @@ import org.neo4j.cypherdsl.core.*
 import org.neo4j.cypherdsl.core.Cypher
 import org.slf4j.LoggerFactory
 
-private fun createArrayPredicate(factory: (SymbolicName) -> Predicates.OngoingListBasedPredicateFunction) =
+private fun createArrayPredicate(factory: (SymbolicName) -> OngoingListBasedPredicateFunction) =
     { lhs: Expression, rhs: Expression ->
         val x: SymbolicName = Cypher.name("x")
         factory(x).`in`(lhs).where(x.`in`(rhs))

diff --git a/core/src/test/kotlin/DataFetcherInterceptorDemo.kt b/core/src/test/kotlin/DataFetcherInterceptorDemo.kt
@@ -17,7 +17,7 @@ fun initBoundSchema(schema: String): GraphQLSchema {
 
     val dataFetchingInterceptor = object : DataFetchingInterceptor {
         override fun fetchData(env: DataFetchingEnvironment, delegate: DataFetcher<Cypher>): Any {
-            env.graphQlContext.setQueryContext(QueryContext(neo4jDialect = Dialect.DEFAULT))
+            env.graphQlContext.setQueryContext(QueryContext(neo4jDialect = Dialect.NEO4J_5))
             val (cypher, params, type, variable) = delegate.get(env)
             return driver.session().use { session ->
                 val result = session.run(cypher, params.mapValues { toBoltValue(it.value) })

diff --git a/core/src/test/kotlin/org/neo4j/graphql/utils/GraphQLSchemaTestSuite.kt b/core/src/test/kotlin/org/neo4j/graphql/utils/GraphQLSchemaTestSuite.kt
@@ -4,8 +4,8 @@ import graphql.language.InterfaceTypeDefinition
 import graphql.schema.GraphQLScalarType
 import graphql.schema.GraphQLSchema
 import graphql.schema.GraphQLType
-import graphql.schema.diff.DiffSet
 import graphql.schema.diff.SchemaDiff
+import graphql.schema.diff.SchemaDiffSet
 import graphql.schema.diff.reporting.CapturingReporter
 import graphql.schema.idl.*
 import org.assertj.core.api.Assertions.assertThat
@@ -106,17 +106,16 @@ class GraphQLSchemaTestSuite(fileName: String) : AsciiDocTestSuite(
         fun GraphQLType.splitName(): Pair<String?, String> {
             val m = METHOD_PATTERN.matcher(this.requiredName())
             return if (m.find()) {
-                m.group(1) to m.group(2).toLowerCase()
+                m.group(1) to m.group(2).lowercase()
             } else {
-                null to this.requiredName().toLowerCase()
+                null to this.requiredName().lowercase()
             }
         }
 
         fun diff(augmentedSchema: GraphQLSchema, expected: GraphQLSchema) {
-            val diffSet = DiffSet.diffSet(augmentedSchema, expected)
+            val diffSet = SchemaDiffSet.diffSetFromIntrospection(augmentedSchema, expected)
             val capture = CapturingReporter()
-            SchemaDiff(SchemaDiff.Options.defaultOptions().enforceDirectives())
-                .diffSchema(diffSet, capture)
+            SchemaDiff().diffSchema(diffSet, capture)
             assertThat(capture.dangers).isEmpty()
             assertThat(capture.breakages).isEmpty()
         }

diff --git a/examples/dgs-spring-boot/pom.xml b/examples/dgs-spring-boot/pom.xml
@@ -16,8 +16,8 @@
     </description>
 
     <properties>
-        <testcontainers.version>1.19.7</testcontainers.version>
-        <spring-boot.version>3.2.4</spring-boot.version>
+        <testcontainers.version>1.20.1</testcontainers.version>
+        <spring-boot.version>3.3.3</spring-boot.version>
     </properties>
 
     <dependencies>
@@ -41,7 +41,7 @@
         <dependency>
             <groupId>org.neo4j.driver</groupId>
             <artifactId>neo4j-java-driver</artifactId>
-            <version>5.18.0</version>
+            <version>5.23.0</version>
         </dependency>
         <dependency>
             <groupId>org.neo4j</groupId>
@@ -52,12 +52,12 @@
         <dependency>
             <groupId>com.netflix.graphql.dgs</groupId>
             <artifactId>graphql-dgs-spring-boot-starter</artifactId>
-            <version>8.5.5</version>
+            <version>9.1.0</version>
         </dependency>
         <dependency>
             <groupId>com.netflix.graphql.dgs.codegen</groupId>
             <artifactId>graphql-dgs-codegen-shared-core</artifactId>
-            <version>6.1.5</version>
+            <version>6.3.0</version>
         </dependency>
 
         <!-- Kotlin dependencies -->
@@ -153,7 +153,7 @@
             <plugin>
                 <groupId>io.github.deweyjose</groupId>
                 <artifactId>graphqlcodegen-maven-plugin</artifactId>
-                <version>1.60.1</version>
+                <version>1.61.5</version>
                 <executions>
                     <execution>
                         <goals>

diff --git a/...main/kotlin/org/neo4j/graphql/examples/dgsspringboot/datafetcher/AdditionalDataFetcher.kt b/...main/kotlin/org/neo4j/graphql/examples/dgsspringboot/datafetcher/AdditionalDataFetcher.kt
@@ -17,7 +17,7 @@ class AdditionalDataFetcher {
 
     @DgsData(parentType = DgsConstants.MOVIE.TYPE_NAME, field = DgsConstants.MOVIE.JavaData)
     fun javaData(env: DataFetchingEnvironment): List<JavaData> {
-        val title = env.getSource<Map<String, *>>()["title"]
+        val title = env.getSource<Map<String, *>>()?.get("title")
         return Collections.singletonList(JavaData("test $title"))
     }
 

diff --git a/.../kotlin/org/neo4j/graphql/examples/dgsspringboot/datafetcher/AdditionalDataFetcherTest.kt b/.../kotlin/org/neo4j/graphql/examples/dgsspringboot/datafetcher/AdditionalDataFetcherTest.kt
@@ -146,6 +146,6 @@ internal class AdditionalDataFetcherTest(
 
     companion object {
         @Container
-        private val neo4jServer = Neo4jContainer<Nothing>("neo4j:5.18.0")
+        private val neo4jServer = Neo4jContainer<Nothing>("neo4j:5.23.0")
     }
 }
diff --git a/examples/graphql-kotlin-spring-boot/pom.xml b/examples/graphql-kotlin-spring-boot/pom.xml
@@ -15,9 +15,9 @@
     <description>Example for using neo4j-graphql-java with GraphQL Kotlin and Spring Boot</description>
 
     <properties>
-        <testcontainers.version>1.19.7</testcontainers.version>
-        <graphql-kotlin.version>7.0.2</graphql-kotlin.version>
-        <spring-boot.version>3.2.4</spring-boot.version>
+        <testcontainers.version>1.20.1</testcontainers.version>
+        <graphql-kotlin.version>8.0.0</graphql-kotlin.version>
+        <spring-boot.version>3.3.3</spring-boot.version>
     </properties>
 
     <dependencies>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.neo4j.driver</groupId>
             <artifactId>neo4j-java-driver</artifactId>
-            <version>5.18.0</version>
+            <version>5.23.0</version>
         </dependency>
         <dependency>
             <groupId>org.neo4j</groupId>
@@ -51,7 +51,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.module</groupId>
             <artifactId>jackson-module-kotlin</artifactId>
-            <version>2.14.0</version>
+            <version>2.17.2</version>
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>

diff --git a/...boot/src/test/kotlin/org/neo4j/graphql/examples/graphqlspringboot/controller/QueriesIT.kt b/...boot/src/test/kotlin/org/neo4j/graphql/examples/graphqlspringboot/controller/QueriesIT.kt
@@ -109,7 +109,7 @@ internal class QueriesIT(
 
     companion object {
         @Container
-        private val neo4jServer = Neo4jContainer<Nothing>("neo4j:5.18.0")
+        private val neo4jServer = Neo4jContainer<Nothing>("neo4j:5.23.0")
 
     }
 

diff --git a/examples/graphql-spring-boot/pom.xml b/examples/graphql-spring-boot/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.2.4</version>
+        <version>3.3.3</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
@@ -18,7 +18,7 @@
 
     <properties>
         <java.version>17</java.version>
-        <testcontainers.version>1.19.7</testcontainers.version>
+        <testcontainers.version>1.20.1</testcontainers.version>
     </properties>
 
     <dependencies>
@@ -45,7 +45,7 @@
         <dependency>
             <groupId>org.neo4j.driver</groupId>
             <artifactId>neo4j-java-driver</artifactId>
-            <version>5.18.0</version>
+            <version>5.23.0</version>
         </dependency>
         <dependency>
             <groupId>org.neo4j</groupId>

diff --git a/...a/org/neo4j/graphql/examples/graphqlspringboot/datafetcher/AdditionalDataFetcherTest.java b/...a/org/neo4j/graphql/examples/graphqlspringboot/datafetcher/AdditionalDataFetcherTest.java
@@ -33,15 +33,16 @@ class AdditionalDataFetcherTest {
     private Driver driver;
 
     @Container
-    private static final Neo4jContainer<?> neo4jServer = new Neo4jContainer<>("neo4j:5.18.0");
+    private static final Neo4jContainer<?> neo4jServer = new Neo4jContainer<>("neo4j:5.23.0");
 
 
     @BeforeEach
     public void setup() {
-        driver.session().run(
-                "CREATE (:Movie {title:'The Matrix', released:1999, tagline:'Welcome to the Real World'})\n" +
-                        "CREATE (:Movie {title:'The Matrix Reloaded', released:2003, tagline:'Free your mind'})\n" +
-                        "CREATE (:Movie {title:'The Matrix Revolutions', released:2003, tagline:'Everything that hasa beginning has an end'})");
+        driver.session().run("""
+                CREATE (:Movie {title:'The Matrix', released:1999, tagline:'Welcome to the Real World'})
+                CREATE (:Movie {title:'The Matrix Reloaded', released:2003, tagline:'Free your mind'})
+                CREATE (:Movie {title:'The Matrix Revolutions', released:2003, tagline:'Everything that hasa beginning has an end'})
+                """);
     }
 
     @AfterEach