diff options
| author | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2014-04-03 15:29:39 +0200 |
|---|---|---|
| committer | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2014-04-03 15:29:39 +0200 |
| commit | 470a51285b686b0f0e0149d1741f76b03ecab310 (patch) | |
| tree | 3ed518ba9e7452c7f30476593318565eaa0159dd | |
| parent | ceb99257ae98e5bc3603132445582517b3a425b7 (diff) | |
| parent | 2ba045368cf039cade862b8d4141d03659eb5bd8 (diff) | |
| download | scala-2.11.0-RC4.tar.gz scala-2.11.0-RC4.tar.bz2 scala-2.11.0-RC4.zip | |
Merge pull request #3672 from retronym/topic/binary-versionv2.11.0-RC4
Further tweak version of continuations plugin in scala-dist.pom
| -rw-r--r-- | build-ant-macros.xml | 2 | ||||
| -rw-r--r-- | src/build/maven/scala-dist-pom.xml | 3 | ||||
| -rw-r--r-- | versions.properties | 4 |
3 files changed, 8 insertions, 1 deletions
diff --git a/build-ant-macros.xml b/build-ant-macros.xml index b90102538b..816a18b13f 100644 --- a/build-ant-macros.xml +++ b/build-ant-macros.xml @@ -432,6 +432,7 @@ <filterset> <filter token="VERSION" value="${osgi.version.number}"/> <filter token="SCALA_BINARY_VERSION" value="${scala.binary.version}"/> + <filter token="SCALA_FULL_VERSION" value="${scala.full.version}"/> <filter token="SCALA_COMPILER_DOC_VERSION" value="${scala-compiler-doc.version.number}"/> <filter token="SCALA_COMPILER_INTERACTIVE_VERSION" value="${scala-compiler-interactive.version.number}"/> </filterset> @@ -554,6 +555,7 @@ <filterset> <filter token="VERSION" value="${maven.version.number}" /> <filter token="SCALA_BINARY_VERSION" value="${scala.binary.version}" /> + <filter token="SCALA_FULL_VERSION" value="${scala.full.version}" /> <filter token="XML_VERSION" value="${scala-xml.version.number}" /> <filter token="PARSER_COMBINATORS_VERSION" value="${scala-parser-combinators.version.number}" /> <filter token="CONTINUATIONS_PLUGIN_VERSION" value="${scala-continuations-plugin.version.number}" /> diff --git a/src/build/maven/scala-dist-pom.xml b/src/build/maven/scala-dist-pom.xml index 83ebc263c0..22a24dea21 100644 --- a/src/build/maven/scala-dist-pom.xml +++ b/src/build/maven/scala-dist-pom.xml @@ -41,7 +41,8 @@ </dependency> <dependency> <groupId>org.scala-lang.plugins</groupId> - <artifactId>scala-continuations-plugin_@VERSION@</artifactId> <!-- plugins are fully cross-versioned --> + <!-- plugins are fully cross-versioned. But, we don't publish with 2.11.0-SNAPSHOT, instead use full version of the last non-snapshot version --> + <artifactId>scala-continuations-plugin_@SCALA_FULL_VERSION@</artifactId> <version>@CONTINUATIONS_PLUGIN_VERSION@</version> </dependency> <!-- duplicated from scala-compiler, where it's optional, diff --git a/versions.properties b/versions.properties index d92553d68d..54d1a5536b 100644 --- a/versions.properties +++ b/versions.properties @@ -4,7 +4,11 @@ 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. + +# e.g. 2.11.0-RC1, 2.11 scala.binary.version=2.11.0-RC3 +# e.g. 2.11.0-RC1, 2.11.0, 2.11.1-RC1, 2.11.1 +scala.full.version=2.11.0-RC3 # external modules shipped with distribution: scala-xml.version.number=1.0.1 |