Skip to content

Commit 7f50e1d

Browse files
mpkorstanjempkorstanje
committed
Merge remote-tracking branch 'origin/main' into reduce-mockito-usage-pass1
2 parents e82334c + 470cb03 commit 7f50e1d

File tree

43 files changed

+244
-108
lines changed

Some content is hidden

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

43 files changed

+244
-108
lines changed

‎.github/workflows/test-java.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ jobs:
3030
java-version: ${{ matrix.version }}
3131
cache: 'maven'
3232
- name: Install dependencies
33-
run: mvn 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
33+
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
3434
- name: Test
35-
run: mvn verify -Pinclude-extra-modules -D"style.color=always"
35+
run: ./mvnw verify -Pinclude-extra-modules -D"style.color=always"
3636
env:
3737
CUCUMBER_PUBLISH_TOKEN: ${{ secrets.CUCUMBER_PUBLISH_TOKEN }}
3838

@@ -47,9 +47,9 @@ jobs:
4747
java-version: '17'
4848
cache: 'maven'
4949
- name: Install dependencies
50-
run: mvn install -DskipTests=true -DskipITs=true -Darchetype.test.skip=true -Dmaven.javadoc.skip=true --batch-mode -Dstyle.color=always --show-version
50+
run: ./mvnw install -DskipTests=true -DskipITs=true -Darchetype.test.skip=true -Dmaven.javadoc.skip=true --batch-mode -Dstyle.color=always --show-version
5151
- name: Javadoc
52-
run: mvn javadoc:jar -Dstyle.color=always
52+
run: ./mvnw javadoc:jar -Dstyle.color=always
5353

5454
coverage:
5555
name: 'Coverage'
@@ -62,9 +62,9 @@ jobs:
6262
java-version: '17'
6363
cache: 'maven'
6464
- name: Install dependencies
65-
run: mvn install -Pinclude-extra-modules -DskipTests=true -DskipITs=true -Darchetype.test.skip=true -Dmaven.javadoc.skip=true --batch-mode -Dstyle.color=always --show-version
65+
run: ./mvnw install -Pinclude-extra-modules -DskipTests=true -DskipITs=true -Darchetype.test.skip=true -Dmaven.javadoc.skip=true --batch-mode -Dstyle.color=always --show-version
6666
- name: Test (Coverage)
67-
run: mvn jacoco:prepare-agent verify jacoco:report -Pinclude-extra-modules -Dstyle.color=always
67+
run: ./mvnw jacoco:prepare-agent verify jacoco:report -Pinclude-extra-modules -Dstyle.color=always
6868
- uses: codecov/codecov-action@v3
6969
with:
7070
fail_ci_if_error: true
@@ -82,6 +82,6 @@ jobs:
8282
java-version: '17'
8383
cache: 'maven'
8484
- name: Install dependencies
85-
run: mvn install -DskipTests=true -DskipITs=true -Darchetype.test.skip=true -Dmaven.javadoc.skip=true --batch-mode -Dstyle.color=always --show-version
85+
run: ./mvnw install -DskipTests=true -DskipITs=true -Darchetype.test.skip=true -Dmaven.javadoc.skip=true --batch-mode -Dstyle.color=always --show-version
8686
- name: Test (Semver check)
87-
run: mvn verify -Pcheck-semantic-version -DskipTests=true -DskipITs=true -Darchetype.test.skip=true -Dstyle.color=always
87+
run: ./mvnw verify -Pcheck-semantic-version -DskipTests=true -DskipITs=true -Darchetype.test.skip=true -Dstyle.color=always

‎.mvn/wrapper/maven-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
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.3/apache-maven-3.9.3-bin.zip
17+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.4/apache-maven-3.9.4-bin.zip
1818
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar

‎.revapi/api-changes.json

