diff --git a/README.md b/README.md index 36836ae..695fbe3 100644 --- a/README.md +++ b/README.md @@ -43,23 +43,23 @@ libraryDependencies := { ## Maven sample -The following `pom.xml` snippet assumes you define a `scalaBinaryVersion` property in your pom.xml file. For example, the `scalaBinaryVersion` should be set to `2.11` for any Scala 2.11.x version. +The following `pom.xml` snippet assumes you define a `scala.compat.version` property in your pom.xml file for scala-maven-plugin 3.1.6 or later. For example, the `scala.compat.version` should be set to `2.11` for any Scala 2.11.x version. ```xml org.scala-lang.modules - scala-xml_${scalaBinaryVersion} + scala-xml_${scala.compat.version} 1.0.6 org.scala-lang.modules - scala-parser-combinators_${scalaBinaryVersion} + scala-parser-combinators_${scala.compat.version} 1.0.4 org.scala-lang.modules - scala-swing_${scalaBinaryVersion} + scala-swing_${scala.compat.version} 1.0.2 ``` diff --git a/maven-sample/pom.xml b/maven-sample/pom.xml index 641b4b0..a5c1afc 100644 --- a/maven-sample/pom.xml +++ b/maven-sample/pom.xml @@ -4,6 +4,9 @@ sample scala-module-dependency-sample 1.0-SNAPSHOT + + UTF-8 + @@ -13,28 +16,28 @@ true - 2.12.0 - 2.12 + 2.12.0 + 2.12 org.scala-lang scala-library - ${scalaVersion} + ${scala.version} org.scala-lang.modules - scala-xml_${scalaBinaryVersion} + scala-xml_${scala.compat.version} 1.0.6 org.scala-lang.modules - scala-parser-combinators_${scalaBinaryVersion} + scala-parser-combinators_${scala.compat.version} 1.0.4 org.scala-lang.modules - scala-swing_${scalaBinaryVersion} + scala-swing_${scala.compat.version} 2.0.0-M2 @@ -42,28 +45,28 @@ scala-2.11 - 2.11.8 - 2.11 + 2.11.8 + 2.11 org.scala-lang scala-library - ${scalaVersion} + ${scala.version} org.scala-lang.modules - scala-xml_${scalaBinaryVersion} + scala-xml_${scala.compat.version} 1.0.6 org.scala-lang.modules - scala-parser-combinators_${scalaBinaryVersion} + scala-parser-combinators_${scala.compat.version} 1.0.4 org.scala-lang.modules - scala-swing_${scalaBinaryVersion} + scala-swing_${scala.compat.version} 1.0.2 @@ -71,38 +74,36 @@ scala-2.10 - 2.10.6 - 2.10 + 2.10.6 + 2.10 org.scala-lang scala-library - ${scalaVersion} + ${scala.version} org.scala-lang scala-swing - ${scalaVersion} + ${scala.version} src/main/scala + src/test/scala org.apache.maven.plugins maven-compiler-plugin - - 1.6 - 1.6 - + 3.3 net.alchim31.maven scala-maven-plugin - 3.2.1 + 3.2.2 diff --git a/maven-sample/src/main/resources/.gitkeep b/maven-sample/src/main/resources/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/maven-sample/src/test/resources/.gitkeep b/maven-sample/src/test/resources/.gitkeep new file mode 100644 index 0000000..e69de29