diff --git a/compatibility/pom.xml b/compatibility/pom.xml index 784baf01a5..c67ee71493 100644 --- a/compatibility/pom.xml +++ b/compatibility/pom.xml @@ -14,7 +14,7 @@ 3.0 2.20.0 - 5.13.4 + 5.14.0-RC1 io.cucumber.compatibility diff --git a/cucumber-archetype/pom.xml b/cucumber-archetype/pom.xml index ced6dc3791..a02ff435dc 100644 --- a/cucumber-archetype/pom.xml +++ b/cucumber-archetype/pom.xml @@ -15,7 +15,7 @@ Cucumber JVM: Maven Archetype - 5.13.4 + 5.14.0-RC1 3.27.6 3.14.1 3.5.4 diff --git a/cucumber-cdi2/pom.xml b/cucumber-cdi2/pom.xml index 8ad4aa8093..521ba0ba2e 100644 --- a/cucumber-cdi2/pom.xml +++ b/cucumber-cdi2/pom.xml @@ -7,7 +7,7 @@ 2.0.28 3.1.9.Final 1.1.2 - 5.13.4 + 5.14.0-RC1 2.2 diff --git a/cucumber-core/pom.xml b/cucumber-core/pom.xml index e029256708..85a4e41a7f 100644 --- a/cucumber-core/pom.xml +++ b/cucumber-core/pom.xml @@ -16,7 +16,7 @@ 1.1.2 2.20.0 1.21.2 - 5.13.4 + 5.14.0-RC1 2.10.4 3.0 0.2 diff --git a/cucumber-deltaspike/pom.xml b/cucumber-deltaspike/pom.xml index 965bc9dfa1..6b6a8941c4 100644 --- a/cucumber-deltaspike/pom.xml +++ b/cucumber-deltaspike/pom.xml @@ -16,7 +16,7 @@ 1.1.2 2.0.SP1 1.9.6 - 5.13.4 + 5.14.0-RC1 io.cucumber.deltaspike diff --git a/cucumber-gherkin-messages/pom.xml b/cucumber-gherkin-messages/pom.xml index 4dbdf24a08..bbdc9fb5d3 100644 --- a/cucumber-gherkin-messages/pom.xml +++ b/cucumber-gherkin-messages/pom.xml @@ -8,7 +8,7 @@ - 5.13.4 + 5.14.0-RC1 io.cucumber.core.gherkin.messages diff --git a/cucumber-gherkin/pom.xml b/cucumber-gherkin/pom.xml index f389e197ce..a4d8f05703 100644 --- a/cucumber-gherkin/pom.xml +++ b/cucumber-gherkin/pom.xml @@ -8,7 +8,7 @@ - 5.13.4 + 5.14.0-RC1 io.cucumber.core.gherkin diff --git a/cucumber-guice/pom.xml b/cucumber-guice/pom.xml index 5286391b74..f9d9bdaf4b 100644 --- a/cucumber-guice/pom.xml +++ b/cucumber-guice/pom.xml @@ -15,7 +15,7 @@ 1.1.2 7.0.0 3.0 - 5.13.4 + 5.14.0-RC1 io.cucumber.guice 5.20.0 diff --git a/cucumber-jakarta-cdi/pom.xml b/cucumber-jakarta-cdi/pom.xml index 9c51530657..7b745fdf8f 100644 --- a/cucumber-jakarta-cdi/pom.xml +++ b/cucumber-jakarta-cdi/pom.xml @@ -6,7 +6,7 @@ 1.1.2 4.1.0 2.1.4 - 5.13.4 + 5.14.0-RC1 3.0 5.1.6.Final diff --git a/cucumber-jakarta-openejb/pom.xml b/cucumber-jakarta-openejb/pom.xml index 1de6b15ab9..72eabae5f5 100644 --- a/cucumber-jakarta-openejb/pom.xml +++ b/cucumber-jakarta-openejb/pom.xml @@ -14,7 +14,7 @@ 1.1.2 3.0 - 5.13.4 + 5.14.0-RC1 9.1.3 io.cucumber.jakarta.openejb diff --git a/cucumber-java/pom.xml b/cucumber-java/pom.xml index 5d81ac5cd3..253811b7c4 100644 --- a/cucumber-java/pom.xml +++ b/cucumber-java/pom.xml @@ -16,7 +16,7 @@ 1.1.2 3.0 2.20.0 - 5.13.4 + 5.14.0-RC1 5.20.0 diff --git a/cucumber-java8/pom.xml b/cucumber-java8/pom.xml index 08723b33c6..790d3f9980 100644 --- a/cucumber-java8/pom.xml +++ b/cucumber-java8/pom.xml @@ -15,7 +15,7 @@ io.cucumber.java8 1.1.2 3.0 - 5.13.4 + 5.14.0-RC1 5.20.0 0.6.3 diff --git a/cucumber-junit-platform-engine/pom.xml b/cucumber-junit-platform-engine/pom.xml index d334573f34..3d3eb00720 100644 --- a/cucumber-junit-platform-engine/pom.xml +++ b/cucumber-junit-platform-engine/pom.xml @@ -13,7 +13,7 @@ 3.0 - 5.13.4 + 5.14.0-RC1 diff --git a/cucumber-junit-platform-engine/src/main/java/io/cucumber/junit/platform/engine/DiscoverySelectorResolver.java b/cucumber-junit-platform-engine/src/main/java/io/cucumber/junit/platform/engine/DiscoverySelectorResolver.java index 5c38d2171c..4b8d0b996b 100644 --- a/cucumber-junit-platform-engine/src/main/java/io/cucumber/junit/platform/engine/DiscoverySelectorResolver.java +++ b/cucumber-junit-platform-engine/src/main/java/io/cucumber/junit/platform/engine/DiscoverySelectorResolver.java @@ -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; @@ -13,7 +14,7 @@ class DiscoverySelectorResolver { . 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(), // diff --git a/cucumber-junit-platform-engine/src/main/java/io/cucumber/junit/platform/engine/FeatureFileResolver.java b/cucumber-junit-platform-engine/src/main/java/io/cucumber/junit/platform/engine/FeatureFileResolver.java index 0233c0b219..52dd7a3db4 100644 --- a/cucumber-junit-platform-engine/src/main/java/io/cucumber/junit/platform/engine/FeatureFileResolver.java +++ b/cucumber-junit-platform-engine/src/main/java/io/cucumber/junit/platform/engine/FeatureFileResolver.java @@ -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; @@ -140,7 +140,7 @@ public Resolution resolve(FileSelector selector, Context context) { @Override public Resolution resolve(ClasspathResourceSelector selector, Context context) { - Set resources = selector.getClasspathResources(); + Set resources = selector.getResources(); if (!resources.stream().allMatch(resource -> isFeature(resource.getName()))) { return resolveClasspathResourceSelectorAsPackageSelector(selector); } diff --git a/cucumber-junit-platform-engine/src/main/java/io/cucumber/junit/platform/engine/FeatureParserWithCaching.java b/cucumber-junit-platform-engine/src/main/java/io/cucumber/junit/platform/engine/FeatureParserWithCaching.java index 65616e1480..b9e1c965d4 100644 --- a/cucumber-junit-platform-engine/src/main/java/io/cucumber/junit/platform/engine/FeatureParserWithCaching.java +++ b/cucumber-junit-platform-engine/src/main/java/io/cucumber/junit/platform/engine/FeatureParserWithCaching.java @@ -31,14 +31,14 @@ Optional parseResource(Path resource) { return parseResource(new PathAdapter(resource)); } - Optional parseResource(org.junit.platform.commons.support.Resource resource) { + Optional 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; } diff --git a/cucumber-junit-platform-engine/src/test/java/io/cucumber/junit/platform/engine/CucumberTestEngineTest.java b/cucumber-junit-platform-engine/src/test/java/io/cucumber/junit/platform/engine/CucumberTestEngineTest.java index e6d542ed38..c34bb9353b 100644 --- a/cucumber-junit-platform-engine/src/test/java/io/cucumber/junit/platform/engine/CucumberTestEngineTest.java +++ b/cucumber-junit-platform-engine/src/test/java/io/cucumber/junit/platform/engine/CucumberTestEngineTest.java @@ -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; @@ -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; @@ -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 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) // diff --git a/cucumber-junit/pom.xml b/cucumber-junit/pom.xml index fb195430ff..a20a398b92 100644 --- a/cucumber-junit/pom.xml +++ b/cucumber-junit/pom.xml @@ -14,7 +14,7 @@ 1.1.2 3.0 - 5.13.4 + 5.14.0-RC1 4.13.2 5.20.0 io.cucumber.junit diff --git a/cucumber-kotlin-java8/pom.xml b/cucumber-kotlin-java8/pom.xml index ded2c99d2c..e42cd549d7 100644 --- a/cucumber-kotlin-java8/pom.xml +++ b/cucumber-kotlin-java8/pom.xml @@ -14,7 +14,7 @@ io.cucumber.kotlin.java8 2.2.20 - 5.13.4 + 5.14.0-RC1 diff --git a/cucumber-openejb/pom.xml b/cucumber-openejb/pom.xml index a1e0a34ada..5a661d5c59 100644 --- a/cucumber-openejb/pom.xml +++ b/cucumber-openejb/pom.xml @@ -14,7 +14,7 @@ 1.1.2 3.0 - 5.13.4 + 5.14.0-RC1 8.0.16 io.cucumber.openejb diff --git a/cucumber-picocontainer/pom.xml b/cucumber-picocontainer/pom.xml index 31f180e89e..4510f920c9 100644 --- a/cucumber-picocontainer/pom.xml +++ b/cucumber-picocontainer/pom.xml @@ -15,7 +15,7 @@ io.cucumber.picocontainer 2.15.2 1.1.2 - 5.13.4 + 5.14.0-RC1 diff --git a/cucumber-plugin/pom.xml b/cucumber-plugin/pom.xml index e8be221f54..981f583b2b 100644 --- a/cucumber-plugin/pom.xml +++ b/cucumber-plugin/pom.xml @@ -12,7 +12,7 @@ Plugin interface for Cucumber-JVM - 5.13.4 + 5.14.0-RC1 1.1.2 io.cucumber.plugin diff --git a/cucumber-spring/pom.xml b/cucumber-spring/pom.xml index 15bd1021ed..eff71c0102 100644 --- a/cucumber-spring/pom.xml +++ b/cucumber-spring/pom.xml @@ -14,7 +14,7 @@ 1.1.2 3.0 - 5.13.4 + 5.14.0-RC1 6.2.11 io.cucumber.spring 5.20.0 diff --git a/datatable-matchers/pom.xml b/datatable-matchers/pom.xml index a8d364eae2..7a9faad6b2 100644 --- a/datatable-matchers/pom.xml +++ b/datatable-matchers/pom.xml @@ -17,7 +17,7 @@ 1.1.2 33.5.0-jre 3.0 - 5.13.4 + 5.14.0-RC1 diff --git a/datatable/pom.xml b/datatable/pom.xml index 62136e2c7a..4cf78d1d9d 100644 --- a/datatable/pom.xml +++ b/datatable/pom.xml @@ -19,7 +19,7 @@ 33.5.0-jre 3.0 2.20.0 - 5.13.4 + 5.14.0-RC1 5.20.0 diff --git a/docstring/pom.xml b/docstring/pom.xml index 30a2b9a753..c26fd14e0a 100644 --- a/docstring/pom.xml +++ b/docstring/pom.xml @@ -13,7 +13,7 @@ 2.20.0 - 5.13.4 + 5.14.0-RC1 1.1.2 io.cucumber.docstring 3.0 diff --git a/examples/calculator-java-junit5/pom.xml b/examples/calculator-java-junit5/pom.xml index 5290566cbf..7e5931e281 100644 --- a/examples/calculator-java-junit5/pom.xml +++ b/examples/calculator-java-junit5/pom.xml @@ -28,7 +28,7 @@ org.junit junit-bom - 5.13.1 + 5.14.0-RC1 pom import diff --git a/examples/calculator-kotlin-junit5/pom.xml b/examples/calculator-kotlin-junit5/pom.xml index 75419eaa82..1c4deb582f 100644 --- a/examples/calculator-kotlin-junit5/pom.xml +++ b/examples/calculator-kotlin-junit5/pom.xml @@ -31,7 +31,7 @@ org.junit junit-bom - 5.13.1 + 5.14.0-RC1 pom import diff --git a/examples/spring-java-junit5/pom.xml b/examples/spring-java-junit5/pom.xml index 7c03c859d3..f20f56e413 100644 --- a/examples/spring-java-junit5/pom.xml +++ b/examples/spring-java-junit5/pom.xml @@ -13,7 +13,7 @@ io.cucumber.examples.spring.application 3.5.0 - 5.13.1 + 5.14.0-RC1 diff --git a/examples/wicket-java-junit4/wicket-main/pom.xml b/examples/wicket-java-junit4/wicket-main/pom.xml index 61294a0bc2..f504a5cf20 100644 --- a/examples/wicket-java-junit4/wicket-main/pom.xml +++ b/examples/wicket-java-junit4/wicket-main/pom.xml @@ -14,7 +14,7 @@ 9.4.0 9.4.43.v20210629 2.0.5 - 5.13.1 + 5.14.0-RC1 1.4.7 diff --git a/examples/wicket-java-junit4/wicket-test/pom.xml b/examples/wicket-java-junit4/wicket-test/pom.xml index ad5e100311..a077980589 100644 --- a/examples/wicket-java-junit4/wicket-test/pom.xml +++ b/examples/wicket-java-junit4/wicket-test/pom.xml @@ -10,7 +10,7 @@ io.cucumber.examples.wicket.test - 5.13.1 + 5.14.0-RC1 4.13.0