Skip to content

Commit 445d6f7

Browse files
mpkorstanjempkorstanje
committed
Merge remote-tracking branch 'origin/main' into reduce-mockito-usage-pass1
2 parents 56ea5b3 + 9103f3a commit 445d6f7

File tree

336 files changed

+9054
-9381
lines changed

Some content is hidden

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

336 files changed

+9054
-9381
lines changed

‎.github/renovate.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@
55
],
66
"packageRules": [
77
{
8-
"matchPackagePatterns": ["io.cucumber:(messages|gherkin|html-formatter|junit-xml-formatter)"],
9-
"groupName": "Messages and dependants"
8+
"groupName": "Messages and dependants",
9+
"matchPackageNames": [
10+
"/io.cucumber:(messages|gherkin|query|html-formatter|junit-xml-formatter|testng-xml-formatter|pretty-formatter|cucumber-json-formatter)/"
11+
]
1012
}
1113
]
1214
}

‎.github/workflows/release-github.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
permissions:
1313
contents: write
1414
steps:
15-
- uses: actions/checkout@v4
15+
- uses: actions/checkout@v5
1616
- uses: cucumber/action-create-github-release@v1.1.1
1717
with:
1818
github-token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/release-java.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ jobs:
1010
runs-on: ubuntu-latest
1111
environment: Release
1212
steps:
13-
- uses: actions/checkout@v4
14-
- uses: actions/setup-java@v4
13+
- uses: actions/checkout@v5
14+
- uses: actions/setup-java@v5
1515
with:
16-
distribution: 'zulu'
16+
distribution: 'temurin'
1717
java-version: '17'
1818
cache: 'maven'
19-
- uses: cucumber/action-publish-mvn@v2.0.0
19+
- uses: cucumber/action-publish-mvn@v3.0.0
2020
with:
2121
gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
2222
gpg-passphrase: ${{ secrets.GPG_PASSPHRASE }}

‎.github/workflows/test-java.yml‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,33 +17,32 @@ on:
1717
jobs:
1818
build:
1919
strategy:
20+
fail-fast: true
2021
matrix:
2122
os: [ ubuntu-latest, windows-latest ]
2223
version: [ 17, 21 ]
2324
name: 'Build Java ${{ matrix.version }} - ${{ matrix.os }}'
2425
runs-on: ${{ matrix.os }}
2526
steps:
26-
- uses: actions/checkout@v4
27-
- uses: actions/setup-java@v4
27+
- uses: actions/checkout@v5
28+
- uses: actions/setup-java@v5
2829
with:
29-
distribution: 'zulu'
30+
distribution: 'temurin'
3031
java-version: ${{ matrix.version }}
3132
cache: 'maven'
3233
- name: Install dependencies
3334
run: ./mvnw install -Pinclude-extra-modules -DskipTests=true -DskipITs=true -D"archetype.test.skip=true" -D"maven.javadoc.skip=true" --batch-mode -D"style.color=always" --show-version
3435
- name: Test
3536
run: ./mvnw verify -Pinclude-extra-modules -D"style.color=always"
36-
env:
37-
CUCUMBER_PUBLISH_TOKEN: ${{ secrets.CUCUMBER_PUBLISH_TOKEN }}
3837

3938
javadoc:
4039
name: 'Javadoc'
4140
runs-on: ubuntu-latest
4241
steps:
43-
- uses: actions/checkout@v4
44-
- uses: actions/setup-java@v4
42+
- uses: actions/checkout@v5
43+
- uses: actions/setup-java@v5
4544
with:
46-
distribution: 'zulu'
45+
distribution: 'temurin'
4746
java-version: '17'
4847
cache: 'maven'
4948
- name: Install dependencies
@@ -55,10 +54,10 @@ jobs:
5554
name: 'Semver'
5655
runs-on: ubuntu-latest
5756
steps:
58-
- uses: actions/checkout@v4
59-
- uses: actions/setup-java@v4
57+
- uses: actions/checkout@v5
58+
- uses: actions/setup-java@v5
6059
with:
61-
distribution: 'zulu'
60+
distribution: 'temurin'
6261
java-version: '17'
6362
cache: 'maven'
6463
- name: Install dependencies

