Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion compatibility/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<properties>
<hamcrest.version>3.0</hamcrest.version>
<jackson.version>2.20.0</jackson.version>
<junit-jupiter.version>5.13.4</junit-jupiter.version>
<junit-jupiter.version>6.0.0-RC3</junit-jupiter.version>
Copy link
Contributor Author

@mpkorstanje mpkorstanje Sep 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note to self: Make a separate branch to check 5.14 (any RC, when released) against

  • main
  • against the changes in this branch

<project.Automatic-Module-Name>io.cucumber.compatibility</project.Automatic-Module-Name>
</properties>

Expand Down
4 changes: 2 additions & 2 deletions cucumber-archetype/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
<description>Cucumber JVM: Maven Archetype</description>

<properties>
<junit-jupiter.version>5.13.4</junit-jupiter.version>
<junit-jupiter.version>6.0.0-RC3</junit-jupiter.version>
<assertj.version>3.27.6</assertj.version>
<maven-compiler-plugin.version>3.14.1</maven-compiler-plugin.version>
<maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
<maven-surefire-plugin.version>3.5.4</maven-surefire-plugin.version>
</properties>

Expand Down
2 changes: 1 addition & 1 deletion cucumber-cdi2/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<openwebbeans.version>2.0.28</openwebbeans.version>
<weld-se-core.version>3.1.9.Final</weld-se-core.version>
<apiguardian-api.version>1.1.2</apiguardian-api.version>
<junit-jupiter.version>5.13.4</junit-jupiter.version>
<junit-jupiter.version>6.0.0-RC3</junit-jupiter.version>
<hamcrest.version>2.2</hamcrest.version>
</properties>

Expand Down
2 changes: 1 addition & 1 deletion cucumber-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<apiguardian-api.version>1.1.2</apiguardian-api.version>
<jackson.version>2.20.0</jackson.version>
<jsoup.version>1.21.2</jsoup.version>
<junit-jupiter.version>5.13.4</junit-jupiter.version>
<junit-jupiter.version>6.0.0-RC3</junit-jupiter.version>
<xmlunit.version>2.10.4</xmlunit.version>
<hamcrest.version>3.0</hamcrest.version>
<hamcrest-json.version>0.2</hamcrest-json.version>
Expand Down
2 changes: 1 addition & 1 deletion cucumber-deltaspike/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<apiguardian-api.version>1.1.2</apiguardian-api.version>
<cdi-api.version>2.0.SP1</cdi-api.version>
<deltaspike.version>1.9.6</deltaspike.version>
<junit-jupiter.version>5.13.4</junit-jupiter.version>
<junit-jupiter.version>6.0.0-RC3</junit-jupiter.version>
<project.Automatic-Module-Name>io.cucumber.deltaspike</project.Automatic-Module-Name>
</properties>

Expand Down
2 changes: 1 addition & 1 deletion cucumber-gherkin-messages/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</parent>

<properties>
<junit-jupiter.version>5.13.4</junit-jupiter.version>
<junit-jupiter.version>6.0.0-RC3</junit-jupiter.version>
<project.Automatic-Module-Name>io.cucumber.core.gherkin.messages</project.Automatic-Module-Name>
</properties>

Expand Down
2 changes: 1 addition & 1 deletion cucumber-gherkin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</parent>

<properties>
<junit-jupiter.version>5.13.4</junit-jupiter.version>
<junit-jupiter.version>6.0.0-RC3</junit-jupiter.version>
<project.Automatic-Module-Name>io.cucumber.core.gherkin</project.Automatic-Module-Name>
</properties>

