Skip to content

Commit 3685647

Browse files
bbakermanbbakerman
committed
Merge remote-tracking branch 'origin/master' into dont-alllocate-NonNullableFieldValidator-all-the-time
# Conflicts: # src/main/java/graphql/execution/ExecutionStrategy.java # src/main/java/graphql/execution/SubscriptionExecutionStrategy.java
2 parents d472058 + 397c050 commit 3685647

78 files changed

Lines changed: 25993 additions & 235 deletions

File tree

Some content is hidden

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

‎.github/workflows/publish_commit.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Publish Commit SHA for performance testing
22
on:
3-
pull_request:
3+
pull_request_target:
44
types:
55
- closed
66
branches:
@@ -12,10 +12,11 @@ permissions:
1212
contents: read # This is required for actions/checkout
1313
jobs:
1414
publishCommit:
15+
if: github.event.pull_request.merged == true
1516
runs-on: ubuntu-latest
1617
steps:
1718
- uses: aws-actions/configure-aws-credentials@v4
1819
with:
1920
role-to-assume: arn:aws:iam::637423498965:role/GitHubActionGrahQLJava
2021
aws-region: "ap-southeast-2"
21-
- run: aws sns publish --topic-arn "arn:aws:sns:ap-southeast-2:637423498965:graphql-java-commits.fifo" --message $GITHUB_SHA --message-group-id "graphql-java-commits"
22+
- run: aws sns publish --topic-arn "arn:aws:sns:ap-southeast-2:637423498965:graphql-java-commits.fifo" --message $GITHUB_SHA --message-group-id "graphql-java-commits"

‎build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -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
@@ -116,9 +116,9 @@ dependencies {
116116
testImplementation 'org.objenesis:objenesis:3.4'
117117
testImplementation 'org.apache.groovy:groovy:4.0.26"'
118118
testImplementation 'org.apache.groovy:groovy-json:4.0.26'
119-
testImplementation 'com.google.code.gson:gson:2.13.0'
119+
testImplementation 'com.google.code.gson:gson:2.13.1'
120120
testImplementation 'org.eclipse.jetty:jetty-server:11.0.25'
121-
testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.18.3'
121+
testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.19.0'
122122
testImplementation 'org.awaitility:awaitility-groovy:4.3.0'
123123
testImplementation 'com.github.javafaker:javafaker:1.0.2'
124124

@@ -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.*,*
179+
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,*
180180
''')
181181
}
182182

0 commit comments

Comments
 (0)