refactor: Use slash syntax in scripted (#1649)

**Problem/Solution** In preparation for sbt 2.x, we need to migrate all the old style shell syntax in scripted tests to slash.
sbt · Nov 11, 2024 · 7c68859 · 7c68859
1 parent b4688c6
commit 7c68859
Show file tree

Hide file tree

Showing 105 changed files with 146 additions and 146 deletions.
diff --git a/README.md b/README.md
@@ -77,26 +77,26 @@ If you have enabled one of the archetypes (app or server),
 you can build your application with
 
 ```bash
-sbt <config-scope>:packageBin
+sbt <config-scope>/packageBin
 ```
 
 ### Examples
 
 ```bash
 # universal zip
-sbt universal:packageBin
+sbt Universal/packageBin
 
 # debian package
-sbt debian:packageBin
+sbt Debian/packageBin
 
 # rpm package
-sbt rpm:packageBin
+sbt Rpm/packageBin
 
 # docker image
-sbt docker:publishLocal
+sbt Docker/publishLocal
 
 # graalvm image
-sbt graalvm-native-image:packageBin
+sbt GraalVMNativeImage/packageBin
 ```
 
 Read more in the specific [format documentation][formats] on how to configure and build your package.

diff --git a/integration-tests-ansible/test-project-play-rpm/run-sbt-build.sh b/integration-tests-ansible/test-project-play-rpm/run-sbt-build.sh
@@ -5,4 +5,4 @@ set -euo pipefail
 IFS=$'\n\t'
 
 sbt --warn update compile
-sbt 'rpm:packageBin'
+sbt 'Rpm/packageBin'
diff --git a/src/main/scala/com/typesafe/sbt/packager/debian/JDebPackaging.scala b/src/main/scala/com/typesafe/sbt/packager/debian/JDebPackaging.scala
@@ -133,7 +133,7 @@ class JDebConsole(log: Logger) extends org.vafer.jdeb.Console {
   * ==JDeb Packaging Task==
   *
   * This private class contains all the jdeb-plugin specific implementations. It's only invoked when the jdeb plugin is
-  * enabled and the `debian:packageBin` task is called. This means that all classes in `org.vafer.jdeb._` are only
+  * enabled and the `Debian/packageBin` task is called. This means that all classes in `org.vafer.jdeb._` are only
   * loaded when required and allows us to put the dependency in the "provided" scope. The provided scope means that we
   * have less dependency issues in an sbt build.
   */

diff --git a/src/main/scala/com/typesafe/sbt/packager/debian/Keys.scala b/src/main/scala/com/typesafe/sbt/packager/debian/Keys.scala
@@ -40,7 +40,7 @@ trait DebianKeys {
   val debianCombinedMappings =
     TaskKey[Seq[LinuxPackageMapping]]("debian-combined-mappings", "All the mappings of files for the final package.")
 
-  @deprecated("Use debian:stage instead", "1.2.0")
+  @deprecated("Use Debian/stage instead", "1.2.0")
   val debianExplodedPackage = TaskKey[File]("debian-exploded-package", "makes an exploded debian package")
   val lintian = TaskKey[Unit]("lintian", "runs the debian lintian tool on the current package.")
   val debianSign = TaskKey[File]("debian-sign", "runs the dpkg-sig command to sign the generated deb file.")

diff --git a/src/main/scala/com/typesafe/sbt/packager/docker/DockerSpotifyClientPlugin.scala b/src/main/scala/com/typesafe/sbt/packager/docker/DockerSpotifyClientPlugin.scala
@@ -100,7 +100,7 @@ object DockerSpotifyClientPlugin extends AutoPlugin {
   * ==Docker Client Task==
   *
   * This private class contains all the docker-plugin specific implementations. It's only invoked when the docker plugin
-  * is enabled and the `docker:publishLocal` task is called. This means that all classes in
+  * is enabled and the `Docker/publishLocal` task is called. This means that all classes in
   * `com.spotify.docker.client._` are only loaded when required and allows us to put the dependency in the "provided"
   * scope. The provided scope means that we have less dependency issues in an sbt build.
   */

diff --git a/src/main/scala/com/typesafe/sbt/packager/docker/LayeredMapping.scala b/src/main/scala/com/typesafe/sbt/packager/docker/LayeredMapping.scala
@@ -6,7 +6,7 @@ import java.io.File
   * Mapping of file to intermediate layers.
   *
   * @param layerId
-  *   The identifier in the layer used to increase cache hits in docker caching. LayerId is present in docker:stage
+  *   The identifier in the layer used to increase cache hits in docker caching. LayerId is present in Docker/stage
   *   directory structure and in intermediate image produced in the multi-stage docker build. None means the layering is
   *   skipped for this file.
   * @param file

diff --git a/src/main/scala/com/typesafe/sbt/packager/validation/ValidationKeys.scala b/src/main/scala/com/typesafe/sbt/packager/validation/ValidationKeys.scala
@@ -6,8 +6,8 @@ trait ValidationKeys {
 
   /**
     * A task that implements various validations for a format. Example usage:
-    *   - `sbt universal:packageBin::validatePackage`
-    *   - `sbt debian:packageBin::validatePackage`
+    *   - `sbt Universal/packageBin/validatePackage`
+    *   - `sbt Debian/packageBin/validatePackage`
     *
     * Each format should implement it's own validate. Implemented in #1026
     */

diff --git a/src/sbt-test/debian/daemon-group-gid-deb/test b/src/sbt-test/debian/daemon-group-gid-deb/test
@@ -1,5 +1,5 @@
 # Run the debian packaging.
-> debian:packageBin
+> Debian/packageBin
 $ exists target/debian-test_0.1.0_all.deb
 
 $ exists target/debian-test-0.1.0/etc

diff --git a/src/sbt-test/debian/daemon-user-deb/test b/src/sbt-test/debian/daemon-user-deb/test
@@ -1,5 +1,5 @@
 # Run the debian packaging.
-> debian:packageBin
+> Debian/packageBin
 $ exists target/debian-test_0.1.0_all.deb
 
 # Check defaults

diff --git a/src/sbt-test/debian/daemon-user-homedir-deb/test b/src/sbt-test/debian/daemon-user-homedir-deb/test
@@ -1,5 +1,5 @@
 # Run the debian packaging.
-> debian:packageBin
+> Debian/packageBin
 $ exists target/debian-test_0.1.0_all.deb
 
 # Check defaults

diff --git a/src/sbt-test/debian/daemon-user-shell-deb/test b/src/sbt-test/debian/daemon-user-shell-deb/test
@@ -1,5 +1,5 @@
 # Run the debian packaging.
-> debian:packageBin
+> Debian/packageBin
 $ exists target/debian-test_0.1.0_all.deb
 
 # Check defaults

diff --git a/src/sbt-test/debian/daemon-user-uid-deb/test b/src/sbt-test/debian/daemon-user-uid-deb/test
@@ -1,5 +1,5 @@
 # Run the debian packaging.
-> debian:packageBin
+> Debian/packageBin
 $ exists target/debian-test_0.1.0_all.deb
 
 $ exists target/debian-test-0.1.0/etc

diff --git a/src/sbt-test/debian/file-permissions/test b/src/sbt-test/debian/file-permissions/test
@@ -1,3 +1,3 @@
 # Run the debian packaging.
-> debian:packageBin
+> Debian/packageBin
 $ exists target/debian-test_0.1.0_all.deb
diff --git a/src/sbt-test/debian/gen-changes/test b/src/sbt-test/debian/gen-changes/test
@@ -1,4 +1,4 @@
 # Run the debian packaging.
-> debian:genChanges
+> Debian/genChanges
 $ exists target/debian-test_0.1.0_all.deb
 $ exists target/debian-test_0.1.0_all.changes
diff --git a/src/sbt-test/debian/java-app-archetype/test b/src/sbt-test/debian/java-app-archetype/test
@@ -1,5 +1,5 @@
 # Run the debian packaging.
-> debian:packageBin
+> Debian/packageBin
 $ exists target/debian-test_0.1.0_all.deb
 > stage
 $ exists target/universal/stage/bin/debian-test

diff --git a/src/sbt-test/debian/jdeb-conflicts/test b/src/sbt-test/debian/jdeb-conflicts/test
@@ -1,5 +1,5 @@
 # Run the debian packaging.
 $ mkdir src/resources/empty
-> debian:packageBin
+> Debian/packageBin
 $ exists target/debian-test_0.1.0_all.deb
 > checkConflicts
diff --git a/src/sbt-test/debian/jdeb-dependencies/test b/src/sbt-test/debian/jdeb-dependencies/test
@@ -1,5 +1,5 @@
 # Run the debian packaging.
 $ mkdir src/resources/empty
-> debian:packageBin
+> Debian/packageBin
 $ exists target/debian-test_0.1.0_all.deb
 > checkDependencies
diff --git a/src/sbt-test/debian/jdeb-dir-mappings/test b/src/sbt-test/debian/jdeb-dir-mappings/test
@@ -1,5 +1,5 @@
 # Run the debian packaging.
 $ mkdir src/resources/empty
-> debian:packageBin
+> Debian/packageBin
 $ exists target/debian-test_0.1.0_all.deb
 > checkDirMappings
diff --git a/src/sbt-test/debian/jdeb-provides/test b/src/sbt-test/debian/jdeb-provides/test
@@ -1,5 +1,5 @@
 # Run the debian packaging.
 $ mkdir src/resources/empty
-> debian:packageBin
+> Debian/packageBin
 $ exists target/debian-test_0.1.0_all.deb
 > checkProvides
diff --git a/src/sbt-test/debian/jdeb-script-replacements/test b/src/sbt-test/debian/jdeb-script-replacements/test
@@ -1,5 +1,5 @@
 # Run the debian packaging.
 $ mkdir src/resources/empty
-> debian:packageBin
+> Debian/packageBin
 $ exists target/debian-test_0.1.0_all.deb
 > checkControlFiles
diff --git a/src/sbt-test/debian/log-directory/test b/src/sbt-test/debian/log-directory/test
@@ -1,5 +1,5 @@
 # Run the debian packaging.
-> debian:packageBin
+> Debian/packageBin
 $ exists target/debian-test_0.1.0_all.deb
 
 # Check defaults

diff --git a/src/sbt-test/debian/native-build-compress/test b/src/sbt-test/debian/native-build-compress/test
@@ -1,2 +1,2 @@
-> debian:packageBin
+> Debian/packageBin
 > checkDebCompression
diff --git a/src/sbt-test/debian/native-build-default/test b/src/sbt-test/debian/native-build-default/test
@@ -1,2 +1,2 @@
-> debian:packageBin
+> Debian/packageBin
 > checkDebCompression
diff --git a/src/sbt-test/debian/override-control-files/test b/src/sbt-test/debian/override-control-files/test
@@ -1,5 +1,5 @@
 # Run the debian packaging.
-> debian:packageBin
+> Debian/packageBin
 $ exists target/debian-test_0.1.0_all.deb
 
 $ exists target/debian-test-0.1.0/etc

diff --git a/src/sbt-test/debian/override-etc-default/test b/src/sbt-test/debian/override-etc-default/test
@@ -1,5 +1,5 @@
 # Run the debian packaging.
-> debian:packageBin
+> Debian/packageBin
 $ exists target/debian-test_0.1.0_all.deb
 
 # Check files for defaults

diff --git a/src/sbt-test/debian/override-loader-functions/test b/src/sbt-test/debian/override-loader-functions/test
@@ -1,5 +1,5 @@
 # Run the debian packaging.
-> debian:packageBin
+> Debian/packageBin
 $ exists target/debian-test_0.1.0_all.deb
 
 # Check files for defaults

diff --git a/src/sbt-test/debian/override-start-script-systemd/test b/src/sbt-test/debian/override-start-script-systemd/test
@@ -1,5 +1,5 @@
 # Run the debian packaging.
-> debian:packageBin
+> Debian/packageBin
 $ exists target/debian-test_0.1.0_all.deb
 
 # Check files for defaults

diff --git a/src/sbt-test/debian/override-start-script-systemv/test b/src/sbt-test/debian/override-start-script-systemv/test
@@ -1,5 +1,5 @@
 # Run the debian packaging.
-> debian:packageBin
+> Debian/packageBin
 $ exists target/debian-test_0.1.0_all.deb
 
 # Check files for defaults

diff --git a/src/sbt-test/debian/override-start-script-upstart/test b/src/sbt-test/debian/override-start-script-upstart/test
@@ -1,5 +1,5 @@
 # Run the debian packaging.
-> debian:packageBin
+> Debian/packageBin
 $ exists target/debian-test_0.1.0_all.deb
 
 # Check files for defaults

diff --git a/src/sbt-test/debian/simple-deb/test b/src/sbt-test/debian/simple-deb/test
@@ -1,3 +1,3 @@
 # Run the debian packaging.
-> debian:packageBin
+> Debian/packageBin
 $ exists target/debian-test_0.1.0_all.deb
diff --git a/src/sbt-test/debian/simple-jdeb/test b/src/sbt-test/debian/simple-jdeb/test
@@ -1,3 +1,3 @@
 # Run the debian packaging.
-> debian:packageBin
+> Debian/packageBin
 $ exists target/debian-test_0.1.0_all.deb
diff --git a/src/sbt-test/debian/systemd-deb/test b/src/sbt-test/debian/systemd-deb/test
@@ -1,10 +1,10 @@
 # Run the debian packaging.
-> debian:packageBin
+> Debian/packageBin
 $ exists target/debian-test_0.1.0_all.deb
 
 $ exists target/debian-test-0.1.0/lib/systemd/system/debian-test.service
-> show debian:serverLoader
-> show debian:linuxStartScriptTemplate
+> show Debian/serverLoader
+> show Debian/linuxStartScriptTemplate
 > plugins
 
 > checkStartupScript
@@ -15,5 +15,5 @@ $ exists target/debian-test-0.1.0/lib/systemd/system/debian-test.service
 # Test that serviceAutostart can be disabled
 
 > set every NativePackagerKeys.serviceAutostart := false
-> debian:packageBin
+> Debian/packageBin
 > checkNoAutostart
diff --git a/src/sbt-test/debian/sysvinit-deb/test b/src/sbt-test/debian/sysvinit-deb/test
@@ -1,5 +1,5 @@
 # Run the debian packaging.
-> debian:packageBin
+> Debian/packageBin
 $ exists target/debian-test_0.1.0_all.deb
 
 $ exists target/debian-test-0.1.0/etc
@@ -13,5 +13,5 @@ $ exists target/debian-test-0.1.0/etc/init.d/debian-test
 # Test that serviceAutostart can be disabled
 
 > set every NativePackagerKeys.serviceAutostart := false
-> debian:packageBin
+> Debian/packageBin
 > checkNoAutostart
diff --git a/src/sbt-test/debian/sysvinit-stoptimeouts-deb/test b/src/sbt-test/debian/sysvinit-stoptimeouts-deb/test
@@ -1,5 +1,5 @@
 # Run the debian packaging.
-> debian:packageBin
+> Debian/packageBin
 $ exists target/debian-test_0.1.0_all.deb
 
 $ exists target/debian-test-0.1.0/etc

diff --git a/src/sbt-test/debian/test-executableScriptName/test b/src/sbt-test/debian/test-executableScriptName/test
@@ -1,5 +1,5 @@
 # Run the debian packaging.
-> debian:packageBin
+> Debian/packageBin
 $ exists target/debian-test_0.1.0_all.deb
 # Testing the packageName configuration
 $ exists target/debian-test-0.1.0/DEBIAN

diff --git a/src/sbt-test/debian/test-mapping-helpers/test b/src/sbt-test/debian/test-mapping-helpers/test
@@ -1,5 +1,5 @@
 # Run the debian packaging.
-> debian:packageBin
+> Debian/packageBin
 $ exists target/debian-test_0.1.0_all.deb
 
 # Template directories

diff --git a/src/sbt-test/debian/test-mapping/test b/src/sbt-test/debian/test-mapping/test
@@ -1,5 +1,5 @@
 # Run the debian packaging.
-> debian:packageBin
+> Debian/packageBin
 $ exists target/debian-test-override_0.1.0_all.deb
 # Testing the packageName configuration
 $ exists target/debian-test-override-0.1.0/DEBIAN

diff --git a/src/sbt-test/debian/test-packageName/test b/src/sbt-test/debian/test-packageName/test
@@ -1,5 +1,5 @@
 # Run the debian packaging.
-> debian:packageBin
+> Debian/packageBin
 $ exists target/debian-test-override_0.1.0_all.deb
 # Testing the packageName configuration
 $ exists target/debian-test-override-0.1.0/DEBIAN

diff --git a/src/sbt-test/debian/upstart-deb-facilities/test b/src/sbt-test/debian/upstart-deb-facilities/test
@@ -1,5 +1,5 @@
 # Run the debian packaging.
-> debian:packageBin
+> Debian/packageBin
 $ exists target/debian-test_0.1.0_all.deb
 $ exists target/debian-test-0.1.0/etc/init/debian-test.conf
 

diff --git a/src/sbt-test/debian/upstart-deb/test b/src/sbt-test/debian/upstart-deb/test
@@ -1,5 +1,5 @@
 # Run the debian packaging.
-> debian:packageBin
+> Debian/packageBin
 $ exists target/debian-test_0.1.0_all.deb
 
 $ exists target/debian-test-0.1.0/etc
@@ -20,5 +20,5 @@ $ exists target/debian-test-0.1.0/DEBIAN/postinst
 # Test that serviceAutostart can be disabled
 
 > set every NativePackagerKeys.serviceAutostart := false
-> debian:packageBin
+> Debian/packageBin
 > checkNoAutostart
diff --git a/src/sbt-test/docker/alias/test b/src/sbt-test/docker/alias/test
@@ -1,3 +1,3 @@
 # Stage the distribution and ensure files show up.
-> docker:publishLocal
+> Docker/publishLocal
 $ exec bash -c 'docker run docker-alias-test:0.1.0 | grep -q "Hello world"'
diff --git a/src/sbt-test/docker/autoremove-multi-stage-intermediate-images/test b/src/sbt-test/docker/autoremove-multi-stage-intermediate-images/test
@@ -3,12 +3,12 @@
 # First make sure we start clean
 $ exec bash -c 'docker image prune -f --filter label=snp-multi-stage=intermediate'
 # Generate the Docker image locally
-> docker:publishLocal
+> Docker/publishLocal
 # By default intermediate images will be removed
 -$ exec bash -c 'docker images --filter label=snp-multi-stage=intermediate | grep -q "<none>"'
 # Now lets change the default so we keep those images
 > set dockerAutoremoveMultiStageIntermediateImages := false
-> docker:publishLocal
+> Docker/publishLocal
 $ exec bash -c 'docker images --filter label=snp-multi-stage=intermediate | grep -q "<none>"'
 # Alright, now let's remove them by hand
 $ exec bash -c 'docker image prune -f --filter label=snp-multi-stage=intermediate'

diff --git a/src/sbt-test/docker/build-command/test b/src/sbt-test/docker/build-command/test
@@ -1,3 +1,3 @@
 # Stage the distribution and ensure files show up.
-> docker:publishLocal
+> Docker/publishLocal
 $ exec bash -c 'docker run docker-build-command-test:0.1.0 | grep -q "docker build command override test"'
diff --git a/src/sbt-test/docker/build-options/test b/src/sbt-test/docker/build-options/test
@@ -1,4 +1,4 @@
 # Stage the distribution and ensure files show up.
-> docker:publishLocal
+> Docker/publishLocal
 $ exec bash -c 'docker run docker-build-options-test:0.1.0 | grep -q "Hello world"'
 $ exec bash -c 'docker run docker-build-options-test:0.1.0-random-tag | grep -q "Hello world"'
diff --git a/src/sbt-test/docker/entrypoint/test b/src/sbt-test/docker/entrypoint/test
@@ -1,3 +1,3 @@
 # Stage the distribution and ensure files show up.
-> docker:stage
+> Docker/stage
 $ exec grep -q -F 'ENTRYPOINT ["/bin/sh", "-c", "env"]' target/docker/stage/Dockerfile
diff --git a/src/sbt-test/docker/envVars/test b/src/sbt-test/docker/envVars/test
@@ -1,3 +1,3 @@
 # Stage the distribution and ensure files show up.
-> docker:stage
+> Docker/stage
 > checkDockerfile