Expand Down
2 changes: 1 addition & 1 deletion cucumber-guice/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<apiguardian-api.version>1.1.2</apiguardian-api.version>
<guice.version>7.0.0</guice.version>
<hamcrest.version>3.0</hamcrest.version>
<junit-jupiter.version>5.13.4</junit-jupiter.version>
<junit-jupiter.version>6.0.0-RC3</junit-jupiter.version>
<project.Automatic-Module-Name>io.cucumber.guice</project.Automatic-Module-Name>
<mockito.version>5.20.0</mockito.version>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion cucumber-jakarta-cdi/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<apiguardian-api.version>1.1.2</apiguardian-api.version>
<jakarta.enterprise.cdi-api.version>4.1.0</jakarta.enterprise.cdi-api.version>
<jakarta.activation-api.version>2.1.4</jakarta.activation-api.version>
<junit-jupiter.version>5.13.4</junit-jupiter.version>
<junit-jupiter.version>6.0.0-RC3</junit-jupiter.version>
<hamcrest.version>3.0</hamcrest.version>
<weld.version>5.1.6.Final</weld.version>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion cucumber-jakarta-openejb/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<properties>
<apiguardian-api.version>1.1.2</apiguardian-api.version>
<hamcrest.version>3.0</hamcrest.version>
<junit-jupiter.version>5.13.4</junit-jupiter.version>
<junit-jupiter.version>6.0.0-RC3</junit-jupiter.version>
<openejb-core.version>9.1.3</openejb-core.version>
<project.Automatic-Module-Name>io.cucumber.jakarta.openejb</project.Automatic-Module-Name>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion cucumber-java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<apiguardian-api.version>1.1.2</apiguardian-api.version>
<hamcrest.version>3.0</hamcrest.version>
<jackson.version>2.20.0</jackson.version>
<junit-jupiter.version>5.13.4</junit-jupiter.version>
<junit-jupiter.version>6.0.0-RC3</junit-jupiter.version>
<mockito.version>5.20.0</mockito.version>
</properties>

Expand Down
2 changes: 1 addition & 1 deletion cucumber-java8/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<project.Automatic-Module-Name>io.cucumber.java8</project.Automatic-Module-Name>
<apiguardian-api.version>1.1.2</apiguardian-api.version>
<hamcrest.version>3.0</hamcrest.version>
<junit-jupiter.version>5.13.4</junit-jupiter.version>
<junit-jupiter.version>6.0.0-RC3</junit-jupiter.version>
<mockito.version>5.20.0</mockito.version>
<typetools.version>0.6.3</typetools.version>
</properties>
Expand Down
10 changes: 9 additions & 1 deletion cucumber-junit-platform-engine/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<properties>
<hamcrest.version>3.0</hamcrest.version>
<junit-jupiter.version>5.13.4</junit-jupiter.version>
<junit-jupiter.version>6.0.0-RC3</junit-jupiter.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -92,6 +92,14 @@
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>17</source>
<target>17</target>
</configuration>
</plugin>
</plugins>
</build>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package io.cucumber.junit.platform.engine;

