Skip to content

Commit ddfbcd6

Browse files
authored
Merge branch 'master' into fix-4475-subscription-event-extensions
2 parents 8c1a50b + a6d8f0e commit ddfbcd6

111 files changed

Lines changed: 8903 additions & 3724 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 & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
commitPerformanceResults:
1818
runs-on: ubuntu-latest
1919
steps:
20-
- uses: aws-actions/configure-aws-credentials@v6.2.3
20+
- uses: aws-actions/configure-aws-credentials@v6.3.0
2121
with:
2222
role-to-assume: arn:aws:iam::637423498965:role/GitHubActionGrahQLJava
2323
aws-region: "ap-southeast-2"

‎.github/workflows/master.yml‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ jobs:
1414
include:
1515
- gradle-argument: 'assemble && ./gradlew check -x test -x testng'
1616
label: 'check'
17-
- gradle-argument: 'testWithJava11 testngWithJava11'
18-
label: 'java11'
19-
test-results-dirs: 'testWithJava11 testngWithJava11'
2017
- gradle-argument: 'testWithJava17 testngWithJava17'
2118
label: 'java17'
2219
test-results-dirs: 'testWithJava17 testngWithJava17'
@@ -32,7 +29,7 @@ jobs:
3229
- uses: actions/checkout@v6.0.2
3330
- uses: gradle/actions/wrapper-validation@v6
3431
- name: Set up JDK 25
35-
uses: actions/setup-java@v5.6.0
32+
uses: actions/setup-java@v6.1.0
3633
with:
3734
java-version: '25'
3835
distribution: 'corretto'
@@ -125,7 +122,7 @@ jobs:
125122
const path = require('path');
126123
const { parseJacocoXml } = require('./.github/scripts/parse-jacoco.js');
127124
128-
const versions = ['java11', 'java17', 'java21', 'java25', 'jcstress'];
125+
const versions = ['java17', 'java21', 'java25', 'jcstress'];
129126
const zeroTest = { total: 0, passed: 0, failed: 0, errors: 0, skipped: 0 };
130127
131128
// Read current baseline
@@ -136,13 +133,14 @@ jobs:
136133
}
137134
138135
// Update test stats from artifacts
139-
const tests = baseline.tests || {};
136+
const previousTests = baseline.tests || {};
137+
const tests = {};
140138
for (const v of versions) {
141139
const file = path.join('test-stats', `${v}.json`);
142140
if (fs.existsSync(file)) {
143141
tests[v] = JSON.parse(fs.readFileSync(file, 'utf8'));
144142
} else {
145-
tests[v] = tests[v] || zeroTest;
143+
tests[v] = previousTests[v] || zeroTest;
146144
}
147145
}
148146
@@ -167,7 +165,7 @@ jobs:
167165
- uses: actions/checkout@v6.0.2
168166
- uses: gradle/actions/wrapper-validation@v6
169167
- name: Set up JDK 25
170-
uses: actions/setup-java@v5.6.0
168+
uses: actions/setup-java@v6.1.0
171169
with:
172170
java-version: '25'
173171
distribution: 'corretto'
@@ -215,7 +213,7 @@ jobs:
215213
- uses: actions/checkout@v6.0.2
216214
- uses: gradle/actions/wrapper-validation@v6
217215
- name: Set up JDK 25
218-
uses: actions/setup-java@v5.6.0
216+
uses: actions/setup-java@v6.1.0
219217
with:
220218
java-version: '25'
221219
distribution: 'corretto'

‎.github/workflows/pr-report.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
6767
const { parseJacocoXml, pct, zeroCov, isRegression } = require('./.github/scripts/parse-jacoco.js');
6868
69-
const versions = ['java11', 'java17', 'java21', 'java25', 'jcstress'];
69+
const versions = ['java17', 'java21', 'java25', 'jcstress'];
7070
const zeroTest = { total: 0, passed: 0, failed: 0, errors: 0, skipped: 0 };
7171
7272
// --- Read current test stats from artifacts ---

‎.github/workflows/publish_commit.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
if: github.event.pull_request.merged == true
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: aws-actions/configure-aws-credentials@v6.2.3
18+
- uses: aws-actions/configure-aws-credentials@v6.3.0
1919
with:
2020
role-to-assume: arn:aws:iam::637423498965:role/GitHubActionGrahQLJava
2121
aws-region: "ap-southeast-2"

‎.github/workflows/pull_request.yml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ jobs:
2222
include:
2323
- gradle-argument: 'assemble && ./gradlew check -x test -x testng'
2424
label: 'check'
25-
- gradle-argument: 'testWithJava11 testngWithJava11'
26-
label: 'java11'
27-
test-results-dirs: 'testWithJava11 testngWithJava11'
2825
- gradle-argument: 'testWithJava17 testngWithJava17'
2926
label: 'java17'
3027
test-results-dirs: 'testWithJava17 testngWithJava17'
@@ -40,7 +37,7 @@ jobs:
4037
- uses: actions/checkout@v6.0.2
4138
- uses: gradle/actions/wrapper-validation@v6
4239
- name: Set up JDK 25
43-
uses: actions/setup-java@v5.6.0
40+
uses: actions/setup-java@v6.1.0
4441
with:
4542
java-version: '25'
4643
distribution: 'corretto'
@@ -219,7 +216,7 @@ jobs:
219216
- uses: actions/checkout@v6.0.2
220217
- uses: gradle/actions/wrapper-validation@v6
221218
- name: Set up JDK 25
222-
uses: actions/setup-java@v5.6.0
219+
uses: actions/setup-java@v6.1.0
223220
with:
224221
java-version: '25'
225222
distribution: 'corretto'

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- uses: actions/checkout@v6.0.2
2424
- uses: gradle/actions/wrapper-validation@v6
2525
- name: Set up JDK 25
26-
uses: actions/setup-java@v5.6.0
26+
uses: actions/setup-java@v6.1.0
2727
with:
2828
java-version: '25'
2929
distribution: 'corretto'

‎.github/workflows/static.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- name: Checkout
3232
uses: actions/checkout@v6.0.2
3333
- name: Set up JDK 25
34-
uses: actions/setup-java@v5.6.0
34+
uses: actions/setup-java@v6.1.0
3535
with:
3636
distribution: 'corretto'
3737
java-version: '25'

‎AGENTS.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,5 @@
1818
./gradlew test
1919
```
2020

21-
This runs tests on Java 25 only. Other JVM versions (11, 17, 21) require explicit tasks (e.g. `testWithJava11`).
21+
The library requires Java 17 or later; the build toolchain uses Java 25.
22+
This runs tests on Java 25 only. Other supported JVM versions (17, 21) require explicit tasks (e.g. `testWithJava17`).

‎README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ Discuss and ask questions in our Discussions: https://github.com/graphql-java/gr
44

55
This is a [GraphQL](https://github.com/graphql/graphql-spec) Java implementation.
66

7+
The current development version requires **Java 17 or later** to run. The Gradle build uses a JDK 25 toolchain.
8+
79
Latest build in Maven central: https://repo1.maven.org/maven2/com/graphql-java/graphql-java/
810

911
[![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)

‎README.zh_cn.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
该组件是 [GraphQL 规范](https://github.com/graphql/graphql-spec) 的 Java 实现。
66

7+
当前开发版本需要 **Java 17 或更高版本**才能运行。Gradle 构建使用 JDK 25 工具链。
8+
79
[![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)
810
[![Latest Release](https://img.shields.io/maven-central/v/com.graphql-java/graphql-java?versionPrefix=24.)](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java/)
911
[![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/)

0 commit comments

Comments
 (0)