chore: bump to Spring Boot 3.2.0-RC2

hantsy · Nov 4, 2023 · 3b14105 · 3b14105
1 parent 12b5694
commit 3b14105
Show file tree

Hide file tree

Showing 163 changed files with 13,989 additions and 445 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -71,14 +71,6 @@ updates:
     directory: "/graphql-spqr"
     schedule:
       interval: weekly
-    ignore: 
-      - dependency-name: "com.graphql-java:graphql-java"
-        update-types: ["version-update:semver-major"]  
-
-  - package-ecosystem: "gradle"
-    directory: "/graphql-java"
-    schedule:
-      interval: weekly
   - package-ecosystem: "gradle"
     directory: "/graphql-kotlin"
     schedule:

diff --git a/.github/workflows/dgs-client.yml b/.github/workflows/dgs-client.yml
@@ -24,7 +24,7 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v3
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'temurin'
     - name: Build with Gradle
       run: |

diff --git a/.github/workflows/dgs-codegen.yml b/.github/workflows/dgs-codegen.yml
@@ -25,7 +25,7 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v3
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'temurin'
     - name: Setup Postgres in Docker 
       run: |

diff --git a/.github/workflows/dgs-fileupload.yml b/.github/workflows/dgs-fileupload.yml
@@ -25,7 +25,7 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v3
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'temurin'
     - name: Build with Gradle
       run: |

diff --git a/.github/workflows/dgs-kotlin-co.yml b/.github/workflows/dgs-kotlin-co.yml
@@ -25,7 +25,7 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v3
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'temurin'
     - name: Setup Postgres in Docker 
       run: |

diff --git a/.github/workflows/dgs-kotlin.yml b/.github/workflows/dgs-kotlin.yml
@@ -25,7 +25,7 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v3
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'temurin'
     - name: Setup Postgres in Docker 
       run: |

diff --git a/.github/workflows/dgs-subscription-sse.yml b/.github/workflows/dgs-subscription-sse.yml
@@ -25,7 +25,7 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v3
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'temurin'
     - name: Build with Gradle
       run: |

diff --git a/.github/workflows/dgs-subscription-ui.yml b/.github/workflows/dgs-subscription-ui.yml
@@ -24,9 +24,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Setup NodeJS
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: "16"
+          node-version: "20"
 
       - uses: actions/cache@v3
         with:

diff --git a/.github/workflows/dgs-subscription-ws.yml b/.github/workflows/dgs-subscription-ws.yml
@@ -25,7 +25,7 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v3
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'temurin'
     - name: Build with Gradle
       run: |

diff --git a/.github/workflows/dgs-webflux.yml b/.github/workflows/dgs-webflux.yml
@@ -25,7 +25,7 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v3
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'temurin'
     - name: Setup Postgres in Docker 
       run: |

diff --git a/.github/workflows/dgs.yml b/.github/workflows/dgs.yml
@@ -25,7 +25,7 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v3
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'temurin'
     - name: Setup Postgres in Docker 
       run: |

diff --git a/.github/workflows/graphql-java-kickstart-annotations.yml b/.github/workflows/graphql-java-kickstart-annotations.yml
@@ -25,7 +25,7 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v3
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'temurin'
     - name: Setup Postgres in Docker 
       run: |

diff --git a/.github/workflows/graphql-java-kickstart-webclient.yml b/.github/workflows/graphql-java-kickstart-webclient.yml
@@ -25,7 +25,7 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v3
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'temurin'
     - name: Setup Postgres in Docker 
       run: |

diff --git a/.github/workflows/graphql-java-kickstart.yml b/.github/workflows/graphql-java-kickstart.yml
@@ -27,7 +27,7 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v3
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'temurin'
     - name: Setup Postgres in Docker 
       run: |

diff --git a/.github/workflows/graphql-kotlin.yml b/.github/workflows/graphql-kotlin.yml
@@ -26,7 +26,7 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v3
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'temurin'
     - name: Setup Postgres in Docker 
       run: |

diff --git a/.github/workflows/graphql-spqr.yml b/.github/workflows/graphql-spqr.yml
@@ -26,7 +26,7 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v3
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'temurin'
     - name: Setup Postgres in Docker 
       run: |

