From d8e264f7c5c724f849f565a8d775f1fa95ccc13c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Apr 2023 00:58:46 +0000 Subject: [PATCH 01/13] Bump io.github.gradle-nexus.publish-plugin from 1.0.0 to 1.3.0 Bumps io.github.gradle-nexus.publish-plugin from 1.0.0 to 1.3.0. --- updated-dependencies: - dependency-name: io.github.gradle-nexus.publish-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 6c4e4e2..0906e8d 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ plugins { id 'maven' id 'maven-publish' id 'signing' - id "io.github.gradle-nexus.publish-plugin" version "1.0.0" + id "io.github.gradle-nexus.publish-plugin" version "1.3.0" id "biz.aQute.bnd.builder" version "6.4.0" } From 14886f4da21f742a6884667572b2e962f423d188 Mon Sep 17 00:00:00 2001 From: dondonz <13839920+dondonz@users.noreply.github.com> Date: Fri, 25 Aug 2023 13:38:47 +1000 Subject: [PATCH 02/13] Update readme for v21 --- README.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index ac1cad1..082ff1b 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Extended Scalars for graphql-java [![Build Status](https://github.com/graphql-java/graphql-java-extended-scalars/actions/workflows/master.yml/badge.svg)](https://github.com/graphql-java/graphql-java-extended-scalars/actions/workflows/master.yml) -[![Latest Release](https://img.shields.io/maven-central/v/com.graphql-java/graphql-java-extended-scalars?versionPrefix=20.)](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java-extended-scalars/) +[![Latest Release](https://img.shields.io/maven-central/v/com.graphql-java/graphql-java-extended-scalars?versionPrefix=21.)](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java-extended-scalars/) [![Latest Snapshot](https://img.shields.io/maven-central/v/com.graphql-java/graphql-java-extended-scalars?label=maven-central%20snapshot)](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java-extended-scalars/) [![MIT licensed](https://img.shields.io/badge/license-MIT-green)](https://github.com/graphql-java/graphql-java-extended-scalars/blob/master/LICENSE.md) @@ -23,7 +23,7 @@ You would use custom scalars when you want to describe more meaningful behavior To use this library put the following into your gradle config ```java -implementation 'com.graphql-java:graphql-java-extended-scalars:20.2' +implementation 'com.graphql-java:graphql-java-extended-scalars:21.0' ``` or the following into your Maven config @@ -32,15 +32,17 @@ or the following into your Maven config com.graphql-java graphql-java-extended-scalars - 20.2 + 21.0 ``` > Note: > -> use 19.0 or above for graphql-java 19.x and above +> use 21.0 or above for graphql-java 21.x and above > -> use 20.0 or above for graphql-java 20.x and above +> use 20.2 for graphql-java 20.x +> +> use 19.1 for graphql-java 19.x ## How to use extended scalars From ad783d2a8ae8008b5ca34cd0f6eebbd6ea5931b6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Sep 2023 16:19:12 +0000 Subject: [PATCH 03/13] Bump com.graphql-java:graphql-java from 21.0 to 21.1 Bumps [com.graphql-java:graphql-java](https://github.com/graphql-java/graphql-java) from 21.0 to 21.1. - [Release notes](https://github.com/graphql-java/graphql-java/releases) - [Commits](https://github.com/graphql-java/graphql-java/compare/v21.0...v21.1) --- updated-dependencies: - dependency-name: com.graphql-java:graphql-java dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index f67e126..8d63c73 100644 --- a/build.gradle +++ b/build.gradle @@ -41,7 +41,7 @@ repositories { } dependencies { - implementation "com.graphql-java:graphql-java:21.0" + implementation "com.graphql-java:graphql-java:21.1" testImplementation 'org.spockframework:spock-core:1.3-groovy-2.5' testImplementation('org.codehaus.groovy:groovy:2.5.13') From 78e023f1282f64b439e3b6926fb404e74d5db481 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Sep 2023 16:35:34 +0000 Subject: [PATCH 04/13] Bump actions/checkout from 3 to 4 Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/master.yml | 2 +- .github/workflows/pull_request.yml | 2 +- .github/workflows/release.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index d80d5ef..093013c 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -13,7 +13,7 @@ jobs: MAVEN_CENTRAL_PGP_KEY: ${{ secrets.MAVEN_CENTRAL_PGP_KEY }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: gradle/wrapper-validation-action@v1 - name: Set up JDK 11 uses: actions/setup-java@v3 diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 31499de..70636b0 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -14,7 +14,7 @@ jobs: buildAndTest: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: gradle/wrapper-validation-action@v1 - name: Set up JDK 11 uses: actions/setup-java@v3 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6de60e8..0d1b866 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,7 +17,7 @@ jobs: RELEASE_VERSION: ${{ github.event.inputs.version }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: gradle/wrapper-validation-action@v1 - name: Set up JDK 11 uses: actions/setup-java@v3 From 462c76fd084509829dba30aae65ac982a0f9ca20 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Oct 2023 16:19:08 +0000 Subject: [PATCH 05/13] Bump com.graphql-java:graphql-java from 21.1 to 21.3 Bumps [com.graphql-java:graphql-java](https://github.com/graphql-java/graphql-java) from 21.1 to 21.3. - [Release notes](https://github.com/graphql-java/graphql-java/releases) - [Commits](https://github.com/graphql-java/graphql-java/compare/v21.1...v21.3) --- updated-dependencies: - dependency-name: com.graphql-java:graphql-java dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 8d63c73..06e428d 100644 --- a/build.gradle +++ b/build.gradle @@ -41,7 +41,7 @@ repositories { } dependencies { - implementation "com.graphql-java:graphql-java:21.1" + implementation "com.graphql-java:graphql-java:21.3" testImplementation 'org.spockframework:spock-core:1.3-groovy-2.5' testImplementation('org.codehaus.groovy:groovy:2.5.13') From 7c9b741db1616bb9ebbd1b263766a80903e2830a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Dec 2023 16:11:20 +0000 Subject: [PATCH 06/13] Bump actions/setup-java from 3 to 4 Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3 to 4. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/master.yml | 2 +- .github/workflows/pull_request.yml | 2 +- .github/workflows/release.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index d80d5ef..e31aaec 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/checkout@v3 - uses: gradle/wrapper-validation-action@v1 - name: Set up JDK 11 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '11' distribution: 'corretto' diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 31499de..1e3b835 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -17,7 +17,7 @@ jobs: - uses: actions/checkout@v3 - uses: gradle/wrapper-validation-action@v1 - name: Set up JDK 11 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '11' distribution: 'corretto' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6de60e8..ae7f726 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,7 +20,7 @@ jobs: - uses: actions/checkout@v3 - uses: gradle/wrapper-validation-action@v1 - name: Set up JDK 11 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '11' distribution: 'corretto' From 50a0b92e7e5b60ccc19c71d5b41f0e96e909e227 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Dec 2023 16:48:03 +0000 Subject: [PATCH 07/13] Bump org.codehaus.groovy:groovy from 2.5.13 to 3.0.20 Bumps [org.codehaus.groovy:groovy](https://github.com/apache/groovy) from 2.5.13 to 3.0.20. - [Commits](https://github.com/apache/groovy/commits) --- updated-dependencies: - dependency-name: org.codehaus.groovy:groovy dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 06e428d..f230fe8 100644 --- a/build.gradle +++ b/build.gradle @@ -44,7 +44,7 @@ dependencies { implementation "com.graphql-java:graphql-java:21.3" testImplementation 'org.spockframework:spock-core:1.3-groovy-2.5' - testImplementation('org.codehaus.groovy:groovy:2.5.13') + testImplementation('org.codehaus.groovy:groovy:3.0.20') } task sourcesJar(type: Jar, dependsOn: classes) { From be3a25f8913ff7891c8901143f4b08bf4491032f Mon Sep 17 00:00:00 2001 From: Sergei Shevlyagin Date: Wed, 27 Dec 2023 09:10:42 -0800 Subject: [PATCH 08/13] Update README.md with dgs links Added more DGS links to help initial setup --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 082ff1b..0885552 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,11 @@ public class GraphQlConfig { ### Netflix DGS -If you are using [Netflix DGS](https://netflix.github.io/dgs), please see their [configuration documentation](https://netflix.github.io/dgs/configuration/#dgs-extended-scalars-graphql-dgs-extended-scalars). +Note: Netflix also wraps this library in `com.netflix.graphql.dgs:graphql-dgs-extended-scalars` for [automatic registration](https://netflix.github.io/dgs/scalars/#automatically-register-scalar-extensions-via-graphql-dgs-extended-scalars). + +If you are using [Netflix DGS](https://netflix.github.io/dgs), please see the following docs: + - [registration through runtime wiring](https://netflix.github.io/dgs/scalars/#register-scalar-extensions-via-dgsruntimewiring) + - [configuration documentation](https://netflix.github.io/dgs/configuration/#dgs-extended-scalars-graphql-dgs-extended-scalars) ## How to add extended scalars to your schema From d9fbb5a290a4c96bb5ebdf7eb9d349168906095a Mon Sep 17 00:00:00 2001 From: dondonz <13839920+dondonz@users.noreply.github.com> Date: Wed, 3 Jan 2024 09:47:18 +0900 Subject: [PATCH 09/13] Update Groovy and corresponding Spock versions --- build.gradle | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index f230fe8..b2df26f 100644 --- a/build.gradle +++ b/build.gradle @@ -43,8 +43,8 @@ repositories { dependencies { implementation "com.graphql-java:graphql-java:21.3" - testImplementation 'org.spockframework:spock-core:1.3-groovy-2.5' - testImplementation('org.codehaus.groovy:groovy:3.0.20') + testImplementation "org.spockframework:spock-core:2.3-groovy-3.0" + testImplementation "org.codehaus.groovy:groovy:3.0.20" } task sourcesJar(type: Jar, dependsOn: classes) { @@ -63,6 +63,7 @@ artifacts { } test { + useJUnitPlatform() testLogging { exceptionFormat = 'full' } From c5acb26e26e68c283ebc0b918ca2376ab62559a8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Feb 2024 16:24:40 +0000 Subject: [PATCH 10/13] Bump gradle/wrapper-validation-action from 1 to 2 Bumps [gradle/wrapper-validation-action](https://github.com/gradle/wrapper-validation-action) from 1 to 2. - [Release notes](https://github.com/gradle/wrapper-validation-action/releases) - [Commits](https://github.com/gradle/wrapper-validation-action/compare/v1...v2) --- updated-dependencies: - dependency-name: gradle/wrapper-validation-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/master.yml | 2 +- .github/workflows/pull_request.yml | 2 +- .github/workflows/release.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index aea0e13..42f43cf 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -14,7 +14,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: gradle/wrapper-validation-action@v1 + - uses: gradle/wrapper-validation-action@v2 - name: Set up JDK 11 uses: actions/setup-java@v4 with: diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 4187edb..80cb5ac 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: gradle/wrapper-validation-action@v1 + - uses: gradle/wrapper-validation-action@v2 - name: Set up JDK 11 uses: actions/setup-java@v4 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 773bcd6..9d2a133 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,7 +18,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: gradle/wrapper-validation-action@v1 + - uses: gradle/wrapper-validation-action@v2 - name: Set up JDK 11 uses: actions/setup-java@v4 with: From e155037351987eca254e469eac041b8fa143f080 Mon Sep 17 00:00:00 2001 From: Brad Baker Date: Mon, 8 Apr 2024 08:46:58 +1000 Subject: [PATCH 11/13] start of a branch to update to 22 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index ea31b80..ef4be52 100644 --- a/build.gradle +++ b/build.gradle @@ -41,7 +41,7 @@ repositories { } dependencies { - implementation "com.graphql-java:graphql-java:21.3" + implementation "com.graphql-java:graphql-java:22.0-rc1" testImplementation "org.spockframework:spock-core:2.3-groovy-3.0" testImplementation "org.codehaus.groovy:groovy:3.0.20" From 9bac79a93d802113162b4edad3d0c483e4135464 Mon Sep 17 00:00:00 2001 From: dondonz <13839920+dondonz@users.noreply.github.com> Date: Tue, 16 Apr 2024 15:34:29 +1000 Subject: [PATCH 12/13] Update to 22.0 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index ef4be52..da51065 100644 --- a/build.gradle +++ b/build.gradle @@ -41,7 +41,7 @@ repositories { } dependencies { - implementation "com.graphql-java:graphql-java:22.0-rc1" + implementation "com.graphql-java:graphql-java:22.0" testImplementation "org.spockframework:spock-core:2.3-groovy-3.0" testImplementation "org.codehaus.groovy:groovy:3.0.20" From bdccedd3264e59e5c41426e2b5f29a56442c1494 Mon Sep 17 00:00:00 2001 From: dondonz <13839920+dondonz@users.noreply.github.com> Date: Tue, 16 Apr 2024 15:40:39 +1000 Subject: [PATCH 13/13] Update readme --- README.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 0885552..cd199f7 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Extended Scalars for graphql-java [![Build Status](https://github.com/graphql-java/graphql-java-extended-scalars/actions/workflows/master.yml/badge.svg)](https://github.com/graphql-java/graphql-java-extended-scalars/actions/workflows/master.yml) -[![Latest Release](https://img.shields.io/maven-central/v/com.graphql-java/graphql-java-extended-scalars?versionPrefix=21.)](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java-extended-scalars/) +[![Latest Release](https://img.shields.io/maven-central/v/com.graphql-java/graphql-java-extended-scalars?versionPrefix=22.)](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java-extended-scalars/) [![Latest Snapshot](https://img.shields.io/maven-central/v/com.graphql-java/graphql-java-extended-scalars?label=maven-central%20snapshot)](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java-extended-scalars/) [![MIT licensed](https://img.shields.io/badge/license-MIT-green)](https://github.com/graphql-java/graphql-java-extended-scalars/blob/master/LICENSE.md) @@ -23,7 +23,7 @@ You would use custom scalars when you want to describe more meaningful behavior To use this library put the following into your gradle config ```java -implementation 'com.graphql-java:graphql-java-extended-scalars:21.0' +implementation 'com.graphql-java:graphql-java-extended-scalars:22.0' ``` or the following into your Maven config @@ -32,17 +32,18 @@ or the following into your Maven config com.graphql-java graphql-java-extended-scalars - 21.0 + 22.0 ``` > Note: > -> use 21.0 or above for graphql-java 21.x and above +> use 22.0 or above for graphql-java 22.x and above +> +> use 21.0 for graphql-java 21.x > > use 20.2 for graphql-java 20.x > -> use 19.1 for graphql-java 19.x ## How to use extended scalars