‎.github/workflows/test-testdata.yml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: test-testdata
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
- renovate/**
8+
paths:
9+
- compatibility/src/test/resources/**
10+
- .github/**
11+
pull_request:
12+
branches:
13+
- main
14+
paths:
15+
- compatibility/src/test/resources/**
16+
- .github/**
17+
18+
jobs:
19+
test-testdata:
20+
runs-on: ubuntu-latest
21+
22+
steps:
23+
24+
- uses: actions/checkout@v5
25+
26+
- uses: actions/setup-node@v6
27+
with:
28+
cache: 'npm'
29+
cache-dependency-path: compatibility/src/test/resources
30+
31+
- run: npm ci
32+
working-directory: compatibility/src/test/resources
33+
34+
- name: check repository is not dirty
35+
run: "[[ -z $(git status --porcelain) ]]"
36+
37+
- name: show diff
38+
if: ${{ failure() }}
39+
run: git status --porcelain

‎.mvn/wrapper/maven-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@
1414
# KIND, either express or implied. See the License for the
1515
# specific language governing permissions and limitations
1616
# under the License.
17-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
17+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip

‎.revapi/api-changes.json‎

Lines changed: 67 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -328,22 +328,84 @@
328328
"ignore": true,
329329
"configuration": {
330330
"differences": [
331+
{
332+
"ignore": true,
333+
"code": "java.annotation.attributeValueChanged",
334+
"old": "method org.junit.platform.engine.reporting.OutputDirectoryProvider org.junit.platform.engine.EngineDiscoveryRequest::getOutputDirectoryProvider()",
335+
"new": "method org.junit.platform.engine.reporting.OutputDirectoryProvider org.junit.platform.engine.EngineDiscoveryRequest::getOutputDirectoryProvider()",
336+
"annotationType": "org.apiguardian.api.API",
337+
"attribute": "status",
338+
"oldValue": "org.apiguardian.api.API.Status.MAINTAINED",
339+
"newValue": "org.apiguardian.api.API.Status.DEPRECATED",
340+
"justification": "API consumed from JUnit 5"
341+
},
342+
{
343+
"ignore": true,
344+
"code": "java.annotation.attributeValueChanged",
345+
"old": "method org.junit.platform.engine.reporting.OutputDirectoryProvider org.junit.platform.engine.EngineDiscoveryRequest::getOutputDirectoryProvider()",
346+
"new": "method org.junit.platform.engine.reporting.OutputDirectoryProvider org.junit.platform.engine.EngineDiscoveryRequest::getOutputDirectoryProvider()",
347+
"annotationType": "org.apiguardian.api.API",
348+
"attribute": "since",
349+
"oldValue": "\"1.13.3\"",
350+
"newValue": "\"1.14\"",
351+
"justification": "API consumed from JUnit 5"
352+
},
353+
{
354+
"ignore": true,
355+
"code": "java.method.parameterTypeChanged",
356+
"old": "parameter org.junit.platform.engine.ExecutionRequest org.junit.platform.engine.ExecutionRequest::create(org.junit.platform.engine.TestDescriptor, org.junit.platform.engine.EngineExecutionListener, org.junit.platform.engine.ConfigurationParameters, ===org.junit.platform.engine.reporting.OutputDirectoryProvider===, org.junit.platform.engine.support.store.NamespacedHierarchicalStore<org.junit.platform.engine.support.store.Namespace>)",
357+
"new": "parameter org.junit.platform.engine.ExecutionRequest org.junit.platform.engine.ExecutionRequest::create(org.junit.platform.engine.TestDescriptor, org.junit.platform.engine.EngineExecutionListener, org.junit.platform.engine.ConfigurationParameters, ===org.junit.platform.engine.OutputDirectoryCreator===, org.junit.platform.engine.support.store.NamespacedHierarchicalStore<org.junit.platform.engine.support.store.Namespace>)",
358+
"parameterIndex": "3",
359+
"justification": "API consumed from JUnit 5"
360+
},
361+
{
362+
"ignore": true,
363+
"code": "java.annotation.attributeValueChanged",
364+
"old": "method org.junit.platform.engine.reporting.OutputDirectoryProvider org.junit.platform.engine.ExecutionRequest::getOutputDirectoryProvider()",
365+
"new": "method org.junit.platform.engine.reporting.OutputDirectoryProvider org.junit.platform.engine.ExecutionRequest::getOutputDirectoryProvider()",
366+
"annotationType": "org.apiguardian.api.API",
367+
"attribute": "status",
368+
"oldValue": "org.apiguardian.api.API.Status.MAINTAINED",
369+
"newValue": "org.apiguardian.api.API.Status.DEPRECATED",
370+
"justification": "API consumed from JUnit 5"
371+
},
372+
{
373+
"ignore": true,
374+
"code": "java.annotation.attributeValueChanged",
375+
"old": "method org.junit.platform.engine.reporting.OutputDirectoryProvider org.junit.platform.engine.ExecutionRequest::getOutputDirectoryProvider()",
376+
"new": "method org.junit.platform.engine.reporting.OutputDirectoryProvider org.junit.platform.engine.ExecutionRequest::getOutputDirectoryProvider()",
377+
"annotationType": "org.apiguardian.api.API",
378+
"attribute": "since",
379+
"oldValue": "\"1.13.3\"",
380+
"newValue": "\"1.14\"",
381+
"justification": "API consumed from JUnit 5"
382+
},
331383
{
332384
"ignore": true,
333385
"code": "java.class.externalClassExposedInAPI",
334-
"new": "class org.junit.platform.engine.support.hierarchical.ExclusiveResource",
386+
"new": "interface org.junit.platform.engine.OutputDirectoryCreator",
335387
"justification": "API consumed from JUnit 5"
336388
},
337389
{
338390
"ignore": true,
339-
"code": "java.method.addedToInterface",
340-
"new": "method java.util.List<org.junit.platform.engine.support.hierarchical.ExclusiveResource> org.junit.platform.engine.support.hierarchical.ResourceLock::getResources()",
391+
"code": "java.annotation.attributeValueChanged",
392+
"old": "interface org.junit.platform.engine.reporting.OutputDirectoryProvider",
393+
"new": "interface org.junit.platform.engine.reporting.OutputDirectoryProvider",
394+
"annotationType": "org.apiguardian.api.API",
395+
"attribute": "status",
396+
"oldValue": "org.apiguardian.api.API.Status.MAINTAINED",
397+
"newValue": "org.apiguardian.api.API.Status.DEPRECATED",
341398
"justification": "API consumed from JUnit 5"
342399
},
343400
{
344401
"ignore": true,
345-
"code": "java.method.addedToInterface",
346-
"new": "method boolean org.junit.platform.engine.support.hierarchical.ResourceLock::isExclusive()",
402+
"code": "java.annotation.attributeValueChanged",
403+
"old": "interface org.junit.platform.engine.reporting.OutputDirectoryProvider",
404+
"new": "interface org.junit.platform.engine.reporting.OutputDirectoryProvider",
405+
"annotationType": "org.apiguardian.api.API",
406+
"attribute": "since",
407+
"oldValue": "\"1.13.3\"",
408+
"newValue": "\"1.14\"",
347409
"justification": "API consumed from JUnit 5"
348410
}
349411
]

0 commit comments

Comments
 (0)