diff --git a/.github/workflows/graphql-java.yml → .github/workflows/legacy-graphql-java.yml b/.github/workflows/graphql-java.yml → .github/workflows/legacy-graphql-java.yml
@@ -1,16 +1,16 @@
 # This workflow will build a Java project with Gradle
 # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
 
-name: graphql-java
+name: legacy-graphql-java
 
 on:
   push:
     paths:
-      - "graphql-java/**"
+      - "legacy/graphql-java/**"
     branches: [ master ]
   pull_request:
     paths:
-      - "graphql-java/**"  
+      - "legacy/graphql-java/**"  
     types:
       - opened
       - synchronize
@@ -34,7 +34,7 @@ jobs:
         docker ps -a
     - name: Build with Gradle
       run: |
-        cd graphql-java
+        cd legacy/graphql-java
         chmod +x gradlew
         ./gradlew build
 

diff --git a/.github/workflows/spring-graphql-querydsl.yml b/.github/workflows/spring-graphql-querydsl.yml
@@ -26,7 +26,7 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v3
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'temurin'
     - name: Setup Postgres in Docker 
       run: |

diff --git a/.github/workflows/spring-graphql-rsocket-kotlin-co.yml b/.github/workflows/spring-graphql-rsocket-kotlin-co.yml
@@ -26,7 +26,7 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v3
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'temurin'
         cache: 'gradle'
     - name: Setup Postgres in Docker 

diff --git a/.github/workflows/spring-graphql-webflux.yml b/.github/workflows/spring-graphql-webflux.yml
@@ -26,7 +26,7 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v3
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'temurin'
     - name: Setup Postgres in Docker 
       run: |

diff --git a/.github/workflows/spring-graphql-webmvc.yml b/.github/workflows/spring-graphql-webmvc.yml
@@ -26,7 +26,7 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v3
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'temurin'
     - name: Setup Postgres in Docker 
       run: |

diff --git a/.github/workflows/spring-graphql.yml b/.github/workflows/spring-graphql.yml
@@ -26,7 +26,7 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v3
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'temurin'
     - name: Setup Postgres in Docker 
       run: |

diff --git a/dgs-client/build.gradle b/dgs-client/build.gradle
@@ -1,21 +1,32 @@
 plugins {
-    id 'org.springframework.boot' version '3.1.4'
+    id 'org.springframework.boot' version '3.2.0-RC2'
     id 'io.spring.dependency-management' version '1.1.3'
     id 'java'
-    id "com.netflix.dgs.codegen" version "6.0.2" //https://plugins.gradle.org/plugin/com.netflix.dgs.codegen
+    id "com.netflix.dgs.codegen" version "6.0.3" //https://plugins.gradle.org/plugin/com.netflix.dgs.codegen
 }
 
 group = 'com.example'
 version = '0.0.1-SNAPSHOT'
