Skip to content

Commit 9186621

Browse files
bbakermanbbakerman
committed
Merge remote-tracking branch 'origin/master' into cancel-support-attempt-2
# Conflicts: # src/main/java/graphql/execution/ExecutionContext.java
2 parents add6558 + fa22b82 commit 9186621

File tree

139 files changed

+48447
-3337
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

139 files changed

+48447
-3337
lines changed

‎.github/workflows/master.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
steps:
1818
- uses: actions/checkout@v4
19-
- uses: gradle/wrapper-validation-action@v3
19+
- uses: gradle/actions/wrapper-validation@v4
2020
- name: Set up JDK 11
2121
uses: actions/setup-java@v4
2222
with:
@@ -25,7 +25,7 @@ jobs:
2525
- name: build test and publish
2626
run: ./gradlew assemble && ./gradlew check --info && ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository -x check --info --stacktrace
2727
- name: Publish Test Results
28-
uses: EnricoMi/publish-unit-test-result-action@v2.19.0
28+
uses: EnricoMi/publish-unit-test-result-action@v2.20.0
2929
if: always()
3030
with:
3131
files: '**/build/test-results/test/TEST-*.xml'

‎.github/workflows/pull_request.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
runs-on: ubuntu-latest
2121
steps:
2222
- uses: actions/checkout@v4
23-
- uses: gradle/wrapper-validation-action@v3
23+
- uses: gradle/actions/wrapper-validation@v4
2424
- name: Set up JDK 11
2525
uses: actions/setup-java@v4
2626
with:
@@ -29,7 +29,7 @@ jobs:
2929
- name: build and test
3030
run: ./gradlew assemble && ./gradlew check --info --stacktrace
3131
- name: Publish Test Results
32-
uses: EnricoMi/publish-unit-test-result-action@v2.19.0
32+
uses: EnricoMi/publish-unit-test-result-action@v2.20.0
3333
if: always()
3434
with:
3535
files: '**/build/test-results/test/TEST-*.xml'

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818

1919
steps:
2020
- uses: actions/checkout@v4
21-
- uses: gradle/wrapper-validation-action@v3
21+
- uses: gradle/actions/wrapper-validation@v4
2222
- name: Set up JDK 11
2323
uses: actions/setup-java@v4
2424
with:

‎agent-test/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ dependencies {
66
implementation(rootProject)
77
implementation("net.bytebuddy:byte-buddy-agent:1.17.5")
88

9-
testImplementation 'org.junit.jupiter:junit-jupiter:5.12.2'
9+
testImplementation 'org.junit.jupiter:junit-jupiter:5.13.0'
1010
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
1111

1212
testImplementation("org.assertj:assertj-core:3.27.3")

‎build.gradle‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ def getDevelopmentVersion() {
6464

6565
def reactiveStreamsVersion = '1.0.3'
6666
def releaseVersion = System.env.RELEASE_VERSION
67-
def antlrVersion = '4.11.1' // https://mvnrepository.com/artifact/org.antlr/antlr4-runtime
67+
def antlrVersion = '4.13.2' // https://mvnrepository.com/artifact/org.antlr/antlr4-runtime
6868
def guavaVersion = '32.1.2-jre'
6969
version = releaseVersion ? releaseVersion : getDevelopmentVersion()
7070
group = 'com.graphql-java'
@@ -105,7 +105,7 @@ tasks.withType(GroovyCompile) {
105105
}
106106
dependencies {
107107
implementation 'org.antlr:antlr4-runtime:' + antlrVersion
108-
api 'com.graphql-java:java-dataloader:4.0.0'
108+
api 'com.graphql-java:java-dataloader:5.0.0'
109109
api 'org.reactivestreams:reactive-streams:' + reactiveStreamsVersion
110110
api "org.jspecify:jspecify:1.0.0"
111111
antlr 'org.antlr:antlr4:' + antlrVersion
@@ -114,8 +114,8 @@ dependencies {
114114
testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'
115115
testImplementation 'net.bytebuddy:byte-buddy:1.17.5'
116116
testImplementation 'org.objenesis:objenesis:3.4'
117-
testImplementation 'org.apache.groovy:groovy:4.0.26"'
118-
testImplementation 'org.apache.groovy:groovy-json:4.0.26'
117+
testImplementation 'org.apache.groovy:groovy:4.0.27"'
118+
testImplementation 'org.apache.groovy:groovy-json:4.0.27'
119119
testImplementation 'com.google.code.gson:gson:2.13.1'
120120
testImplementation 'org.eclipse.jetty:jetty-server:11.0.25'
121121
testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.19.0'
@@ -124,10 +124,10 @@ dependencies {
124124

125125
testImplementation 'org.reactivestreams:reactive-streams-tck:' + reactiveStreamsVersion
126126
testImplementation "io.reactivex.rxjava2:rxjava:2.2.21"
127-
testImplementation "io.projectreactor:reactor-core:3.7.5"
127+
testImplementation "io.projectreactor:reactor-core:3.7.6"
128128

129129
testImplementation 'org.testng:testng:7.11.0' // use for reactive streams test inheritance
130-
testImplementation "com.tngtech.archunit:archunit-junit5:1.4.0"
130+
testImplementation "com.tngtech.archunit:archunit-junit5:1.4.1"
131131

132132
// this is needed for the idea jmh plugin to work correctly
133133
jmh 'org.openjdk.jmh:jmh-core:1.37'
@@ -176,7 +176,7 @@ shadowJar {
176176
bnd('''
177177
-exportcontents: graphql.*
178178
-removeheaders: Private-Package
179-
Import-Package: !android.os.*,!com.google.*,!org.checkerframework.*,!javax.annotation.*,!graphql.com.google.*,!org.antlr.*,!graphql.org.antlr.*,!sun.misc.*,org.jspecify.*;resolution:=optional,*
179+
Import-Package: !android.os.*,!com.google.*,!org.checkerframework.*,!graphql.com.google.*,!org.antlr.*,!graphql.org.antlr.*,!sun.misc.*,org.jspecify.annotations;resolution:=optional,*
180180
''')
181181
}
182182

0 commit comments

Comments
 (0)