Lines changed: 154 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -495,6 +495,160 @@
495495
"code": "java.class.externalClassExposedInAPI",
496496
"new": "interface io.cucumber.core.eventbus.UuidGenerator",
497497
"justification": "Part of cucumber API"
498+
},
499+
{
500+
"ignore": true,
501+
"code": "java.annotation.attributeValueChanged",
502+
"old": "method org.junit.platform.engine.support.hierarchical.ThrowableCollector.Factory org.junit.platform.engine.support.hierarchical.HierarchicalTestEngine<C extends org.junit.platform.engine.support.hierarchical.EngineExecutionContext>::createThrowableCollectorFactory(org.junit.platform.engine.ExecutionRequest) @ io.cucumber.junit.platform.engine.CucumberTestEngine",
503+
"new": "method org.junit.platform.engine.support.hierarchical.ThrowableCollector.Factory org.junit.platform.engine.support.hierarchical.HierarchicalTestEngine<C extends org.junit.platform.engine.support.hierarchical.EngineExecutionContext>::createThrowableCollectorFactory(org.junit.platform.engine.ExecutionRequest) @ io.cucumber.junit.platform.engine.CucumberTestEngine",
504+
"annotationType": "org.apiguardian.api.API",
505+
"attribute": "status",
506+
"oldValue": "org.apiguardian.api.API.Status.EXPERIMENTAL",
507+
"newValue": "org.apiguardian.api.API.Status.STABLE",
508+
"justification": "API consumed from JUnit 5"
509+
},
510+
{
511+
"ignore": true,
512+
"code": "java.annotation.attributeValueChanged",
513+
"old": "method org.junit.platform.engine.support.hierarchical.ThrowableCollector.Factory org.junit.platform.engine.support.hierarchical.HierarchicalTestEngine<C extends org.junit.platform.engine.support.hierarchical.EngineExecutionContext>::createThrowableCollectorFactory(org.junit.platform.engine.ExecutionRequest) @ io.cucumber.junit.platform.engine.CucumberTestEngine",
514+
"new": "method org.junit.platform.engine.support.hierarchical.ThrowableCollector.Factory org.junit.platform.engine.support.hierarchical.HierarchicalTestEngine<C extends org.junit.platform.engine.support.hierarchical.EngineExecutionContext>::createThrowableCollectorFactory(org.junit.platform.engine.ExecutionRequest) @ io.cucumber.junit.platform.engine.CucumberTestEngine",
515+
"annotationType": "org.apiguardian.api.API",
516+
"attribute": "since",
517+
"oldValue": "\"1.3\"",
518+
"newValue": "\"1.10\"",
519+
"justification": "API consumed from JUnit 5"
520+
},
521+
{
522+
"ignore": true,
523+
"code": "java.annotation.attributeValueChanged",
524+
"old": "interface org.junit.platform.engine.EngineDiscoveryListener",
525+
"new": "interface org.junit.platform.engine.EngineDiscoveryListener",
526+
"annotationType": "org.apiguardian.api.API",
527+
"attribute": "status",
528+
"oldValue": "org.apiguardian.api.API.Status.EXPERIMENTAL",
529+
"newValue": "org.apiguardian.api.API.Status.STABLE",
530+
"justification": "API consumed from JUnit 5"
531+
},
532+
{
533+
"ignore": true,
534+
"code": "java.annotation.attributeValueChanged",
535+
"old": "interface org.junit.platform.engine.EngineDiscoveryListener",
536+
"new": "interface org.junit.platform.engine.EngineDiscoveryListener",
537+
"annotationType": "org.apiguardian.api.API",
538+
"attribute": "since",
539+
"oldValue": "\"1.6\"",
540+
"newValue": "\"1.10\"",
541+
"justification": "API consumed from JUnit 5"
542+
},
543+
{
544+
"ignore": true,
545+
"code": "java.annotation.attributeValueChanged",
546+
"old": "method org.junit.platform.engine.EngineDiscoveryListener org.junit.platform.engine.EngineDiscoveryRequest::getDiscoveryListener()",
547+
"new": "method org.junit.platform.engine.EngineDiscoveryListener org.junit.platform.engine.EngineDiscoveryRequest::getDiscoveryListener()",
548+
"annotationType": "org.apiguardian.api.API",
549+
"attribute": "status",
550+
"oldValue": "org.apiguardian.api.API.Status.EXPERIMENTAL",
551+
"newValue": "org.apiguardian.api.API.Status.STABLE",
552+
"justification": "API consumed from JUnit 5"
553+
},
554+
{
555+
"ignore": true,
556+
"code": "java.annotation.attributeValueChanged",
557+
"old": "method org.junit.platform.engine.EngineDiscoveryListener org.junit.platform.engine.EngineDiscoveryRequest::getDiscoveryListener()",
558+
"new": "method org.junit.platform.engine.EngineDiscoveryListener org.junit.platform.engine.EngineDiscoveryRequest::getDiscoveryListener()",
559+
"annotationType": "org.apiguardian.api.API",
560+
"attribute": "since",
561+
"oldValue": "\"1.6\"",
562+
"newValue": "\"1.10\"",
563+
"justification": "API consumed from JUnit 5"
564+
},
565+
{
566+
"ignore": true,
567+
"code": "java.annotation.attributeValueChanged",
568+
"old": "class org.junit.platform.engine.SelectorResolutionResult",
569+
"new": "class org.junit.platform.engine.SelectorResolutionResult",
570+
"annotationType": "org.apiguardian.api.API",
571+
"attribute": "status",
572+
"oldValue": "org.apiguardian.api.API.Status.EXPERIMENTAL",
573+
"newValue": "org.apiguardian.api.API.Status.STABLE",
574+
"justification": "API consumed from JUnit 5"
575+
},
576+
{
577+
"ignore": true,
578+
"code": "java.annotation.attributeValueChanged",
579+
"old": "class org.junit.platform.engine.SelectorResolutionResult",
580+
"new": "class org.junit.platform.engine.SelectorResolutionResult",
581+
"annotationType": "org.apiguardian.api.API",
582+
"attribute": "since",
583+
"oldValue": "\"1.6\"",
584+
"newValue": "\"1.10\"",
585+
"justification": "API consumed from JUnit 5"
586+
},
587+
{
588+
"ignore": true,
589+
"code": "java.annotation.attributeValueChanged",
590+
"old": "method org.junit.platform.engine.UniqueId org.junit.platform.engine.UniqueId::appendEngine(java.lang.String)",
591+
"new": "method org.junit.platform.engine.UniqueId org.junit.platform.engine.UniqueId::appendEngine(java.lang.String)",
592+
"annotationType": "org.apiguardian.api.API",
593+
"attribute": "status",
594+
"oldValue": "org.apiguardian.api.API.Status.EXPERIMENTAL",
595+
"newValue": "org.apiguardian.api.API.Status.STABLE",
596+
"justification": "API consumed from JUnit 5"
597+
},
598+
{
599+
"ignore": true,
600+
"code": "java.annotation.attributeValueChanged",
601+
"old": "method org.junit.platform.engine.UniqueId org.junit.platform.engine.UniqueId::appendEngine(java.lang.String)",
602+
"new": "method org.junit.platform.engine.UniqueId org.junit.platform.engine.UniqueId::appendEngine(java.lang.String)",
603+
"annotationType": "org.apiguardian.api.API",
604+
"attribute": "since",
605+
"oldValue": "\"1.8\"",
606+
"newValue": "\"1.10\"",
607+
"justification": "API consumed from JUnit 5"
608+
},
609+
{
610+
"ignore": true,
611+
"code": "java.annotation.attributeValueChanged",
612+
"old": "enum org.junit.platform.engine.support.hierarchical.Node.ExecutionMode",
613+
"new": "enum org.junit.platform.engine.support.hierarchical.Node.ExecutionMode",
614+
"annotationType": "org.apiguardian.api.API",
615+
"attribute": "status",
616+
"oldValue": "org.apiguardian.api.API.Status.EXPERIMENTAL",
617+
"newValue": "org.apiguardian.api.API.Status.STABLE",
618+
"justification": "API consumed from JUnit 5"
619+
},
620+
{
621+
"ignore": true,
622+
"code": "java.annotation.attributeValueChanged",
623+
"old": "enum org.junit.platform.engine.support.hierarchical.Node.ExecutionMode",
624+
"new": "enum org.junit.platform.engine.support.hierarchical.Node.ExecutionMode",
625+
"annotationType": "org.apiguardian.api.API",
626+
"attribute": "since",
627+
"oldValue": "\"1.3\"",
628+
"newValue": "\"1.10\"",
629+
"justification": "API consumed from JUnit 5"
630+
},
631+
{
632+
"ignore": true,
633+
"code": "java.annotation.attributeValueChanged",
634+
"old": "interface org.junit.platform.engine.support.hierarchical.ResourceLock",
635+
"new": "interface org.junit.platform.engine.support.hierarchical.ResourceLock",
636+
"annotationType": "org.apiguardian.api.API",
637+
"attribute": "status",
638+
"oldValue": "org.apiguardian.api.API.Status.EXPERIMENTAL",
639+
"newValue": "org.apiguardian.api.API.Status.STABLE",
640+
"justification": "API consumed from JUnit 5"
641+
},
642+
{
643+
"ignore": true,
644+
"code": "java.annotation.attributeValueChanged",
645+
"old": "interface org.junit.platform.engine.support.hierarchical.ResourceLock",
646+
"new": "interface org.junit.platform.engine.support.hierarchical.ResourceLock",
647+
"annotationType": "org.apiguardian.api.API",
648+
"attribute": "since",
649+
"oldValue": "\"1.3\"",
650+
"newValue": "\"1.10\"",
651+
"justification": "API consumed from JUnit 5"
498652
}
499653
]
500654
}