-sourceCompatibility = '17'
+java {
+ sourceCompatibility = '21'
+}
+
 
 repositories {
     mavenLocal()
     mavenCentral()
+    maven { url "https://repo.spring.io/milestone" }
+    maven { url "https://repo.spring.io/snapshot" }
+}
+
+dependencyManagement {
+    imports {
+        mavenBom("com.netflix.graphql.dgs:graphql-dgs-platform-dependencies:8.0.0")
+    }
 }
 
 dependencies {
-    implementation(platform("com.netflix.graphql.dgs:graphql-dgs-platform-dependencies:7.5.3"))
+    //implementation(platform("com.netflix.graphql.dgs:graphql-dgs-platform-dependencies:8.0.0"))
     implementation "com.netflix.graphql.dgs:graphql-dgs-client"
 
     //spring boot starter

diff --git a/dgs-client/gradle/wrapper/gradle-wrapper.jar b/dgs-client/gradle/wrapper/gradle-wrapper.jar
diff --git a/dgs-client/gradle/wrapper/gradle-wrapper.properties b/dgs-client/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/dgs-client/settings.gradle b/dgs-client/settings.gradle
@@ -1 +1,8 @@
+pluginManagement {
+	repositories {
+		maven { url 'https://repo.spring.io/milestone' }
+		gradlePluginPortal()
+	}
+}
+
 rootProject.name = 'dgs-client-example'
diff --git a/dgs-client/src/main/java/com/example/demo/DemoApplication.java b/dgs-client/src/main/java/com/example/demo/DemoApplication.java
@@ -2,12 +2,11 @@
 
 import com.example.demo.gql.client.AllPostsGraphQLQuery;
 import com.example.demo.gql.client.AllPostsProjectionRoot;
+import com.example.demo.gql.client.AuthorProjection;
+import com.example.demo.gql.client.PostProjection;
 import com.example.demo.gql.types.Post;
 import com.jayway.jsonpath.TypeRef;
-import com.netflix.graphql.dgs.client.DefaultGraphQLClient;
-import com.netflix.graphql.dgs.client.GraphQLClient;
-import com.netflix.graphql.dgs.client.GraphQLResponse;
-import com.netflix.graphql.dgs.client.HttpResponse;
+import com.netflix.graphql.dgs.client.*;
 import com.netflix.graphql.dgs.client.codegen.GraphQLQueryRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
@@ -88,7 +87,7 @@ public void run(ApplicationArguments args) throws Exception {
         GraphQLQueryRequest graphQLQueryRequest =
                 new GraphQLQueryRequest(
                         new AllPostsGraphQLQuery(),
-                        new AllPostsProjectionRoot()
+                        new AllPostsProjectionRoot<AuthorProjection<?,?>,PostProjection<?,?>>()
                                 .id()
                                 .title()
                                 .content()
@@ -100,11 +99,10 @@ public void run(ApplicationArguments args) throws Exception {
                 );
 
         String query = graphQLQueryRequest.serialize();
-        GraphQLClient client = new DefaultGraphQLClient(url);
-        GraphQLResponse response = client.executeQuery(query, new HashMap<>(), DemoApplication::execute);
+        GraphQLClient client = new CustomGraphQLClient(url, DemoApplication::execute);
+        GraphQLResponse response = client.executeQuery(query, new HashMap<>() );
 
-        var data = response.extractValueAsObject("allPosts", new TypeRef<List<Post>>() {
-        });
+        var data = response.extractValueAsObject("allPosts", new TypeRef<List<Post>>() {  });
         log.info("fetched all posts from client: {}", data);
     }
 }
diff --git a/dgs-codegen/build.gradle b/dgs-codegen/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'org.springframework.boot' version '3.1.4'
+    id 'org.springframework.boot' version '3.2.0-RC2'
     id 'io.spring.dependency-management' version '1.1.3'
     id 'java'
     id "com.netflix.dgs.codegen" version "6.0.3" //https://plugins.gradle.org/plugin/com.netflix.dgs.codegen
@@ -8,15 +8,26 @@ plugins {
 
 group = 'com.example'
 version = '0.0.1-SNAPSHOT'
-sourceCompatibility = '17'
+java {
+ sourceCompatibility = '21'
+}
+
 
 repositories {
     mavenLocal()
     mavenCentral()
+    maven { url "https://repo.spring.io/milestone" }
+    maven { url "https://repo.spring.io/snapshot" }
+}
+
+dependencyManagement {
+    imports {
+        mavenBom("com.netflix.graphql.dgs:graphql-dgs-platform-dependencies:8.0.0")
+    }
 }
 
 dependencies {
-    implementation(platform("com.netflix.graphql.dgs:graphql-dgs-platform-dependencies:7.5.3"))
+    // implementation(platform("com.netflix.graphql.dgs:graphql-dgs-platform-dependencies:8.0.0"))
     implementation "com.netflix.graphql.dgs:graphql-dgs-spring-boot-starter", {
         exclude group: 'org.yaml', module: 'snakeyaml'
     }

diff --git a/dgs-codegen/gradle/wrapper/gradle-wrapper.jar b/dgs-codegen/gradle/wrapper/gradle-wrapper.jar
diff --git a/dgs-codegen/gradle/wrapper/gradle-wrapper.properties b/dgs-codegen/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/dgs-codegen/settings.gradle b/dgs-codegen/settings.gradle
@@ -1 +1,8 @@
+pluginManagement {
+	repositories {
+		maven { url 'https://repo.spring.io/milestone' }
+		gradlePluginPortal()
+	}
+}
+
 rootProject.name = 'dgs-codegen'