From a7b4f04095c8e02e6887154a0e292ca00dfcdf8c Mon Sep 17 00:00:00 2001
From: dondonz <13839920+dondonz@users.noreply.github.com>
Date: Tue, 13 May 2025 18:52:38 +1000
Subject: [PATCH 1/3] Add cherry pick of PR
 https://github.com/graphql-java/graphql-java/pull/3949

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 6cbf7cb9fa..4d62761297 100644
--- a/build.gradle
+++ b/build.gradle
@@ -178,7 +178,7 @@ shadowJar {
     bnd('''
 -exportcontents: graphql.*
 -removeheaders: Private-Package
-Import-Package: !android.os.*,!com.google.*,!org.checkerframework.*,!javax.annotation.*,!graphql.com.google.*,!org.antlr.*,!graphql.org.antlr.*,!sun.misc.*,*
+Import-Package: !android.os.*,!com.google.*,!org.checkerframework.*,!javax.annotation.*,!graphql.com.google.*,!org.antlr.*,!graphql.org.antlr.*,!sun.misc.*,org.jspecify.*;resolution:=optional,*
 ''')
 }
 

From 089a9d9c37423fd1c86b582ca1a4dad1df464257 Mon Sep 17 00:00:00 2001
From: dondonz <13839920+dondonz@users.noreply.github.com>
Date: Tue, 13 May 2025 18:53:43 +1000
Subject: [PATCH 2/3] Add cherry pick of my touch up PR
 https://github.com/graphql-java/graphql-java/pull/3959

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 4d62761297..b7dab2408c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -178,7 +178,7 @@ shadowJar {
     bnd('''
 -exportcontents: graphql.*
 -removeheaders: Private-Package
-Import-Package: !android.os.*,!com.google.*,!org.checkerframework.*,!javax.annotation.*,!graphql.com.google.*,!org.antlr.*,!graphql.org.antlr.*,!sun.misc.*,org.jspecify.*;resolution:=optional,*
+Import-Package: !android.os.*,!com.google.*,!org.checkerframework.*,!javax.annotation.*,!graphql.com.google.*,!org.antlr.*,!graphql.org.antlr.*,!sun.misc.*,org.jspecify.annotations;resolution:=optional,*
 ''')
 }
 

From 82d7c23aec45691078cea89ff8a1900769e7b28e Mon Sep 17 00:00:00 2001
From: dondonz <13839920+dondonz@users.noreply.github.com>
Date: Tue, 13 May 2025 18:55:14 +1000
Subject: [PATCH 3/3] Add 24.x to workflows list

---
 .github/workflows/pull_request.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 8a1bbfe82c..98a5a3e352 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -7,6 +7,7 @@ on:
   pull_request:
     branches:
       - master
+      - 24.x
       - 23.x
       - 22.x
       - 21.x