diff --git a/main/src/test/resources/old-format/15.sbt.txt b/main/src/test/resources/old-format/15.sbt.txt index 9feb4f5a4..fc7f76e75 100644 --- a/main/src/test/resources/old-format/15.sbt.txt +++ b/main/src/test/resources/old-format/15.sbt.txt @@ -3,7 +3,7 @@ name := "play-html-compressor" scalaVersion := "2.11.1" -val pom = +val pom = git@github.com:mohiva/play-html-compressor.git scm:git:git@github.com:mohiva/play-html-compressor.git @@ -13,9 +13,6 @@ val pom = Christian Kaps http://mohiva.com - + publishMavenStyle := true - - - diff --git a/main/src/test/resources/old-format/22.sbt.txt b/main/src/test/resources/old-format/22.sbt.txt index 2372c91de..4b6e131ae 100644 --- a/main/src/test/resources/old-format/22.sbt.txt +++ b/main/src/test/resources/old-format/22.sbt.txt @@ -22,7 +22,6 @@ parallelExecution in Test := false // publishing pomExtra := - http://nbronson.github.com/scala-stm/ @@ -42,7 +41,6 @@ pomExtra := ngbronson@gmail.com - publishMavenStyle := true diff --git a/main/src/test/resources/session-settings-quick/3.sbt.txt b/main/src/test/resources/session-settings-quick/3.sbt.txt index 8a36f7432..6db83e79c 100644 --- a/main/src/test/resources/session-settings-quick/3.sbt.txt +++ b/main/src/test/resources/session-settings-quick/3.sbt.txt @@ -2,7 +2,7 @@ import sbt._ val scmpom = taskKey[xml.NodeBuffer]("Node buffer") -scmpom := +scmpom := git@github.com:mohiva/play-html-compressor.git scm:git:git@github.com:mohiva/play-html-compressor.git @@ -13,4 +13,4 @@ scmpom := http://mohiva.com - \ No newline at end of file + \ No newline at end of file diff --git a/main/src/test/resources/session-settings-quick/3.sbt.txt_1/1.set b/main/src/test/resources/session-settings-quick/3.sbt.txt_1/1.set index 9e7c59124..3e2aa8d48 100644 --- a/main/src/test/resources/session-settings-quick/3.sbt.txt_1/1.set +++ b/main/src/test/resources/session-settings-quick/3.sbt.txt_1/1.set @@ -1 +1 @@ -scmpom := OK \ No newline at end of file +scmpom := OK \ No newline at end of file diff --git a/main/src/test/resources/session-settings-quick/3.sbt.txt_1/1.set.result b/main/src/test/resources/session-settings-quick/3.sbt.txt_1/1.set.result index 2eab3cd5a..f4763bc5f 100644 --- a/main/src/test/resources/session-settings-quick/3.sbt.txt_1/1.set.result +++ b/main/src/test/resources/session-settings-quick/3.sbt.txt_1/1.set.result @@ -2,4 +2,4 @@ import sbt._ val scmpom = taskKey[xml.NodeBuffer]("Node buffer") -scmpom := OK \ No newline at end of file +scmpom := OK \ No newline at end of file diff --git a/notes/0.13.9.markdown b/notes/0.13.9.markdown index 83482b18c..3bd93a625 100644 --- a/notes/0.13.9.markdown +++ b/notes/0.13.9.markdown @@ -11,7 +11,7 @@ [@PanAeon]: https://github.com/PanAeon [@asflierl]: http://github.com/asflierl [@matthewfarwell]: http://github.com/matthewfarwell - + [SI9027]: https://issues.scala-lang.org/browse/SI-9027 [1950]: https://github.com/sbt/sbt/pull/1950 [1987]: https://github.com/sbt/sbt/pull/1987 [1970]: https://github.com/sbt/sbt/pull/1970 @@ -40,11 +40,14 @@ [2035]: https://github.com/sbt/sbt/pull/2035 [2001]: https://github.com/sbt/sbt/issues/2001 [2027]: https://github.com/sbt/sbt/pull/2027 + [1666]: https://github.com/sbt/sbt/issues/1666 + [2068]: https://github.com/sbt/sbt/pull/2068 ### Fixes with compatibility implications - Starting 0.13.9, `crossScalaVersions` default value is fixed back to the older 0.12.x behavior. See below for details. - Starting 0.13.9, the generated POM files no longer include dependencies on source or javadoc jars obtained via `withSources()` or `withJavadoc()`. See below for details. +- Scala version is bumped to 2.10.5. This brings in the fix for [SI-9027][SI9027]: XML node sequence literal bug. [#1666][1666]/[#2068][2068] by [@eed3si9n][@eed3si9n] ### Improvements