From 65c69c0e26979591681d8b4155db424fd3bb9dc3 Mon Sep 17 00:00:00 2001 From: dondonz <13839920+dondonz@users.noreply.github.com> Date: Mon, 19 Sep 2022 15:07:24 +1000 Subject: [PATCH 1/3] Update graphql-java version including patch for CVE-2022-37734 --- build.gradle | 2 +- readme.md | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 4544179..7deab44 100644 --- a/build.gradle +++ b/build.gradle @@ -41,7 +41,7 @@ repositories { dependencies { - compile "com.graphql-java:graphql-java:18.1" + compile "com.graphql-java:graphql-java:18.3" testImplementation 'org.spockframework:spock-core:1.3-groovy-2.5' testImplementation('org.codehaus.groovy:groovy:2.5.13') diff --git a/readme.md b/readme.md index def76bb..a827710 100644 --- a/readme.md +++ b/readme.md @@ -16,14 +16,14 @@ You would use custom scalars when you want to describe more meaningful behavior To use this library put the following into your gradle config - compile 'com.graphql-java:graphql-java-extended-scalars:17.0' + compile 'com.graphql-java:graphql-java-extended-scalars:18.2 or the following into your Maven config com.graphql-java graphql-java-extended-scalars - 17.0 + 18.2 > Note: @@ -35,6 +35,8 @@ or the following into your Maven config > use 16.0.0 or above for graphql-java 16.x and above > > use 17.0 or above for graphql-java 17.x and above +> +> use 18.0 or above for graphql-java 18.x and above It's currently available from Maven Central. From b07577eb8e6f3801055255939b14092cbcc54a63 Mon Sep 17 00:00:00 2001 From: dondonz <13839920+dondonz@users.noreply.github.com> Date: Mon, 19 Sep 2022 15:19:35 +1000 Subject: [PATCH 2/3] Add GitHub build workflow --- .github/workflows/pull_request.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 13a366a..f3bed2c 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -7,6 +7,10 @@ on: pull_request: branches: - master + - 19.x + - 18.x + - 17.x + jobs: buildAndTest: runs-on: ubuntu-latest From 8127529db7988f68270f6565b938d0cd2e2f74bf Mon Sep 17 00:00:00 2001 From: dondonz <13839920+dondonz@users.noreply.github.com> Date: Thu, 22 Sep 2022 10:57:01 +1000 Subject: [PATCH 3/3] Remove dashes from automatic-module-name --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 7deab44..474d07b 100644 --- a/build.gradle +++ b/build.gradle @@ -138,7 +138,7 @@ tasks.withType(PublishToMavenRepository) { jar { manifest { - attributes('Automatic-Module-Name': 'graphql-java-extended-scalars', + attributes('Automatic-Module-Name': 'com.graphqljava.extendedscalars', '-exportcontents': 'graphql.scalars.*', '-removeheaders': 'Private-Package') }