summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2013-11-20 19:04:16 -0800
committerAdriaan Moors <adriaan.moors@typesafe.com>2013-11-20 19:06:42 -0800
commite7443e2d5bf12141d905670978d7ae31d6bcf53d (patch)
tree65c0277f207448e9b6b8a781f162559ea975da36
parent9684f80bd3d52191f0dbea0afde2787bc7b6346d (diff)
downloadscala-e7443e2d5bf12141d905670978d7ae31d6bcf53d.tar.gz
scala-e7443e2d5bf12141d905670978d7ae31d6bcf53d.tar.bz2
scala-e7443e2d5bf12141d905670978d7ae31d6bcf53d.zip
2.11.0-M7 starr, 1.11.1 scalacheck, bump modules.
Also consult `extra-repo` more liberally to make it easier to test e.g., a staged scalacheck while releasing modules.
-rwxr-xr-xbuild.xml5
-rw-r--r--versions.properties12
2 files changed, 9 insertions, 8 deletions
diff --git a/build.xml b/build.xml
index 9e385ee802..4afc6493fb 100755
--- a/build.xml
+++ b/build.xml
@@ -285,12 +285,13 @@ TODO:
<!-- so we don't have to wait for artifacts to synch to maven central
(we don't distribute partest with Scala, so the risk of sonatype and maven being out of synch is irrelevant):
-->
- <!-- <artifact:remoteRepository refid="extra-repo"/> -->
+ <artifact:remoteRepository refid="extra-repo"/>
<dependency groupId="org.scala-lang.modules" artifactId="scala-partest_${scala.binary.version}" version="${partest.version.number}" />
</artifact:dependencies>
<copy-deps project="partest"/>
<artifact:dependencies pathId="scalacheck.classpath" filesetId="scalacheck.fileset" versionsId="scalacheck.versions">
+ <artifact:remoteRepository refid="extra-repo"/>
<dependency groupId="org.scalacheck" artifactId="scalacheck_${scala.binary.version}" version="${scalacheck.version.number}" />
</artifact:dependencies>
@@ -302,7 +303,7 @@ TODO:
<!-- used by the test.osgi target to create osgi bundles for the xml, parser-combinator jars
must specify sourcesFilesetId, javadocFilesetId to download these types of artifacts -->
<artifact:dependencies pathId="external-modules.deps.classpath" sourcesFilesetId="external-modules.sources.fileset" javadocFilesetId="external-modules.javadoc.fileset">
- <!-- <artifact:remoteRepository refid="extra-repo"/> -->
+ <artifact:remoteRepository refid="extra-repo"/>
<dependency groupId="org.scala-lang.modules" artifactId="scala-xml_${scala.binary.version}" version="${scala-xml.version.number}"/>
<dependency groupId="org.scala-lang.modules" artifactId="scala-parser-combinators_${scala.binary.version}" version="${scala-parser-combinators.version.number}"/>
</artifact:dependencies>
diff --git a/versions.properties b/versions.properties
index 29cbbad884..76eea52681 100644
--- a/versions.properties
+++ b/versions.properties
@@ -1,13 +1,13 @@
-starr.version=2.11.0-M6
+starr.version=2.11.0-M7
starr.use.released=1
# These are the versions of the modules that go with this release.
# These properties are used during PR validation and in dbuild builds.
-scala.binary.version=2.11.0-M6
-partest.version.number=1.0.0-RC7
-scala-xml.version.number=1.0.0-RC6
-scala-parser-combinators.version.number=1.0.0-RC4
-scalacheck.version.number=1.10.1
+scala.binary.version=2.11.0-M7
+partest.version.number=1.0.0-RC8
+scala-xml.version.number=1.0.0-RC7
+scala-parser-combinators.version.number=1.0.0-RC5
+scalacheck.version.number=1.11.1
# TODO: modularize the compiler
#scala-compiler-doc.version.number=1.0.0-RC1