Merge pull request #5776 from lrytz/numbersCleanup

cleanups and clarifications in versions.properties

1 files changed, 19 insertions, 19 deletions

diff --git a/versions.properties b/versions.properties
index f767dfab7b..5b58ebeaa4 100644
--- a/versions.properties
+++ b/versions.properties
@@ -1,27 +1,27 @@
-# Scala version used for bootstrapping. (This has no impact on the
-# final classfiles, since compiler and library are built first using
-# starr, then rebuilt using themselves.)
+# Scala version used for bootstrapping (see README.md)
 starr.version=2.12.1
 
-# These are the versions of the modules that go with this release.
-# These properties are used during PR validation and in dbuild builds.
-
-# The scala.binary.version determines how modules are resolved. For example, it
-# determines which partest artifact is being used for running the tests.
-# It has to be set in the following way:
-#  - After 2.x.0 is released, the binary version is 2.x.
-#  - During milestones and RCs, modules are cross-built against the full version.
-#    So the value is the full version (e.g. 2.12.0-M2).
+# The scala.binary.version determines how modules are resolved. It is set as follows:
+#  - After 2.x.0 is released, the binary version is 2.x
+#  - If the starr is a milestone or RC, the full starr version, e.g., 2.12.0-M2
+#
+# For local development during pre-releases, we use existing module binaries with the hope
+# that binary compatibility does not break. For example, after releasing 2.12.0-M1, we continue
+# using scala-partest_2.12.0-M1 until releasing M2. Manual intervention is necessary for changes
+# that break binary compatibility, see for example PR #5003.
 scala.binary.version=2.12
 
-# external modules shipped with distribution, as specified by scala-library-all's pom
+# These are the versions of the modules that go with this release.
+# Artifact dependencies:
+#  - scala-compiler: scala-xml, jline (% "optional")
+#  - scala-library-all: scala-xml, scala-parser-combinators, scala-swing
+# Other usages:
+#  - scala-asm: jar content included in scala-compiler
+#  - jline: shaded with JarJar and included in scala-compiler
+#  - partest: used for running the tests
 scala-xml.version.number=1.0.6
 scala-parser-combinators.version.number=1.0.5
 scala-swing.version.number=2.0.0
-scala-swing.version.osgi=2.0.0
-jline.version=2.14.3
-# this one is shaded and embedded in scala-compiler.jar
-scala-asm.version=5.1.0-scala-2
-
-# external modules, used internally (not shipped)
 partest.version.number=1.1.0
+scala-asm.version=5.1.0-scala-2
+jline.version=2.14.3