dependencies

trivago · Dec 4, 2023 · d42e02e · d42e02e
1 parent c83450d
commit d42e02e
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 30 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,7 @@ Back to [Readme](README.md).
 * Default value of `<desiredNumberOfRunners>` 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
@@ -13,14 +13,15 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <maven.failsafe.plugin.version>3.0.0-M3</maven.failsafe.plugin.version>
-        <maven.build.helper.plugin.version>3.0.0</maven.build.helper.plugin.version>
-        <cucumber.version>6.9.0</cucumber.version>
-        <maven.compiler.plugin.version>3.7.0</maven.compiler.plugin.version>
+        <maven.failsafe.plugin.version>3.1.2</maven.failsafe.plugin.version>
+        <maven.build.helper.plugin.version>3.4.0</maven.build.helper.plugin.version>
+        <cucumber.version>7.11.1</cucumber.version>
+        <maven.compiler.plugin.version>3.11.0</maven.compiler.plugin.version>
         <maven.jar.plugin.version>3.1.2</maven.jar.plugin.version>
 
         <generated.runner.directory>${project.build.directory}/parallel/runners</generated.runner.directory>
         <generated.feature.directory>${project.build.directory}/parallel/features</generated.feature.directory>
+        <maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
     </properties>
 
     <dependencies>
@@ -53,8 +54,8 @@
                 </executions>
                 <configuration>
                     <!-- This can be either a Java class file or a text based template -->
-<!--                    <sourceRunnerTemplateFile>src/test/java/some/template/CucableJavaTemplate.java-->
-<!--                    </sourceRunnerTemplateFile>-->
+                    <sourceRunnerTemplateFile>src/test/java/some/template/CucableTemplate.java
+                    </sourceRunnerTemplateFile>
                     <!--<sourceRunnerTemplateFile>src/test/resources/cucable.template</sourceRunnerTemplateFile>-->
 
                     <!-- process all features in the given directory -->
@@ -73,13 +74,13 @@
                     <!-- <sourceFeatures>@src/test/resources/cucumber-feature-list.txt</sourceFeatures> -->
 
                     <!-- process a folder that hosts text files containing paths to features and line numbers (as it is written by the Cucumber rerun formatter) -->
-<!--                    <sourceFeatures>@src/test/resources</sourceFeatures>-->
+                    <!-- <sourceFeatures>@src/test/resources</sourceFeatures> -->
 
                     <!-- process a specific feature file and specific line numbers in the given directory -->
                     <sourceFeatures>src/test/resources/features/testfeature/MyTest1.feature:8:19</sourceFeatures>
 
                     <generatedFeatureDirectory>${generated.feature.directory}</generatedFeatureDirectory>
-<!--                    <generatedRunnerDirectory>${generated.runner.directory}</generatedRunnerDirectory>-->
+                    <generatedRunnerDirectory>${generated.runner.directory}</generatedRunnerDirectory>
 
                     <!-- optional: custom data that is available in Cucable placeholders in a template -->
                     <!--<customPlaceholders>-->
@@ -104,7 +105,7 @@
 
                     <!-- optional: generate a fixed number of runners and distribute all features round-robin.
                      This can only be used if desiredNumberOfFeaturesPerRunner is NOT used! -->
-                    <desiredNumberOfRunners>0</desiredNumberOfRunners>
+                    <!-- <desiredNumberOfRunners>0</desiredNumberOfRunners> -->
 
                     <!-- optional: distribute a fixed number features per runner round-robin.
                     This can only be used if desiredNumberOfRunners is NOT used! -->
@@ -154,13 +155,17 @@
                     <testFailureIgnore>true</testFailureIgnore>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>${maven-resources-plugin.version}</version>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>${maven.compiler.plugin.version}</version>
                 <configuration>
-                    <source>8</source>
-                    <target>8</target>
+                    <release>11</release>
                 </configuration>
             </plugin>
             <plugin>

diff --git a/...va/some/template/CucableJavaTemplate.java → ...t/java/some/template/CucableTemplate.java b/...va/some/template/CucableJavaTemplate.java → ...t/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]
 }
diff --git 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]
 }
diff --git 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
+	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
diff --git a/plugin-code/pom.xml b/plugin-code/pom.xml
@@ -70,21 +70,20 @@
         <maven.jar.plugin.version>3.3.0</maven.jar.plugin.version>
         <maven.compiler.plugin.version>3.11.0</maven.compiler.plugin.version>
         <maven.plugin.testing.harness.version>3.3.0</maven.plugin.testing.harness.version>
-        <jacoco.maven.plugin>0.8.10</jacoco.maven.plugin>
-        <plexus.component.annotations.version>2.1.0</plexus.component.annotations.version>
-        <maven.plugin.annotations.version>3.6.0</maven.plugin.annotations.version>
+        <jacoco.maven.plugin>0.8.11</jacoco.maven.plugin>
+        <plexus.component.annotations.version>2.1.1</plexus.component.annotations.version>
+        <maven.plugin.annotations.version>3.10.2</maven.plugin.annotations.version>
         <maven.source.plugin.version>3.3.0</maven.source.plugin.version>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <maven.compiler.release>8</maven.compiler.release>
         <gherkin.version>5.2.0</gherkin.version>
-        <tag.expressions.version>5.0.1</tag.expressions.version>
-        <apache.commons.version>3.12.0</apache.commons.version>
+        <tag.expressions.version>6.0.0</tag.expressions.version>
+        <apache.commons.version>3.14.0</apache.commons.version>
 
-        <mockito.version>3.6.28</mockito.version>
-        <junit5.vintage.version>5.7.0</junit5.vintage.version>
+        <mockito.version>4.11.0</mockito.version>
+        <junit5.vintage.version>5.10.1</junit5.vintage.version>
         <openpojo.version>0.9.1</openpojo.version>
-        <plexus-utils.version>3.5.1</plexus-utils.version>
+        <plexus-utils.version>4.0.0</plexus-utils.version>
+        <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
+        <maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
     </properties>
 
     <profiles>
@@ -124,13 +123,17 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>${maven-resources-plugin.version}</version>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>${maven.compiler.plugin.version}</version>
                 <configuration>
-                    <source>11</source>
-                    <target>11</target>
+                    <release>11</release>
                 </configuration>
             </plugin>
             <plugin>