diff --git a/CHANGELOG.md b/CHANGELOG.md index cc16664..c2bca3a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ Back to [Readme](README.md). * Default value of `` was changed from `0` to `-1`: * `-1` means that the number generated runners should be equal to the number generated scenarios. * `0` means that no runners should be generated at all. +* Java 11 requirement ### Changed diff --git a/example-project/pom.xml b/example-project/pom.xml index 8276aa7..41ccbbf 100644 --- a/example-project/pom.xml +++ b/example-project/pom.xml @@ -13,14 +13,15 @@ UTF-8 UTF-8 - 3.0.0-M3 - 3.0.0 - 6.9.0 - 3.7.0 + 3.1.2 + 3.4.0 + 7.11.1 + 3.11.0 3.1.2 ${project.build.directory}/parallel/runners ${project.build.directory}/parallel/features + 3.3.1 @@ -53,8 +54,8 @@ - - + src/test/java/some/template/CucableTemplate.java + @@ -73,13 +74,13 @@ - + src/test/resources/features/testfeature/MyTest1.feature:8:19 ${generated.feature.directory} - + ${generated.runner.directory} @@ -104,7 +105,7 @@ - 0 + @@ -154,13 +155,17 @@ true + + org.apache.maven.plugins + maven-resources-plugin + ${maven-resources-plugin.version} + org.apache.maven.plugins maven-compiler-plugin ${maven.compiler.plugin.version} - 8 - 8 + 11 diff --git a/example-project/src/test/java/some/template/CucableJavaTemplate.java b/example-project/src/test/java/some/template/CucableTemplate.java similarity index 86% rename from example-project/src/test/java/some/template/CucableJavaTemplate.java rename to example-project/src/test/java/some/template/CucableTemplate.java index 26dcdd3..2f3558c 100644 --- a/example-project/src/test/java/some/template/CucableJavaTemplate.java +++ b/example-project/src/test/java/some/template/CucableTemplate.java @@ -7,10 +7,9 @@ @RunWith(Cucumber.class) @CucumberOptions( glue = "steps", - strict = true, features = {"target/parallel/features/[CUCABLE:FEATURE].feature"}, plugin = {"json:target/cucumber-report/[CUCABLE:RUNNER].json"} ) -public class CucableJavaTemplate { +public class CucableTemplate { // [CUCABLE:CUSTOM:comment] } \ No newline at end of file diff --git a/example-project/src/test/resources/cucable.template b/example-project/src/test/resources/cucable.template index 5d989fd..bf00869 100644 --- a/example-project/src/test/resources/cucable.template +++ b/example-project/src/test/resources/cucable.template @@ -9,6 +9,6 @@ import org.junit.runner.RunWith; features = {"target/parallel/features/[CUCABLE:FEATURE].feature"}, plugin = {"json:target/cucumber-report/[CUCABLE:RUNNER].json"} ) -public class CucableJavaTemplate { +public class CucableTemplate { // [CUCABLE:CUSTOM:comment] } \ No newline at end of file diff --git a/makefile b/makefile index 26676b4..11285c4 100644 --- a/makefile +++ b/makefile @@ -1,4 +1,12 @@ -build-and-test: +help: ## Show this help. + @grep -hE '^[A-Za-z0-9_ \-]*?:.*##.*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' +.PHONY: help + +build-and-test: ## Build the plugin and run demo tests mvn clean install - mvn verify -f=examples/maven-example - open examples/maven-example/target/cluecumber-report/index.html \ No newline at end of file + mvn verify -f=examples-project/pom.xml -ntp + open example-project/target/cluecumber-report/index.html + +show-versions: ## Show most recent dependency versions + mvn versions:display-dependency-updates -ntp -f=plugin-code/pom.xml +.PHONY: show-versions \ No newline at end of file diff --git a/plugin-code/pom.xml b/plugin-code/pom.xml index dbeaaa8..4ae1c90 100644 --- a/plugin-code/pom.xml +++ b/plugin-code/pom.xml @@ -70,21 +70,20 @@ 3.3.0 3.11.0 3.3.0 - 0.8.10 - 2.1.0 - 3.6.0 + 0.8.11 + 2.1.1 + 3.10.2 3.3.0 - 1.8 - 1.8 - 8 5.2.0 - 5.0.1 - 3.12.0 + 6.0.0 + 3.14.0 - 3.6.28 - 5.7.0 + 4.11.0 + 5.10.1 0.9.1 - 3.5.1 + 4.0.0 + 3.11.0 + 3.3.1 @@ -124,13 +123,17 @@ + + org.apache.maven.plugins + maven-resources-plugin + ${maven-resources-plugin.version} + org.apache.maven.plugins maven-compiler-plugin ${maven.compiler.plugin.version} - 11 - 11 + 11