Skip to content

Commit 35562f1

Browse files
dondonzdondonz
committed
Merge branch 'master' into java-dataloader-update
2 parents 51bbb1a + 154bb89 commit 35562f1

104 files changed

Lines changed: 48731 additions & 806 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/commit_performance_result.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ jobs:
3333
echo "Performance results already present"
3434
exit 0
3535
fi
36+
git pull
3637
git commit -m "Add performance results for commit ${{ github.event.inputs.sha }}"
3738
git push
3839

‎.github/workflows/create_job.js‎

Lines changed: 0 additions & 77 deletions
This file was deleted.

‎.github/workflows/invoke_test_runner.yml‎

Lines changed: 0 additions & 58 deletions
This file was deleted.

‎.github/workflows/publish_commit.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
name: Publish Commit SHA for performance testing
22
on:
3-
push:
3+
pull_request:
4+
types:
5+
- closed
46
branches:
57
- master
8+
paths-ignore:
9+
- 'performance-results/**'
610
permissions:
711
id-token: write # This is required for requesting the JWT
812
contents: read # This is required for actions/checkout

‎.github/workflows/pull_request.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
pull_request:
88
branches:
99
- master
10+
- 23.x
1011
- 22.x
1112
- 21.x
1213
- 20.x

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ This is a [GraphQL](https://github.com/graphql/graphql-spec) Java implementation
77
Latest build in Maven central: https://repo1.maven.org/maven2/com/graphql-java/graphql-java/
88

99
[![Build](https://github.com/graphql-java/graphql-java/actions/workflows/master.yml/badge.svg)](https://github.com/graphql-java/graphql-java/actions/workflows/master.yml)
10-
[![Latest Release](https://img.shields.io/maven-central/v/com.graphql-java/graphql-java?versionPrefix=22.)](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java/)
10+
[![Latest Release](https://img.shields.io/maven-central/v/com.graphql-java/graphql-java?versionPrefix=23.)](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java/)
1111
[![Latest Snapshot](https://img.shields.io/maven-central/v/com.graphql-java/graphql-java?label=maven-central%20snapshot&versionPrefix=0)](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java/)
1212
[![MIT licensed](https://img.shields.io/badge/license-MIT-green)](https://github.com/graphql-java/graphql-java/blob/master/LICENSE.md)
1313

‎README.zh_cn.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
该组件是 [GraphQL 规范](https://github.com/graphql/graphql-spec) 的 Java 实现。
66

77
[![Build](https://github.com/graphql-java/graphql-java/actions/workflows/master.yml/badge.svg)](https://github.com/graphql-java/graphql-java/actions/workflows/master.yml)
8-
[![Latest Release](https://img.shields.io/maven-central/v/com.graphql-java/graphql-java?versionPrefix=20.)](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java/)
8+
[![Latest Release](https://img.shields.io/maven-central/v/com.graphql-java/graphql-java?versionPrefix=23.)](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java/)
99
[![Latest Snapshot](https://img.shields.io/maven-central/v/com.graphql-java/graphql-java?label=maven-central%20snapshot&versionPrefix=0)](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java/)
1010
[![MIT licensed](https://img.shields.io/badge/license-MIT-green)](https://github.com/graphql-java/graphql-java/blob/master/LICENSE.md)
1111

‎agent-test/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ plugins {
44

55
dependencies {
66
implementation(rootProject)
7-
implementation("net.bytebuddy:byte-buddy-agent:1.17.2")
7+
implementation("net.bytebuddy:byte-buddy-agent:1.17.5")
88

9-
testImplementation 'org.junit.jupiter:junit-jupiter:5.12.0'
9+
testImplementation 'org.junit.jupiter:junit-jupiter:5.12.1'
1010
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
1111

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

‎agent/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66
}
77

88
dependencies {
9-
implementation("net.bytebuddy:byte-buddy:1.17.2")
9+
implementation("net.bytebuddy:byte-buddy:1.17.5")
1010
// graphql-java itself
1111
implementation(rootProject)
1212
}

‎build.gradle‎

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,12 @@ jar {
9797
attributes('Automatic-Module-Name': 'com.graphqljava')
9898
}
9999
}
100-
100+
tasks.withType(GroovyCompile) {
101+
// Options when compiling Java using the Groovy plugin.
102+
// (Groovy itself defaults to UTF-8 for Groovy code)
103+
options.encoding = 'UTF-8'
104+
groovyOptions.forkOptions.memoryMaximumSize = "4g"
105+
}
101106
dependencies {
102107
implementation 'org.antlr:antlr4-runtime:' + antlrVersion
103108
api 'com.graphql-java:java-dataloader:4.0.0'
@@ -106,25 +111,29 @@ dependencies {
106111
antlr 'org.antlr:antlr4:' + antlrVersion
107112
implementation 'com.google.guava:guava:' + guavaVersion
108113
testImplementation group: 'junit', name: 'junit', version: '4.13.2'
109-
testImplementation 'org.spockframework:spock-core:2.0-groovy-3.0'
110-
testImplementation 'org.codehaus.groovy:groovy:3.0.24'
111-
testImplementation 'org.codehaus.groovy:groovy-json:3.0.24'
114+
testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'
115+
testImplementation 'net.bytebuddy:byte-buddy:1.17.5'
116+
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'
112119
testImplementation 'com.google.code.gson:gson:2.12.1'
113-
testImplementation 'org.eclipse.jetty:jetty-server:11.0.24'
120+
testImplementation 'org.eclipse.jetty:jetty-server:11.0.25'
114121
testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.18.3'
115-
testImplementation 'org.awaitility:awaitility-groovy:4.2.0'
122+
testImplementation 'org.awaitility:awaitility-groovy:4.3.0'
116123
testImplementation 'com.github.javafaker:javafaker:1.0.2'
117124

118125
testImplementation 'org.reactivestreams:reactive-streams-tck:' + reactiveStreamsVersion
119126
testImplementation "io.reactivex.rxjava2:rxjava:2.2.21"
120-
testImplementation "io.projectreactor:reactor-core:3.7.3"
127+
testImplementation "io.projectreactor:reactor-core:3.7.4"
121128

122129
testImplementation 'org.testng:testng:7.11.0' // use for reactive streams test inheritance
123130

124131
testImplementation 'org.openjdk.jmh:jmh-core:1.37'
125132
testAnnotationProcessor 'org.openjdk.jmh:jmh-generator-annprocess:1.37'
126133
jmh 'org.openjdk.jmh:jmh-core:1.37'
127134
jmh 'org.openjdk.jmh:jmh-generator-annprocess:1.37'
135+
136+
testImplementation "com.tngtech.archunit:archunit-junit5:1.2.0"
128137
}
129138

130139
shadowJar {
@@ -218,9 +227,9 @@ generateGrammarSource {
218227
outputDirectory = file("${project.buildDir}/generated-src/antlr/main/graphql/parser/antlr")
219228
}
220229
generateGrammarSource.inputs
221-
.dir('src/main/antlr')
222-
.withPropertyName('sourceDir')
223-
.withPathSensitivity(PathSensitivity.RELATIVE)
230+
.dir('src/main/antlr')
231+
.withPropertyName('sourceDir')
232+
.withPathSensitivity(PathSensitivity.RELATIVE)
224233

225234

226235
task sourcesJar(type: Jar) {

0 commit comments

Comments
 (0)