Merge pull request #309 from SethTisue/build-scala-xml-again

build scala-xml again

Author: SethTisue

common.conf

@@ -14,10 +14,6 @@
 vars: {
   scala-version                    : ""
   scala-version                    : ${?scala_ref}   // TODO: change param name in jenkins job -- allow overriding scala-version using the scala_version environment variable
-  scala-binary-version             : ""
-  scala-binary-version             : ${?scala_build_bootstrap_opt} // TODO: change param name in jenkins job
-  scala-xml-version                : "1.0.5"
-  scala-xml-version                : ${?scala_xml_version}
 
   // TODO: merge required changes upstream to get rid of our forks, maintaining our one won't scale
   browse-ref                   : "SethTisue/browse.git#topic/2.12-compat"

community.dbuild

@@ -42,11 +42,12 @@ build += {
         system: aether
         uri:   "aether:org.scala-lang#scala-compiler;"${vars.scala-version}
       }
+      // override scalaVersion here since otherwise we get
+      // whatever random Scala version the module has
       {
-        set-version: ${vars.scala-xml-version}
-        name:   scala-xml
-        system: aether
-        uri:   "aether:org.scala-lang.modules#scala-xml_"${vars.scala-binary-version}";"${vars.scala-xml-version}
+        name: "scala-xml"
+        uri: "https://github.com/"${vars.scala-xml-ref}
+        extra.commands: "set scalaVersion := \""${vars.scala-version}"\""
       }
     ]
   }