Update dependencies

resolves #243
neo4j-graphql · Oct 28, 2021 · 35090a9 · 35090a9
1 parent b834bab
commit 35090a9
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 21 deletions.
diff --git a/.github/workflows/changelog-configuration.json b/.github/workflows/changelog-configuration.json
@@ -27,10 +27,14 @@
     {
       "title": "## Tests",
       "labels": ["test"]
+    },
+    {
+      "title": "## Updated dependencies",
+      "labels": ["dependencies"]
     }
   ],
   "ignore_labels": [
-    "ignore", "dependencies"
+    "ignore"
   ],
   "label_extractor": [  ],
   "duplicate_filter": null,

diff --git a/core/pom.xml b/core/pom.xml
@@ -42,7 +42,7 @@
         <dependency>
             <groupId>org.atteo</groupId>
             <artifactId>evo-inflector</artifactId>
-            <version>1.2.2</version>
+            <version>1.3</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -62,24 +62,24 @@
         <dependency>
             <groupId>org.neo4j</groupId>
             <artifactId>neo4j-cypher-dsl</artifactId>
-            <version>2021.0.2</version>
+            <version>2021.3.2</version>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>1.2.3</version>
+            <version>1.2.6</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.13.1</version>
+            <version>4.13.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.vintage</groupId>
             <artifactId>junit-vintage-engine</artifactId>
-            <version>5.7.1</version>
+            <version>5.8.1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/core/src/main/kotlin/org/neo4j/graphql/ExtensionFunctions.kt b/core/src/main/kotlin/org/neo4j/graphql/ExtensionFunctions.kt
@@ -9,7 +9,7 @@ fun <T> Iterable<T>.joinNonEmpty(separator: CharSequence = ", ", prefix: CharSeq
     return if (iterator().hasNext()) joinTo(StringBuilder(), separator, prefix, postfix, limit, truncated, transform).toString() else ""
 }
 