import org.junit.platform.commons.io.ResourceFilter;
import org.junit.platform.engine.EngineDiscoveryRequest;
import org.junit.platform.engine.support.discovery.DiscoveryIssueReporter;
import org.junit.platform.engine.support.discovery.EngineDiscoveryRequestResolver;
Expand All @@ -13,7 +14,7 @@ class DiscoverySelectorResolver {
.<CucumberEngineDescriptor> builder()
.addSelectorResolver(context -> new FileContainerSelectorResolver( //
path -> isFeature(path) || isTxtFile(path)))
.addResourceContainerSelectorResolver(resource -> isFeature(resource.getName()))
.addResourceContainerSelectorResolver(ResourceFilter.of(resource -> isFeature(resource.getName())))
.addSelectorResolver(context -> new FeatureWithLinesFileResolver())
.addSelectorResolver(context -> new FeatureFileResolver(
context.getEngineDescriptor().getConfiguration(), //
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import io.cucumber.junit.platform.engine.CucumberTestDescriptor.FeatureElementDescriptor.ScenarioOutlineDescriptor;
import io.cucumber.junit.platform.engine.CucumberTestDescriptor.PickleDescriptor;
import io.cucumber.plugin.event.Node;
import org.junit.platform.commons.support.Resource;
import org.junit.platform.commons.io.Resource;
import org.junit.platform.engine.DiscoveryIssue;
import org.junit.platform.engine.DiscoverySelector;
import org.junit.platform.engine.TestDescriptor;
Expand Down Expand Up @@ -140,7 +140,7 @@ public Resolution resolve(FileSelector selector, Context context) {

@Override
public Resolution resolve(ClasspathResourceSelector selector, Context context) {
Set<Resource> resources = selector.getClasspathResources();
Set<org.junit.platform.commons.io.Resource> resources = selector.getResources();
if (!resources.stream().allMatch(resource -> isFeature(resource.getName()))) {
return resolveClasspathResourceSelectorAsPackageSelector(selector);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@ Optional<Feature> parseResource(Path resource) {
return parseResource(new PathAdapter(resource));
}

Optional<Feature> parseResource(org.junit.platform.commons.support.Resource resource) {
Optional<Feature> parseResource(org.junit.platform.commons.io.Resource resource) {
return parseResource(new ResourceAdapter(resource));
}

private static class ResourceAdapter implements Resource {
private final org.junit.platform.commons.support.Resource resource;
private final org.junit.platform.commons.io.Resource resource;

public ResourceAdapter(org.junit.platform.commons.support.Resource resource) {
public ResourceAdapter(org.junit.platform.commons.io.Resource resource) {
this.resource = resource;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
import org.junit.platform.commons.support.Resource;
import org.junit.platform.commons.io.Resource;
import org.junit.platform.engine.DiscoveryIssue;
import org.junit.platform.engine.DiscoverySelector;
import org.junit.platform.engine.TestDescriptor;
Expand Down Expand Up @@ -75,6 +75,7 @@
import static org.junit.platform.engine.UniqueId.forEngine;
import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClasspathResource;
import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClasspathResourceByName;
import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClasspathRoots;
import static org.junit.platform.engine.discovery.DiscoverySelectors.selectDirectory;
import static org.junit.platform.engine.discovery.DiscoverySelectors.selectFile;
Expand Down Expand Up @@ -207,36 +208,16 @@ void warnWhenResourceSelectorIsUsedToSelectAPackage() {

@Test
void classpathResourceSelectorThrowIfDuplicateResources() {
class TestResource implements Resource {

private final String name;
private final File source;

TestResource(String name, File source) {
this.name = name;
this.source = source;
}

@Override
public String getName() {
return name;
}

@Override
public URI getUri() {
return source.toURI();
}
}
Set<Resource> resources = new LinkedHashSet<>(Arrays.asList(
new TestResource("io/cucumber/junit/platform/engine/single.feature",
new File("duplicate1.feature")),
new TestResource("io/cucumber/junit/platform/engine/single.feature",
new File("duplicate2.feature")),
new TestResource("io/cucumber/junit/platform/engine/single.feature",
new File("duplicate3.feature"))));
Resource.of("io/cucumber/junit/platform/engine/single.feature",
new File("duplicate1.feature").toURI()),
Resource.of("io/cucumber/junit/platform/engine/single.feature",
new File("duplicate2.feature").toURI()),
Resource.of("io/cucumber/junit/platform/engine/single.feature",
new File("duplicate3.feature").toURI())));

Throwable exception = EngineTestKit.engine(ENGINE_ID) //
.selectors(selectClasspathResource(resources)) //
.selectors(selectClasspathResourceByName(resources)) //
.discover() //
.getDiscoveryIssues() //
.get(0) //
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,6 @@ public Optional<Boolean> getBoolean(String key) {
return Optional.empty();
}

@Override
public int size() {
return 0;
}

@Override
public Set<String> keySet() {
return Collections.emptySet();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,6 @@ public Optional<Boolean> getBoolean(String key) {
return get(key, Boolean::valueOf);
}

@Override
public int size() {
return 0;
}

@Override
public Set<String> keySet() {
return parameters.keySet();
Expand Down
2 changes: 1 addition & 1 deletion cucumber-junit/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<properties>
<apiguardian-api.version>1.1.2</apiguardian-api.version>
<hamcrest.version>3.0</hamcrest.version>
<junit-jupiter.version>5.13.4</junit-jupiter.version>
<junit-jupiter.version>6.0.0-RC3</junit-jupiter.version>
<junit.version>4.13.2</junit.version>
<mockito.version>5.20.0</mockito.version>
<project.Automatic-Module-Name>io.cucumber.junit</project.Automatic-Module-Name>
Expand Down
2 changes: 1 addition & 1 deletion cucumber-kotlin-java8/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<properties>
<project.Automatic-Module-Name>io.cucumber.kotlin.java8</project.Automatic-Module-Name>
<kotlin.version>2.2.20</kotlin.version>
<junit-jupiter.version>5.13.4</junit-jupiter.version>
<junit-jupiter.version>6.0.0-RC3</junit-jupiter.version>
</properties>

<dependencyManagement>
Expand Down
2 changes: 1 addition & 1 deletion cucumber-openejb/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<properties>
<apiguardian-api.version>1.1.2</apiguardian-api.version>
<hamcrest.version>3.0</hamcrest.version>
<junit-jupiter.version>5.13.4</junit-jupiter.version>
<junit-jupiter.version>6.0.0-RC3</junit-jupiter.version>
<openejb-core.version>8.0.16</openejb-core.version>
<project.Automatic-Module-Name>io.cucumber.openejb</project.Automatic-Module-Name>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion cucumber-picocontainer/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<project.Automatic-Module-Name>io.cucumber.picocontainer</project.Automatic-Module-Name>
<picocontainer.version>2.15.2</picocontainer.version>
<apiguardian-api.version>1.1.2</apiguardian-api.version>
<junit-jupiter.version>5.13.4</junit-jupiter.version>
<junit-jupiter.version>6.0.0-RC3</junit-jupiter.version>
</properties>

<dependencyManagement>
Expand Down
2 changes: 1 addition & 1 deletion cucumber-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<description>Plugin interface for Cucumber-JVM</description>

<properties>
<junit-jupiter.version>5.13.4</junit-jupiter.version>
<junit-jupiter.version>6.0.0-RC3</junit-jupiter.version>
<apiguardian-api.version>1.1.2</apiguardian-api.version>
<project.Automatic-Module-Name>io.cucumber.plugin</project.Automatic-Module-Name>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion cucumber-spring/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<properties>
<apiguardian-api.version>1.1.2</apiguardian-api.version>
<hamcrest.version>3.0</hamcrest.version>
<junit-jupiter.version>5.13.4</junit-jupiter.version>
<junit-jupiter.version>6.0.0-RC3</junit-jupiter.version>
<spring.version>6.2.11</spring.version>
<project.Automatic-Module-Name>io.cucumber.spring</project.Automatic-Module-Name>
<mockito.version>5.20.0</mockito.version>
Expand Down
2 changes: 1 addition & 1 deletion datatable-matchers/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<apiguardian-api.version>1.1.2</apiguardian-api.version>
<guava.version>33.5.0-jre</guava.version>
<hamcrest.version>3.0</hamcrest.version>
<junit-jupiter.version>5.13.4</junit-jupiter.version>
<junit-jupiter.version>6.0.0-RC3</junit-jupiter.version>
</properties>

<dependencyManagement>
Expand Down
2 changes: 1 addition & 1 deletion datatable/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<guava.version>33.5.0-jre</guava.version>
<hamcrest.version>3.0</hamcrest.version>
<jackson.version>2.20.0</jackson.version>
<junit-jupiter.version>5.13.4</junit-jupiter.version>
<junit-jupiter.version>6.0.0-RC3</junit-jupiter.version>
<mockito.version>5.20.0</mockito.version>
</properties>

Expand Down
2 changes: 1 addition & 1 deletion docstring/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<properties>
<jackson.version>2.20.0</jackson.version>
<junit-jupiter.version>5.13.4</junit-jupiter.version>
<junit-jupiter.version>6.0.0-RC3</junit-jupiter.version>
<apiguardian-api.version>1.1.2</apiguardian-api.version>
<project.Automatic-Module-Name>io.cucumber.docstring</project.Automatic-Module-Name>
<hamcrest.version>3.0</hamcrest.version>
Expand Down
3 changes: 2 additions & 1 deletion examples/calculator-java-junit5/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>5.13.1</version>
<version>6.0.0-RC3</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -118,6 +118,7 @@
<java classname="org.junit.platform.console.ConsoleLauncher" fork="true"
failonerror="true" newenvironment="true" maxmemory="512m"
classpathref="maven.test.classpath">
<arg value="execute"/>
<arg value="--include-engine"/>
<arg value="cucumber"/>
<arg value="--scan-classpath"/>
Expand Down
3 changes: 2 additions & 1 deletion examples/calculator-kotlin-junit5/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>5.13.1</version>
<version>6.0.0-RC3</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -140,6 +140,7 @@
<java classname="org.junit.platform.console.ConsoleLauncher" fork="true"
failonerror="true" newenvironment="true" maxmemory="512m"
classpathref="maven.test.classpath">
<arg value="execute"/>
<arg value="--include-engine"/>
<arg value="cucumber"/>
<arg value="--scan-classpath"/>
Expand Down
2 changes: 1 addition & 1 deletion examples/spring-java-junit5/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<properties>
<project.Automatic-Module-Name>io.cucumber.examples.spring.application</project.Automatic-Module-Name>
<spring-boot.version>3.5.0</spring-boot.version>
<junit.version>5.13.1</junit.version>
<junit.version>6.0.0-RC3</junit.version>
</properties>

<dependencyManagement>
Expand Down
Loading
Loading