diff options
| author | Paul Phillips <paulp@improving.org> | 2012-02-08 11:07:56 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-02-08 11:07:56 -0800 |
| commit | 869ec7008636115f316aeeab873b351f9d7c9ef4 (patch) | |
| tree | b88be1fa20631da20013ee5558506efdcc46ccfe | |
| parent | 06e151aa3ef5b670e541a5061e9bcda6a4a3b88e (diff) | |
| parent | f1d04997c4b35357c542062926c7b3ce4253f099 (diff) | |
| download | scala-869ec7008636115f316aeeab873b351f9d7c9ef4.tar.gz scala-869ec7008636115f316aeeab873b351f9d7c9ef4.tar.bz2 scala-869ec7008636115f316aeeab873b351f9d7c9ef4.zip | |
Merge remote-tracking branch 'lrytz/maven-version-fix'
| -rw-r--r-- | build.number | 5 | ||||
| -rw-r--r-- | build.number.maven | 3 | ||||
| -rw-r--r-- | src/build/pack.xml | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/build.number b/build.number deleted file mode 100644 index 91c7e72c85..0000000000 --- a/build.number +++ /dev/null @@ -1,5 +0,0 @@ -#Tue Sep 11 19:21:09 CEST 2007 -version.minor=10 -version.patch=0 -version.suffix=alpha -version.major=2 diff --git a/build.number.maven b/build.number.maven new file mode 100644 index 0000000000..eed9f3897c --- /dev/null +++ b/build.number.maven @@ -0,0 +1,3 @@ +version.major=2 +version.minor=10 +version.patch=0 diff --git a/src/build/pack.xml b/src/build/pack.xml index 05e49e5e81..d022ac3f05 100644 --- a/src/build/pack.xml +++ b/src/build/pack.xml @@ -11,6 +11,9 @@ PROPERTIES ============================================================================ --> <property name="sbaz.universe" value="http://www.scala-lang.org/downloads/packages"/> + <property file="${basedir}/build.number.maven"/> + <!-- the maven stuff requires version.major, version.minor and version.patch properties. + the "get-scala-revision" script only returns "version.number" --> <!-- =========================================================================== MAIN DISTRIBUTION PACKAGING |