‎.versions/rules.xml

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

‎compatibility/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<artifactId>cucumber-jvm</artifactId>
66
<groupId>io.cucumber</groupId>
7-
<version>7.13.1-SNAPSHOT</version>
7+
<version>7.14.0-SNAPSHOT</version>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>
1010

@@ -14,7 +14,7 @@
1414
<properties>
1515
<hamcrest.version>2.2</hamcrest.version>
1616
<jackson.version>2.15.2</jackson.version>
17-
<junit-jupiter.version>5.9.3</junit-jupiter.version>
17+
<junit-jupiter.version>5.10.0</junit-jupiter.version>
1818
</properties>
1919

2020
<dependencyManagement>

‎cucumber-archetype/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>io.cucumber</groupId>
88
<artifactId>cucumber-jvm</artifactId>
9-
<version>7.13.1-SNAPSHOT</version>
9+
<version>7.14.0-SNAPSHOT</version>
1010
</parent>
1111

1212
<artifactId>cucumber-archetype</artifactId>
@@ -15,7 +15,7 @@
1515
<description>Cucumber JVM: Maven Archetype</description>
1616

1717
<properties>
18-
<junit-jupiter.version>5.9.3</junit-jupiter.version>
18+
<junit-jupiter.version>5.10.0</junit-jupiter.version>
1919
<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
2020
<maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
2121
</properties>

0 commit comments

Comments
 (0)