Upgrade dependencies

Closes gh-883 Closes gh-884 Closes gh-885 Closes gh-886 Closes gh-887 Closes gh-888 Closes gh-889 Closes gh-890
spring-projects · Jan 26, 2024 · 1e2b5f8 · 1e2b5f8
1 parent 8496454
commit 1e2b5f8
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 26 deletions.
diff --git a/build.gradle b/build.gradle
@@ -2,9 +2,9 @@ description = "Spring for GraphQL"
 
 ext {
 	moduleProjects = [project(":spring-graphql"), project(":spring-graphql-test")]
-	springFrameworkVersion = "6.0.14"
-	graphQlJavaVersion = "20.7"
-	springBootVersion = "3.1.5"
+	springFrameworkVersion = "6.1.3"
+	graphQlJavaVersion = "21.3"
+	springBootVersion = "3.2.2"
 }
 
 subprojects {
@@ -53,7 +53,7 @@ configure(moduleProjects) {
 
 	ext.javadocLinks = [
 			"https://docs.oracle.com/en/java/javase/17/docs/api/",
-			"https://docs.spring.io/spring-framework/docs/6.0.x/javadoc-api/",
+			"https://docs.spring.io/spring-framework/docs/6.1.x/javadoc-api/",
 			"https://javadoc.io/doc/com.graphql-java/graphql-java/20.7/"
 	] as String[]
 

diff --git a/gradle.properties b/gradle.properties
@@ -5,6 +5,6 @@ org.gradle.daemon=true
 org.gradle.parallel=true
 org.gradle.jvmargs=-Dfile.encoding=UTF-8
 
-kotlinVersion=1.8.22
+kotlinVersion=1.9.22
 
 kotlin.stdlib.default.dependency=false
diff --git a/platform/build.gradle b/platform/build.gradle
@@ -9,19 +9,19 @@ javaPlatform {
 dependencies {
 	api(platform("org.springframework:spring-framework-bom:${springFrameworkVersion}"))
 	api(platform("com.fasterxml.jackson:jackson-bom:2.15.3"))
-	api(platform("io.projectreactor:reactor-bom:2022.0.13"))
-	api(platform("io.micrometer:micrometer-bom:1.11.6"))
-	api(platform("io.micrometer:micrometer-tracing-bom:1.1.7"))
-	api(platform("org.springframework.data:spring-data-bom:2023.0.6"))
-	api(platform("org.springframework.security:spring-security-bom:6.1.5"))
+	api(platform("io.projectreactor:reactor-bom:2023.0.2"))
+	api(platform("io.micrometer:micrometer-bom:1.12.2"))
+	api(platform("io.micrometer:micrometer-tracing-bom:1.2.2"))
+	api(platform("org.springframework.data:spring-data-bom:2023.1.2"))
+	api(platform("org.springframework.security:spring-security-bom:6.2.1"))
 	api(platform("com.querydsl:querydsl-bom:5.0.0"))
 	api(platform("io.rsocket:rsocket-bom:1.1.4"))
 	api(platform("org.jetbrains.kotlin:kotlin-bom:${kotlinVersion}"))
-	api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4"))
-	api(platform("org.junit:junit-bom:5.9.3"))
-	api(platform("org.mockito:mockito-bom:5.4.0"))
-	api(platform("org.testcontainers:testcontainers-bom:1.18.3"))
-	api(platform("org.apache.logging.log4j:log4j-bom:2.20.0"))
+	api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3"))
+	api(platform("org.junit:junit-bom:5.10.1"))
+	api(platform("org.mockito:mockito-bom:5.8.0"))
+	api(platform("org.testcontainers:testcontainers-bom:1.19.4"))
+	api(platform("org.apache.logging.log4j:log4j-bom:2.22.1"))
 
 	constraints {
 		api("com.graphql-java:graphql-java:${graphQlJavaVersion}")
@@ -39,12 +39,12 @@ dependencies {
 		api("org.skyscreamer:jsonassert:1.5.1")
 
 		api("com.h2database:h2:2.1.214")
-		api("org.hibernate:hibernate-core:6.2.8.Final")
+		api("org.hibernate:hibernate-core:6.4.2.Final")
 		api("org.hibernate.validator:hibernate-validator:8.0.1.Final")
-		api("org.mongodb:bson:4.9.1")
-		api("org.mongodb:mongodb-driver-core:4.9.1")
-		api("org.mongodb:mongodb-driver-reactivestreams:4.9.1")
-		api("org.mongodb:mongodb-driver-sync:4.9.1")
+		api("org.mongodb:bson:4.11.1")
+		api("org.mongodb:mongodb-driver-core:4.11.1")
+		api("org.mongodb:mongodb-driver-reactivestreams:4.11.1")
+		api("org.mongodb:mongodb-driver-sync:4.11.1")
 	}
 
 }
diff --git a/...src/main/java/org/springframework/graphql/data/pagination/ConnectionFieldTypeVisitor.java b/...src/main/java/org/springframework/graphql/data/pagination/ConnectionFieldTypeVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 the original author or authors.
+ * Copyright 2020-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,6 +32,7 @@
 import graphql.relay.Edge;
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
+import graphql.schema.FieldCoordinates;
 import graphql.schema.GraphQLCodeRegistry;
 import graphql.schema.GraphQLFieldDefinition;
 import graphql.schema.GraphQLFieldsContainer;
@@ -85,7 +86,8 @@ public TraversalControl visitGraphQLFieldDefinition(
 		GraphQLCodeRegistry.Builder codeRegistry = context.getVarFromParents(GraphQLCodeRegistry.Builder.class);
 
 		GraphQLFieldsContainer parent = (GraphQLFieldsContainer) context.getParentNode();
-		DataFetcher<?> dataFetcher = codeRegistry.getDataFetcher(parent, fieldDefinition);
+		FieldCoordinates fieldCoordinates = FieldCoordinates.coordinates(parent, fieldDefinition);
+		DataFetcher<?> dataFetcher = codeRegistry.getDataFetcher(fieldCoordinates, fieldDefinition);
 
 		if (visitorHelper != null && isUnderSubscriptionOperation(visitorHelper, context)) {
 			return TraversalControl.CONTINUE;
@@ -101,7 +103,7 @@ public TraversalControl visitGraphQLFieldDefinition(
 			}
 			else {
 				dataFetcher = new ConnectionDataFetcher(dataFetcher, this.adapter);
-				codeRegistry.dataFetcher(parent, fieldDefinition, dataFetcher);
+				codeRegistry.dataFetcher(fieldCoordinates, dataFetcher);
 			}
 		}
 

diff --git a/...phql/src/main/java/org/springframework/graphql/execution/ContextDataFetcherDecorator.java b/...phql/src/main/java/org/springframework/graphql/execution/ContextDataFetcherDecorator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@
 import graphql.GraphQLContext;
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
+import graphql.schema.FieldCoordinates;
 import graphql.schema.GraphQLCodeRegistry;
 import graphql.schema.GraphQLFieldDefinition;
 import graphql.schema.GraphQLFieldsContainer;
@@ -139,12 +140,13 @@ public TraversalControl visitGraphQLFieldDefinition(
 			GraphQLCodeRegistry.Builder codeRegistry = context.getVarFromParents(GraphQLCodeRegistry.Builder.class);
 
 			GraphQLFieldsContainer parent = (GraphQLFieldsContainer) context.getParentNode();
-			DataFetcher<?> dataFetcher = codeRegistry.getDataFetcher(parent, fieldDefinition);
+			FieldCoordinates fieldCoordinates = FieldCoordinates.coordinates(parent, fieldDefinition);
+			DataFetcher<?> dataFetcher = codeRegistry.getDataFetcher(fieldCoordinates, fieldDefinition);
 
 			if (applyDecorator(dataFetcher)) {
 				boolean handlesSubscription = visitorHelper.isSubscriptionType(parent);
 				dataFetcher = new ContextDataFetcherDecorator(dataFetcher, handlesSubscription, exceptionResolver);
-				codeRegistry.dataFetcher(parent, fieldDefinition, dataFetcher);
+				codeRegistry.dataFetcher(fieldCoordinates, dataFetcher);
 			}
 
 			return TraversalControl.CONTINUE;