-fun queryParameter(value: Any?, vararg parts: String?): Parameter<Any> {
+fun queryParameter(value: Any?, vararg parts: String?): Parameter<*> {
     val name = when (value) {
         is VariableReference -> value.name
         else -> normalizeName(*parts)

diff --git a/core/src/main/kotlin/org/neo4j/graphql/Neo4jTypes.kt b/core/src/main/kotlin/org/neo4j/graphql/Neo4jTypes.kt
@@ -23,7 +23,7 @@ class Neo4jTemporalConverter(name: String) : Neo4jSimpleConverter(name) {
         return Cypher.call("toString").withArgs(variable.property(field.name)).asFunction()
     }
 
-    override fun createCondition(property: Property, parameter: Parameter<Any>, conditionCreator: (Expression, Expression) -> Condition): Condition {
+    override fun createCondition(property: Property, parameter: Parameter<*>, conditionCreator: (Expression, Expression) -> Condition): Condition {
         return conditionCreator(property, toExpression(parameter))
     }
 }
@@ -33,7 +33,7 @@ class Neo4jTimeConverter(name: String) : Neo4jConverter(name) {
     override fun createCondition(
             objectField: ObjectField,
             field: GraphQLFieldDefinition,
-            parameter: Parameter<Any>,
+            parameter: Parameter<*>,
             conditionCreator: (Expression, Expression) -> Condition,
             propertyContainer: PropertyContainer
     ): Condition = if (objectField.name == NEO4j_FORMATTED_PROPERTY_KEY) {
@@ -65,7 +65,7 @@ class Neo4jTimeConverter(name: String) : Neo4jConverter(name) {
 
 class Neo4jPointConverter(name: String) : Neo4jConverter(name) {
 
-    fun createDistanceCondition(lhs: Expression, rhs: Parameter<Any>, conditionCreator: (Expression, Expression) -> Condition): Condition {
+    fun createDistanceCondition(lhs: Expression, rhs: Parameter<*>, conditionCreator: (Expression, Expression) -> Condition): Condition {
         val point = Functions.point(rhs.property("point"))
         val distance = rhs.property("distance")
         return conditionCreator(Functions.distance(lhs, point), distance)
@@ -86,14 +86,14 @@ open class Neo4jSimpleConverter(val name: String) {
 
     open fun createCondition(
             property: Property,
-            parameter: Parameter<Any>,
+            parameter: Parameter<*>,
             conditionCreator: (Expression, Expression) -> Condition
     ): Condition = conditionCreator(property, parameter)
 
     open fun createCondition(
             objectField: ObjectField,
             field: GraphQLFieldDefinition,
-            parameter: Parameter<Any>,
+            parameter: Parameter<*>,
             conditionCreator: (Expression, Expression) -> Condition,
             propertyContainer: PropertyContainer
     ): Condition = createCondition(propertyContainer.property(field.name, objectField.name), parameter, conditionCreator)

diff --git a/core/src/main/kotlin/org/neo4j/graphql/handler/projection/ProjectionBase.kt b/core/src/main/kotlin/org/neo4j/graphql/handler/projection/ProjectionBase.kt
@@ -510,7 +510,7 @@ open class ProjectionBase(
             }
         }
 
-        fun <T> format(returning: T): StatementBuilder.BuildableStatement where T : TerminalExposesSkip, T : TerminalExposesLimit {
+        fun <T> format(returning: T): StatementBuilder.BuildableStatement<ResultStatement> where T : TerminalExposesSkip, T : TerminalExposesLimit {
             val result = skip?.let { returning.skip(it) } ?: returning
             return limit?.let { result.limit(it) } ?: result
         }

diff --git a/examples/dgs-spring-boot/pom.xml b/examples/dgs-spring-boot/pom.xml
@@ -15,7 +15,7 @@
     <description>Example for using neo4j-graphql-java with Spring Boot and Netflix Domain Graph Service (DGS)</description>
 
     <properties>
-        <testcontainers.version>1.15.3</testcontainers.version>
+        <testcontainers.version>1.16.0</testcontainers.version>
         <spring-boot.version>2.3.10.RELEASE</spring-boot.version>
     </properties>
 
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>org.neo4j.driver</groupId>
             <artifactId>neo4j-java-driver-spring-boot-starter</artifactId>
-            <version>4.2.4.0</version>
+            <version>4.2.7.0</version>
         </dependency>
         <dependency>
             <groupId>org.neo4j</groupId>

diff --git a/examples/graphql-spring-boot/pom.xml b/examples/graphql-spring-boot/pom.xml
@@ -15,8 +15,8 @@
     <description>Example for using neo4j-graphql-java with Spring Boot</description>
 
     <properties>
-        <testcontainers.version>1.15.3</testcontainers.version>
-        <graphql-kotlin.version>4.1.1</graphql-kotlin.version>
+        <testcontainers.version>1.16.0</testcontainers.version>
+        <graphql-kotlin.version>5.1.1</graphql-kotlin.version>
         <spring-boot.version>2.3.10.RELEASE</spring-boot.version>
     </properties>
 
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.neo4j.driver</groupId>
             <artifactId>neo4j-java-driver-spring-boot-starter</artifactId>
-            <version>4.2.4.0</version>
+            <version>4.2.7.0</version>
         </dependency>
         <dependency>
             <groupId>org.neo4j</groupId>

diff --git a/neo4j-graphql-augmented-schema-generator-maven-plugin/pom.xml b/neo4j-graphql-augmented-schema-generator-maven-plugin/pom.xml
@@ -23,13 +23,13 @@
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-plugin-api</artifactId>
-            <version>3.6.3</version>
+            <version>3.8.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.plugin-tools</groupId>
             <artifactId>maven-plugin-annotations</artifactId>
-            <version>3.6.0</version>
+            <version>3.6.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/pom.xml b/pom.xml
@@ -23,7 +23,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>11</java.version>
-        <kotlin.version>1.4.32</kotlin.version>
+        <kotlin.version>1.5.31</kotlin.version>
         <kotlin.compiler.jvmTarget>${java.version}</kotlin.compiler.jvmTarget>
         <neo4j.version>4.2.4</neo4j.version>
         <neo4j-apoc.version>4.2.0.2</neo4j-apoc.version>