From 632b14cf7875c53572f3503edb2d91036f979e3e Mon Sep 17 00:00:00 2001 From: Alexey Alekhin Date: Mon, 25 Sep 2017 15:06:17 +0200 Subject: [PATCH 1/3] Changed default version setting to 0.1.0-SNAPSHOT To make it compatible with semantic versioning. Fixes #3467. --- main/src/main/scala/sbt/Defaults.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala index 638ccbe21..33fac9d1b 100755 --- a/main/src/main/scala/sbt/Defaults.scala +++ b/main/src/main/scala/sbt/Defaults.scala @@ -187,7 +187,7 @@ object Defaults extends BuildCommon { }, crossVersion :== Disabled(), buildDependencies := Classpaths.constructBuildDependencies.value, - version :== "0.1-SNAPSHOT", + version :== "0.1.0-SNAPSHOT", classpathTypes :== Set("jar", "bundle") ++ CustomPomParser.JarPackagings, artifactClassifier :== None, checksums := Classpaths.bootChecksums(appConfiguration.value), From e99aa6d7b3047b008016b318fa03284c73363209 Mon Sep 17 00:00:00 2001 From: Alexey Alekhin Date: Tue, 26 Sep 2017 01:22:44 +0200 Subject: [PATCH 2/3] Added release note for the `version` new default --- notes/1.1.0/new-version-default.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 notes/1.1.0/new-version-default.md diff --git a/notes/1.1.0/new-version-default.md b/notes/1.1.0/new-version-default.md new file mode 100644 index 000000000..c9aabd112 --- /dev/null +++ b/notes/1.1.0/new-version-default.md @@ -0,0 +1,3 @@ +### Improvements + +- Changes `version` setting default to `0.1.0-SNAPSHOT` for compatibility with Semantic Versioning From 402b9ef95c2a31c4dc7630cc5b4a7f93c4f8304f Mon Sep 17 00:00:00 2001 From: Alexey Alekhin Date: Tue, 26 Sep 2017 13:13:33 +0200 Subject: [PATCH 3/3] Fixed version in the package-delete-target test --- sbt/src/sbt-test/actions/package-delete-target/test | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sbt/src/sbt-test/actions/package-delete-target/test b/sbt/src/sbt-test/actions/package-delete-target/test index a04dd25bd..7fa1b3ae7 100644 --- a/sbt/src/sbt-test/actions/package-delete-target/test +++ b/sbt/src/sbt-test/actions/package-delete-target/test @@ -1,4 +1,4 @@ -$ mkdir target/scala-2.12/delete-target_2.12-0.1-SNAPSHOT.jar -$ touch target/scala-2.12/delete-target_2.12-0.1-SNAPSHOT.jar/hello +$ mkdir target/scala-2.12/delete-target_2.12-0.1.0-SNAPSHOT.jar +$ touch target/scala-2.12/delete-target_2.12-0.1.0-SNAPSHOT.jar/hello -> package -$ exists target/scala-2.12/delete-target_2.12-0.1-SNAPSHOT.jar/hello +$ exists target/scala-2.12/delete-target_2.12-0.1.0-SNAPSHOT.jar/hello