From efe5c115001a615ec3f04464440173c9c59ff9ec Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Tue, 21 Jul 2015 17:37:06 -0400 Subject: remove temporary XML coalescing hack we used to build M2 scala-xml 1.0.5 has the fix we need in order to run the scala-xml tests normally during bootstrapping. reverts 83554a3c0fb2b57efa293efcc81a947b98a19469 --- scripts/jobs/integrate/bootstrap | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/jobs/integrate/bootstrap b/scripts/jobs/integrate/bootstrap index c6935df936..706a20daf4 100755 --- a/scripts/jobs/integrate/bootstrap +++ b/scripts/jobs/integrate/bootstrap @@ -217,8 +217,7 @@ buildXML() { then echo "Found scala-xml $XML_VER; not building." else update scala scala-xml "$XML_REF" && gfxd - # TODO: compile under 2.12 source level once `scala.xml.XMLTest.escape` is fixed (see #4451) - sbtBuild 'set scalacOptions += "-Xsource:2.11"' 'set version := "'$XML_VER'-DOC"' $clean doc 'set version := "'$XML_VER'"' test "${buildTasks[@]}" + sbtBuild 'set version := "'$XML_VER'-DOC"' $clean doc 'set version := "'$XML_VER'"' test "${buildTasks[@]}" XML_BUILT="yes" # ensure the module is built and published when buildXML is invoked for the second time, see comment above fi } -- cgit v1.2.3