cucumber · gaeljw · Nov 15, 2020 · Nov 8, 2020
diff --git a/.m2/maven-version-rules.xml b/.m2/maven-version-rules.xml
diff --git a/.m2/travis-ci-toolchains.xml b/.m2/travis-ci-toolchains.xml
diff --git a/.travis.yml b/.travis.yml
@@ -1,31 +1,16 @@
 language: scala
 os: linux
+jdk:
+  - openjdk8
 
 cache:
   directories:
-  - "$HOME/.m2"
+    - $HOME/.sbt/
+    - $HOME/.ivy2/cache
+    - $HOME/.cache/coursier
 
-install:
-  - which java
-  - mvn install -DskipTests=true -DskipITs=true -Dmaven.javadoc.skip=true -B -V --toolchains .m2/travis-ci-toolchains.xml
-
-jobs:
-  include:
-  - stage: test
-    scala:
-    - 2.11.12
-    script: mvn test -pl scala/scala_2.11 -B --toolchains .m2/travis-ci-toolchains.xml
-    jdk: openjdk8
-  - stage: test
-    scala:
-    - 2.12.11
-    script: mvn test -pl scala/scala_2.12,examples -B --toolchains .m2/travis-ci-toolchains.xml
-    jdk: openjdk8
-  - stage: test
-    scala:
-    - 2.13.2
-    script: mvn test -pl scala/scala_2.13,examples -B --toolchains .m2/travis-ci-toolchains.xml
-    jdk: openjdk8
+script:
+  - sbt +compile +test
 
 branches:
   only:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,8 @@ See also the [CHANGELOG](https://github.com/cucumber/cucumber-jvm/blob/master/CH
 
 ### Changed
 
+- [Build] Use sbt for building the project
+
 ### Deprecated
 
 ### Removed

diff --git a/Makefile b/Makefile
@@ -1,15 +1,15 @@
 SHELL := /usr/bin/env bash
 
 default:
-	mvn clean install
+	sbt clean +publishLocal
 .PHONY: default
 
-VERSION = $(shell mvn help:evaluate -Dexpression=project.version -q -DforceStdout 2> /dev/null)
+VERSION = $(shell sbt "print cucumberScala/version" | tail -n 1)
 NEW_VERSION = $(subst -SNAPSHOT,,$(VERSION))
 CURRENT_BRANCH = $(shell git rev-parse --abbrev-ref HEAD)
 
 clean:
-	mvn clean release:clean
+	sbt clean
 .PHONY: clean
 
 version:
@@ -18,24 +18,6 @@ version:
 	@echo ""
 .PHONY: version
 
-update-compatibility:
-	MSG_VERSION=$$(mvn help:evaluate -Dexpression=messages.version -q -DforceStdout 2> /dev/null) && \
-	git clone --branch messages/v$$MSG_VERSION [email protected]:cucumber/cucumber.git target/cucumber
-	rm -rf compatibility/src/test/resources/*
-	cp -r target/cucumber/compatibility-kit/javascript/features compatibility/src/test/resources
-	rm -rf target/cucumber
-.PHONY: update-compatibility
-
-update-dependency-versions:
-	mvn versions:force-releases
-	mvn versions:update-properties -DallowMajorUpdates=false -Dmaven.version.rules="file://`pwd`/.m2/maven-version-rules.xml"
-.PHONY: update-dependency-versions
-
-update-major-dependency-versions:
-	mvn versions:force-releases
-	mvn versions:update-properties -DallowMajorUpdates=true -Dmaven.version.rules="file://`pwd`/.m2/maven-version-rules.xml"
-.PHONY: update-major-dependency-versions
-
 update-installdoc:
 	cat docs/install.md | ./scripts/update-install-doc.sh $(NEW_VERSION) > docs/install.md.tmp
 	mv docs/install.md.tmp docs/install.md
@@ -53,15 +35,12 @@ update-changelog:
 
 .release-in-docker: default update-changelog update-installdoc .commit-and-push-changelog-and-docs
 	[ -f '/home/cukebot/import-gpg-key.sh' ] && /home/cukebot/import-gpg-key.sh
-	mvn --batch-mode release:clean release:prepare -DautoVersionSubmodules=true -Darguments="-DskipTests=true -DskipITs=true -Darchetype.test.skip=true"
-	git checkout "v$(NEW_VERSION)"
-	mvn deploy -P-examples -P-compatibility -Psign-source-javadoc -DskipTests=true -DskipITs=true -Darchetype.test.skip=true
-	git checkout $(CURRENT_BRANCH)
-	git fetch
+	sbt release cross with-defaults
 .PHONY: release-in-docker
 
 release:
 	[ -d '../secrets' ]  || git clone keybase://team/cucumberbdd/secrets ../secrets
+	git -C ../secrets reset HEAD --hard
 	git -C ../secrets pull
 	../secrets/update_permissions
 	docker pull cucumber/cucumber-build:latest
@@ -70,7 +49,8 @@ release:
 	  --volume "${shell pwd}/../secrets/import-gpg-key.sh":/home/cukebot/import-gpg-key.sh \
 	  --volume "${shell pwd}/../secrets/codesigning.key":/home/cukebot/codesigning.key \
 	  --volume "${shell pwd}/../secrets/.ssh":/home/cukebot/.ssh \
-	  --volume "${HOME}/.m2"/repository:/home/cukebot/.m2/repository \
+	  --volume "${HOME}/.ivy2":/home/cukebot/.ivy2 \
+	  --volume "${HOME}/.cache/coursier":/home/cukebot/.cache/coursier \
 	  --volume "${HOME}/.gitconfig":/home/cukebot/.gitconfig \
 	  --env-file ../secrets/secrets.list \
 	  --user 1000 \

diff --git a/RELEASING.md b/RELEASING.md
@@ -10,13 +10,11 @@ Is the build passing?
 
 ```
 git checkout main
+sbt clean +test
 ```
 
 Also check if you can upgrade any dependencies:
-
-```
-make update-dependency-versions
-```
+- check RenovateBot open Merge Requests on Github
 
 ## Decide what the next version should be ##
 
@@ -37,10 +35,10 @@ Display future version by running:
 make version
 ```
 
-Check if branch name and version are as expected. To change version run:
+Check if branch name and version are as expected. To change version, update the _version.sbt_ file:
 
 ```
-mvn versions:set -DnewVersion=X.Y.Z-SNAPSHOT
+version in ThisBuild := "6.8.3-SNAPSHOT"
 ```
 
 ## Secrets ##

diff --git a/build.sbt b/build.sbt
@@ -0,0 +1,135 @@
+
+import ReleaseTransformations._
+import xerial.sbt.Sonatype.sonatypeSettings
+
+// Metadata
+
+ThisBuild / organization := "io.cucumber"
+ThisBuild / organizationName := "Cucumber"
+ThisBuild / organizationHomepage := Some(url("https://github.com/cucumber"))
+ThisBuild / scmInfo := Some(ScmInfo(url("https://github.com/cucumber/cucumber-jvm-scala"), "scm:[email protected]:cucumber/cucumber-jvm-scala.git"))
+ThisBuild / developers := List(
+  Developer("cucumber", "Cucumber Developers", "[email protected]", url("https://github.com/cucumber"))
+)
+ThisBuild / licenses := Seq(
+  "MIT License" -> url("http://www.opensource.org/licenses/mit-license")
+)
+ThisBuild / description := "Cucumber for Scala"
+ThisBuild / homepage := Some(url("https://github.com/cucumber/cucumber-jvm-scala"))
+
+// Scala versions
+
+val scala211 = "2.11.12"
+val scala212 = "2.12.12"
+val scala213 = "2.13.3"
+
+scalaVersion := scala213
+
+// Library versions
+
+val cucumberVersion = "6.8.2"
+val jacksonVersion = "2.11.3"
+val mockitoScalaVersion = "1.16.3"
+val junitVersion = "4.13.1"
+
+// Projects and settings
+
+lazy val commonSettings = Seq(
+  libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % Test,
+  scalacOptions += "-target:jvm-1.8",
+  scalacOptions ++= {
+    CrossVersion.partialVersion(scalaVersion.value) match {
+      case Some((2, 11)) => ScalacOptions.scalacOptions211
+      case Some((2, 12)) => ScalacOptions.scalacOptions212
+      case Some((2, 13)) => ScalacOptions.scalacOptions213
+      case _ => Seq()
+    }
+  },
+)
+
+lazy val root = (project in file("."))
+  .settings(commonSettings)
+  .settings(
+    publishArtifact := false
+  )
+  .aggregate(
+    cucumberScala.projectRefs ++
+      examples.projectRefs: _*
+  )
+
+// Main project
+lazy val cucumberScala = (projectMatrix in file("cucumber-scala"))
+  .settings(commonSettings)
+  .settings(
+    name := "cucumber-scala",
+    libraryDependencies ++= Seq(
+      "io.cucumber" % "cucumber-core" % cucumberVersion,
+
+      // Users have to provide it (for JacksonDefaultDataTableTransformer)
+      "com.fasterxml.jackson.core" % "jackson-databind" % jacksonVersion % Provided,
+      "com.fasterxml.jackson.module" %% "jackson-module-scala" % jacksonVersion % Provided,
+
+      "junit" % "junit" % junitVersion % Test,
+      "io.cucumber" % "cucumber-junit" % cucumberVersion % Test,
+      "org.mockito" %% "mockito-scala" % mockitoScalaVersion % Test
+    ),
+    libraryDependencies ++= {
+      CrossVersion.partialVersion(scalaVersion.value) match {
+        case Some((2, n)) if n <= 12 => List("org.scala-lang.modules" %% "scala-collection-compat" % "2.2.0")
+        case _ => Nil
+      }
+    },
+    unmanagedSourceDirectories in Compile ++= {
+      val sourceDir = (sourceDirectory in Compile).value
+      CrossVersion.partialVersion(scalaVersion.value) match {
+        case Some((2, n)) if n <= 11 => Seq(sourceDir / "scala-2.11")
+        case _ => Seq()
+      }
+    },
+    // Generate I18n traits
+    Compile / sourceGenerators += Def.task {
+      val file = (Compile / sourceManaged).value / "io/cucumber/scala" / "I18n.scala"
+      IO.write(file, I18nGenerator.i18n)
+      Seq(file)
+    }.taskValue
+  )
+  .jvmPlatform(scalaVersions = Seq(scala213, scala212, scala211))
+
+// Examples project
+lazy val examples = (projectMatrix in file("examples"))
+  .settings(commonSettings)
+  .settings(
+    name := "scala-examples",
+    libraryDependencies ++= Seq(
+      "io.cucumber" % "cucumber-junit" % cucumberVersion % Test,
+      "junit" % "junit" % junitVersion % Test
+    ),
+    publishArtifact := false
+  )
+  .dependsOn(cucumberScala % Test)
+  .jvmPlatform(scalaVersions = Seq(scala213, scala212))
+
+// Release & Publish
+
+Global / publishMavenStyle := true
+Global / publishTo := sonatypePublishToBundle.value
+
+// https://github.com/sbt/sbt-pgp/issues/173
+Global / PgpKeys.gpgCommand := (baseDirectory.value / "gpg.sh").getAbsolutePath
+
+// https://github.com/xerial/sbt-sonatype#using-with-sbt-release-plugin
+ThisBuild / releaseCrossBuild := true
+ThisBuild / releaseProcess := Seq[ReleaseStep](
+  checkSnapshotDependencies,
+  inquireVersions,
+  runClean,
+  runTest,
+  setReleaseVersion,
+  commitReleaseVersion,
+  tagRelease,
+  releaseStepCommandAndRemaining("publishSigned"),
+  releaseStepCommand("sonatypeBundleRelease"),
+  setNextVersion,
+  commitNextVersion,
+  pushChanges
+)
diff --git a/scala/sources/gen.scala → cucumber-scala/src/main/codegen/gen.scala b/scala/sources/gen.scala → cucumber-scala/src/main/codegen/gen.scala
diff --git a/...umber.core.backend.BackendProviderService → ...umber.core.backend.BackendProviderService b/...umber.core.backend.BackendProviderService → ...umber.core.backend.BackendProviderService
diff --git a/...ain/scala/io/cucumber/scala/package.scala → ...cala-2.11/io/cucumber/scala/package.scala b/...ain/scala/io/cucumber/scala/package.scala → ...cala-2.11/io/cucumber/scala/package.scala
diff --git a/...tatableElementTransformerDefinition.scala → ...tatableElementTransformerDefinition.scala b/...tatableElementTransformerDefinition.scala → ...tatableElementTransformerDefinition.scala
diff --git a/...cumber/scala/AbstractGlueDefinition.scala → ...cumber/scala/AbstractGlueDefinition.scala b/...cumber/scala/AbstractGlueDefinition.scala → ...cumber/scala/AbstractGlueDefinition.scala
diff --git a/...ain/scala/io/cucumber/scala/Aliases.scala → ...ain/scala/io/cucumber/scala/Aliases.scala b/...ain/scala/io/cucumber/scala/Aliases.scala → ...ain/scala/io/cucumber/scala/Aliases.scala
diff --git a/...umber/scala/DataTableDefinitionBody.scala → ...umber/scala/DataTableDefinitionBody.scala b/...umber/scala/DataTableDefinitionBody.scala → ...umber/scala/DataTableDefinitionBody.scala
diff --git a/...scala/io/cucumber/scala/GlueAdaptor.scala → ...scala/io/cucumber/scala/GlueAdaptor.scala b/...scala/io/cucumber/scala/GlueAdaptor.scala → ...scala/io/cucumber/scala/GlueAdaptor.scala
diff --git a/...n/scala/io/cucumber/scala/Implicits.scala → ...n/scala/io/cucumber/scala/Implicits.scala b/...n/scala/io/cucumber/scala/Implicits.scala → ...n/scala/io/cucumber/scala/Implicits.scala
diff --git a/...la/IncorrectHookDefinitionException.scala → ...la/IncorrectHookDefinitionException.scala b/...la/IncorrectHookDefinitionException.scala → ...la/IncorrectHookDefinitionException.scala
diff --git a/...la/IncorrectStepDefinitionException.scala → ...la/IncorrectStepDefinitionException.scala b/...la/IncorrectStepDefinitionException.scala → ...la/IncorrectStepDefinitionException.scala
diff --git a/...sonDefaultDataTableEntryTransformer.scala → ...sonDefaultDataTableEntryTransformer.scala b/...sonDefaultDataTableEntryTransformer.scala → ...sonDefaultDataTableEntryTransformer.scala
diff --git a/.../io/cucumber/scala/PendingException.scala → .../io/cucumber/scala/PendingException.scala b/.../io/cucumber/scala/PendingException.scala → .../io/cucumber/scala/PendingException.scala
diff --git a/...cala/io/cucumber/scala/ScalaBackend.scala → ...cala/io/cucumber/scala/ScalaBackend.scala b/...cala/io/cucumber/scala/ScalaBackend.scala → ...cala/io/cucumber/scala/ScalaBackend.scala
diff --git a/...r/scala/ScalaBackendProviderService.scala → ...r/scala/ScalaBackendProviderService.scala b/...r/scala/ScalaBackendProviderService.scala → ...r/scala/ScalaBackendProviderService.scala
diff --git a/.../scala/ScalaDataTableCellDefinition.scala → .../scala/ScalaDataTableCellDefinition.scala b/.../scala/ScalaDataTableCellDefinition.scala → .../scala/ScalaDataTableCellDefinition.scala
diff --git a/...mber/scala/ScalaDataTableDefinition.scala → ...mber/scala/ScalaDataTableDefinition.scala b/...mber/scala/ScalaDataTableDefinition.scala → ...mber/scala/ScalaDataTableDefinition.scala
diff --git a/...scala/ScalaDataTableEntryDefinition.scala → ...scala/ScalaDataTableEntryDefinition.scala b/...scala/ScalaDataTableEntryDefinition.scala → ...scala/ScalaDataTableEntryDefinition.scala
diff --git a/...calaDataTableOptionalCellDefinition.scala → ...calaDataTableOptionalCellDefinition.scala b/...calaDataTableOptionalCellDefinition.scala → ...calaDataTableOptionalCellDefinition.scala
diff --git a/...alaDataTableOptionalEntryDefinition.scala → ...alaDataTableOptionalEntryDefinition.scala b/...alaDataTableOptionalEntryDefinition.scala → ...alaDataTableOptionalEntryDefinition.scala
diff --git a/...ScalaDataTableOptionalRowDefinition.scala → ...ScalaDataTableOptionalRowDefinition.scala b/...ScalaDataTableOptionalRowDefinition.scala → ...ScalaDataTableOptionalRowDefinition.scala
diff --git a/...r/scala/ScalaDataTableRowDefinition.scala → ...r/scala/ScalaDataTableRowDefinition.scala b/...r/scala/ScalaDataTableRowDefinition.scala → ...r/scala/ScalaDataTableRowDefinition.scala
diff --git a/.../scala/ScalaDataTableTypeDefinition.scala → .../scala/ScalaDataTableTypeDefinition.scala b/.../scala/ScalaDataTableTypeDefinition.scala → .../scala/ScalaDataTableTypeDefinition.scala
diff --git a/...ber/scala/ScalaDataTableTypeDetails.scala → ...ber/scala/ScalaDataTableTypeDetails.scala b/...ber/scala/ScalaDataTableTypeDetails.scala → ...ber/scala/ScalaDataTableTypeDetails.scala
diff --git a/...tDataTableCellTransformerDefinition.scala → ...tDataTableCellTransformerDefinition.scala b/...tDataTableCellTransformerDefinition.scala → ...tDataTableCellTransformerDefinition.scala
diff --git a/...DataTableEntryTransformerDefinition.scala → ...DataTableEntryTransformerDefinition.scala b/...DataTableEntryTransformerDefinition.scala → ...DataTableEntryTransformerDefinition.scala
diff --git a/...faultParameterTransformerDefinition.scala → ...faultParameterTransformerDefinition.scala b/...faultParameterTransformerDefinition.scala → ...faultParameterTransformerDefinition.scala
diff --git a/...cala/ScalaDefaultTransformerDetails.scala → ...cala/ScalaDefaultTransformerDetails.scala b/...cala/ScalaDefaultTransformerDetails.scala → ...cala/ScalaDefaultTransformerDetails.scala
@@ -1,6 +1,6 @@
 package io.cucumber.scala
 
-import io.cucumber.scala.Aliases.{DefaultDataTableCellTransformerBody, DefaultDataTableEntryTransformerBody, DefaultParameterTransformerBody}
+import Aliases.{DefaultDataTableCellTransformerBody, DefaultDataTableEntryTransformerBody, DefaultParameterTransformerBody}
 
 case class ScalaDefaultParameterTransformerDetails(body: DefaultParameterTransformerBody)
 

diff --git a/.../scala/ScalaDocStringTypeDefinition.scala → .../scala/ScalaDocStringTypeDefinition.scala b/.../scala/ScalaDocStringTypeDefinition.scala → .../scala/ScalaDocStringTypeDefinition.scala
diff --git a/...ber/scala/ScalaDocStringTypeDetails.scala → ...ber/scala/ScalaDocStringTypeDetails.scala b/...ber/scala/ScalaDocStringTypeDetails.scala → ...ber/scala/ScalaDocStringTypeDetails.scala
@@ -1,6 +1,6 @@
 package io.cucumber.scala
 
-import io.cucumber.scala.Aliases.DocStringDefinitionBody
+import Aliases.DocStringDefinitionBody
 
 import scala.reflect.ClassTag
 

diff --git a/...in/scala/io/cucumber/scala/ScalaDsl.scala → ...in/scala/io/cucumber/scala/ScalaDsl.scala b/...in/scala/io/cucumber/scala/ScalaDsl.scala → ...in/scala/io/cucumber/scala/ScalaDsl.scala
@@ -1,6 +1,6 @@
 package io.cucumber.scala
 
-import io.cucumber.scala.Aliases._
+import Aliases._
 
 import scala.reflect.ClassTag
 

diff --git a/.../io/cucumber/scala/ScalaDslRegistry.scala → .../io/cucumber/scala/ScalaDslRegistry.scala b/.../io/cucumber/scala/ScalaDslRegistry.scala → .../io/cucumber/scala/ScalaDslRegistry.scala
@@ -1,6 +1,6 @@
 package io.cucumber.scala
 
-import io.cucumber.scala.HookType.{AFTER, AFTER_STEP, BEFORE, BEFORE_STEP}
+import HookType.{AFTER, AFTER_STEP, BEFORE, BEFORE_STEP}
 
 class ScalaDslRegistry {
 

diff --git a/.../cucumber/scala/ScalaHookDefinition.scala → .../cucumber/scala/ScalaHookDefinition.scala b/.../cucumber/scala/ScalaHookDefinition.scala → .../cucumber/scala/ScalaHookDefinition.scala
diff --git a/.../io/cucumber/scala/ScalaHookDetails.scala → .../io/cucumber/scala/ScalaHookDetails.scala b/.../io/cucumber/scala/ScalaHookDetails.scala → .../io/cucumber/scala/ScalaHookDetails.scala
@@ -1,5 +1,5 @@
 package io.cucumber.scala
 
-import io.cucumber.scala.Aliases.HookDefinitionBody
+import Aliases.HookDefinitionBody
 
 case class ScalaHookDetails(tagExpression: String, order: Int, body: HookDefinitionBody)
diff --git a/...o/cucumber/scala/ScalaParameterInfo.scala → ...o/cucumber/scala/ScalaParameterInfo.scala b/...o/cucumber/scala/ScalaParameterInfo.scala → ...o/cucumber/scala/ScalaParameterInfo.scala
diff --git a/.../scala/ScalaParameterTypeDefinition.scala → .../scala/ScalaParameterTypeDefinition.scala b/.../scala/ScalaParameterTypeDefinition.scala → .../scala/ScalaParameterTypeDefinition.scala
diff --git a/...ber/scala/ScalaParameterTypeDetails.scala → ...ber/scala/ScalaParameterTypeDetails.scala b/...ber/scala/ScalaParameterTypeDetails.scala → ...ber/scala/ScalaParameterTypeDetails.scala
diff --git a/...cala/io/cucumber/scala/ScalaSnippet.scala → ...cala/io/cucumber/scala/ScalaSnippet.scala b/...cala/io/cucumber/scala/ScalaSnippet.scala → ...cala/io/cucumber/scala/ScalaSnippet.scala
diff --git a/.../cucumber/scala/ScalaStepDefinition.scala → .../cucumber/scala/ScalaStepDefinition.scala b/.../cucumber/scala/ScalaStepDefinition.scala → .../cucumber/scala/ScalaStepDefinition.scala
diff --git a/.../io/cucumber/scala/ScalaStepDetails.scala → .../io/cucumber/scala/ScalaStepDetails.scala b/.../io/cucumber/scala/ScalaStepDetails.scala → .../io/cucumber/scala/ScalaStepDetails.scala
diff --git a/...a/io/cucumber/scala/ScalaTypeHelper.scala → ...a/io/cucumber/scala/ScalaTypeHelper.scala b/...a/io/cucumber/scala/ScalaTypeHelper.scala → ...a/io/cucumber/scala/ScalaTypeHelper.scala
diff --git a/...io/cucumber/scala/ScalaTypeResolver.scala → ...io/cucumber/scala/ScalaTypeResolver.scala b/...io/cucumber/scala/ScalaTypeResolver.scala → ...io/cucumber/scala/ScalaTypeResolver.scala
diff --git a/...in/scala/io/cucumber/scala/Scenario.scala → ...in/scala/io/cucumber/scala/Scenario.scala b/...in/scala/io/cucumber/scala/Scenario.scala → ...in/scala/io/cucumber/scala/Scenario.scala
diff --git a/.../main/scala/io/cucumber/scala/Utils.scala → .../main/scala/io/cucumber/scala/Utils.scala b/.../main/scala/io/cucumber/scala/Utils.scala → .../main/scala/io/cucumber/scala/Utils.scala
diff --git a/...main/scala/io/cucumber/scala/package.html → ...main/scala/io/cucumber/scala/package.html b/...main/scala/io/cucumber/scala/package.html → ...main/scala/io/cucumber/scala/package.html
diff --git a/...es/src/test/resources/cucumber.properties → ...la/src/test/resources/cucumber.properties b/...es/src/test/resources/cucumber.properties → ...la/src/test/resources/cucumber.properties
diff --git a/.../test/resources/tests/cukes/cukes.feature → .../test/resources/tests/cukes/cukes.feature b/.../test/resources/tests/cukes/cukes.feature → .../test/resources/tests/cukes/cukes.feature
diff --git a/...es/tests/datatables/DataTableType.feature → ...es/tests/datatables/DataTableType.feature b/...es/tests/datatables/DataTableType.feature → ...es/tests/datatables/DataTableType.feature
diff --git a/...ources/tests/datatables/Datatable.feature → ...ources/tests/datatables/Datatable.feature b/...ources/tests/datatables/Datatable.feature → ...ources/tests/datatables/Datatable.feature
diff --git a/...tests/datatables/DatatableAsScala.feature → ...tests/datatables/DatatableAsScala.feature b/...tests/datatables/DatatableAsScala.feature → ...tests/datatables/DatatableAsScala.feature
diff --git a/...sources/tests/docstring/Docstring.feature → ...sources/tests/docstring/Docstring.feature b/...sources/tests/docstring/Docstring.feature → ...sources/tests/docstring/Docstring.feature
diff --git a/...resources/tests/isolated/isolated.feature → ...resources/tests/isolated/isolated.feature b/...resources/tests/isolated/isolated.feature → ...resources/tests/isolated/isolated.feature
diff --git a/...esources/tests/isolated/isolated2.feature → ...esources/tests/isolated/isolated2.feature b/...esources/tests/isolated/isolated2.feature → ...esources/tests/isolated/isolated2.feature
diff --git a/...t/resources/tests/jackson/Jackson.feature → ...t/resources/tests/jackson/Jackson.feature b/...t/resources/tests/jackson/Jackson.feature → ...t/resources/tests/jackson/Jackson.feature
diff --git a/.../tests/misc/OptionalCaptureGroups.feature → .../tests/misc/OptionalCaptureGroups.feature b/.../tests/misc/OptionalCaptureGroups.feature → .../tests/misc/OptionalCaptureGroups.feature
diff --git a/...est/resources/tests/object/object.feature → ...est/resources/tests/object/object.feature b/...est/resources/tests/object/object.feature → ...est/resources/tests/object/object.feature
diff --git a/...sts/parametertypes/ParameterTypes.feature → ...sts/parametertypes/ParameterTypes.feature b/...sts/parametertypes/ParameterTypes.feature → ...sts/parametertypes/ParameterTypes.feature
diff --git a/.../io/cucumber/scala/ScalaBackendTest.scala → .../io/cucumber/scala/ScalaBackendTest.scala b/.../io/cucumber/scala/ScalaBackendTest.scala → .../io/cucumber/scala/ScalaBackendTest.scala
diff --git a/...ber/scala/ScalaDslDataTableTypeTest.scala → ...ber/scala/ScalaDslDataTableTypeTest.scala b/...ber/scala/ScalaDslDataTableTypeTest.scala → ...ber/scala/ScalaDslDataTableTypeTest.scala
diff --git a/...DefaultDataTableCellTransformerTest.scala → ...DefaultDataTableCellTransformerTest.scala b/...DefaultDataTableCellTransformerTest.scala → ...DefaultDataTableCellTransformerTest.scala
diff --git a/...efaultDataTableEntryTransformerTest.scala → ...efaultDataTableEntryTransformerTest.scala b/...efaultDataTableEntryTransformerTest.scala → ...efaultDataTableEntryTransformerTest.scala
diff --git a/...aDslDefaultParameterTransformerTest.scala → ...aDslDefaultParameterTransformerTest.scala b/...aDslDefaultParameterTransformerTest.scala → ...aDslDefaultParameterTransformerTest.scala
diff --git a/...ber/scala/ScalaDslDocStringTypeTest.scala → ...ber/scala/ScalaDslDocStringTypeTest.scala b/...ber/scala/ScalaDslDocStringTypeTest.scala → ...ber/scala/ScalaDslDocStringTypeTest.scala
diff --git a/...io/cucumber/scala/ScalaDslHooksTest.scala → ...io/cucumber/scala/ScalaDslHooksTest.scala b/...io/cucumber/scala/ScalaDslHooksTest.scala → ...io/cucumber/scala/ScalaDslHooksTest.scala
diff --git a/...ber/scala/ScalaDslParameterTypeTest.scala → ...ber/scala/ScalaDslParameterTypeTest.scala b/...ber/scala/ScalaDslParameterTypeTest.scala → ...ber/scala/ScalaDslParameterTypeTest.scala
diff --git a/...io/cucumber/scala/ScalaDslStepsTest.scala → ...io/cucumber/scala/ScalaDslStepsTest.scala b/...io/cucumber/scala/ScalaDslStepsTest.scala → ...io/cucumber/scala/ScalaDslStepsTest.scala
diff --git a/.../io/cucumber/scala/ScalaSnippetTest.scala → .../io/cucumber/scala/ScalaSnippetTest.scala b/.../io/cucumber/scala/ScalaSnippetTest.scala → .../io/cucumber/scala/ScalaSnippetTest.scala
diff --git a/...io/cucumber/scala/TestFeatureParser.scala → ...io/cucumber/scala/TestFeatureParser.scala b/...io/cucumber/scala/TestFeatureParser.scala → ...io/cucumber/scala/TestFeatureParser.scala
diff --git a/...la/steps/classes/MultipleInSameFile.scala → ...la/steps/classes/MultipleInSameFile.scala b/...la/steps/classes/MultipleInSameFile.scala → ...la/steps/classes/MultipleInSameFile.scala
diff --git a/...mber/scala/steps/classes/SingleFile.scala → ...mber/scala/steps/classes/SingleFile.scala b/...mber/scala/steps/classes/SingleFile.scala → ...mber/scala/steps/classes/SingleFile.scala
diff --git a/...hooks/IncorrectClassHooksDefinition.scala → ...hooks/IncorrectClassHooksDefinition.scala b/...hooks/IncorrectClassHooksDefinition.scala → ...hooks/IncorrectClassHooksDefinition.scala
diff --git a/...ooks/IncorrectObjectHooksDefinition.scala → ...ooks/IncorrectObjectHooksDefinition.scala b/...ooks/IncorrectObjectHooksDefinition.scala → ...ooks/IncorrectObjectHooksDefinition.scala
diff --git a/...r/scala/steps/objects/StepsInObject.scala → ...r/scala/steps/objects/StepsInObject.scala b/...r/scala/steps/objects/StepsInObject.scala → ...r/scala/steps/objects/StepsInObject.scala
diff --git a/...ber/scala/steps/traits/StepsInTrait.scala → ...ber/scala/steps/traits/StepsInTrait.scala b/...ber/scala/steps/traits/StepsInTrait.scala → ...ber/scala/steps/traits/StepsInTrait.scala
diff --git a/...test/scala/tests/cukes/RunCukesTest.scala → ...test/scala/tests/cukes/RunCukesTest.scala b/...test/scala/tests/cukes/RunCukesTest.scala → ...test/scala/tests/cukes/RunCukesTest.scala
diff --git a/...src/test/scala/tests/cukes/StepDefs.scala → ...src/test/scala/tests/cukes/StepDefs.scala b/...src/test/scala/tests/cukes/StepDefs.scala → ...src/test/scala/tests/cukes/StepDefs.scala
diff --git a/...sts/cukes/TypeRegistryConfiguration.scala → ...sts/cukes/TypeRegistryConfiguration.scala b/...sts/cukes/TypeRegistryConfiguration.scala → ...sts/cukes/TypeRegistryConfiguration.scala
diff --git a/...c/test/scala/tests/cukes/model/Cuke.scala → ...c/test/scala/tests/cukes/model/Cuke.scala b/...c/test/scala/tests/cukes/model/Cuke.scala → ...c/test/scala/tests/cukes/model/Cuke.scala
diff --git a/...test/scala/tests/cukes/model/Person.scala → ...test/scala/tests/cukes/model/Person.scala b/...test/scala/tests/cukes/model/Person.scala → ...test/scala/tests/cukes/model/Person.scala
diff --git a/.../test/scala/tests/cukes/model/Snake.scala → .../test/scala/tests/cukes/model/Snake.scala b/.../test/scala/tests/cukes/model/Snake.scala → .../test/scala/tests/cukes/model/Snake.scala
diff --git a/...tests/datatables/DataTableTypeSteps.scala → ...tests/datatables/DataTableTypeSteps.scala b/...tests/datatables/DataTableTypeSteps.scala → ...tests/datatables/DataTableTypeSteps.scala
diff --git a/...ts/datatables/DatatableAsScalaSteps.scala → ...ts/datatables/DatatableAsScalaSteps.scala b/...ts/datatables/DatatableAsScalaSteps.scala → ...ts/datatables/DatatableAsScalaSteps.scala
diff --git a/...ala/tests/datatables/DatatableSteps.scala → ...ala/tests/datatables/DatatableSteps.scala b/...ala/tests/datatables/DatatableSteps.scala → ...ala/tests/datatables/DatatableSteps.scala
diff --git a/.../tests/datatables/RunDatatablesTest.scala → .../tests/datatables/RunDatatablesTest.scala b/.../tests/datatables/RunDatatablesTest.scala → .../tests/datatables/RunDatatablesTest.scala
diff --git a/...cala/tests/docstring/DocStringSteps.scala → ...cala/tests/docstring/DocStringSteps.scala b/...cala/tests/docstring/DocStringSteps.scala → ...cala/tests/docstring/DocStringSteps.scala
diff --git a/...la/tests/docstring/RunDocStringTest.scala → ...la/tests/docstring/RunDocStringTest.scala b/...la/tests/docstring/RunDocStringTest.scala → ...la/tests/docstring/RunDocStringTest.scala
diff --git a/.../scala/tests/isolated/IsolatedSteps.scala → .../scala/tests/isolated/IsolatedSteps.scala b/.../scala/tests/isolated/IsolatedSteps.scala → .../scala/tests/isolated/IsolatedSteps.scala
diff --git a/...cala/tests/isolated/RunIsolatedTest.scala → ...cala/tests/isolated/RunIsolatedTest.scala b/...cala/tests/isolated/RunIsolatedTest.scala → ...cala/tests/isolated/RunIsolatedTest.scala
diff --git a/...st/scala/tests/jackson/JacksonSteps.scala → ...st/scala/tests/jackson/JacksonSteps.scala b/...st/scala/tests/jackson/JacksonSteps.scala → ...st/scala/tests/jackson/JacksonSteps.scala
diff --git a/.../scala/tests/jackson/RunJacksonTest.scala → .../scala/tests/jackson/RunJacksonTest.scala b/.../scala/tests/jackson/RunJacksonTest.scala → .../scala/tests/jackson/RunJacksonTest.scala
diff --git a/...sts/misc/OptionalCaptureGroupsSteps.scala → ...sts/misc/OptionalCaptureGroupsSteps.scala b/...sts/misc/OptionalCaptureGroupsSteps.scala → ...sts/misc/OptionalCaptureGroupsSteps.scala
diff --git a/...c/test/scala/tests/misc/RunMiscTest.scala → ...c/test/scala/tests/misc/RunMiscTest.scala b/...c/test/scala/tests/misc/RunMiscTest.scala → ...c/test/scala/tests/misc/RunMiscTest.scala
diff --git a/...test/scala/tests/object/ObjectSteps.scala → ...test/scala/tests/object/ObjectSteps.scala b/...test/scala/tests/object/ObjectSteps.scala → ...test/scala/tests/object/ObjectSteps.scala
diff --git a/...st/scala/tests/object/RunObjectTest.scala → ...st/scala/tests/object/RunObjectTest.scala b/...st/scala/tests/object/RunObjectTest.scala → ...st/scala/tests/object/RunObjectTest.scala
diff --git a/.../parametertypes/ParameterTypesSteps.scala → .../parametertypes/ParameterTypesSteps.scala b/.../parametertypes/ParameterTypesSteps.scala → .../parametertypes/ParameterTypesSteps.scala
diff --git a/...arametertypes/RunParameterTypesTest.scala → ...arametertypes/RunParameterTypesTest.scala b/...arametertypes/RunParameterTypesTest.scala → ...arametertypes/RunParameterTypesTest.scala