diff options
author | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2013-09-17 16:23:23 -0700 |
---|---|---|
committer | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2013-09-17 16:23:23 -0700 |
commit | c3d96eb483b11b4dfa61143b629dba27ba543fc3 (patch) | |
tree | dec6f1db002010a5cf9fab744e43aec547225700 | |
parent | 473011dfc6c7cd6b561c4c323c86727679a5f028 (diff) | |
parent | 1e8e16e1a1448996456e42e075835d9376f0edfb (diff) | |
download | scala-c3d96eb483b11b4dfa61143b629dba27ba543fc3.tar.gz scala-c3d96eb483b11b4dfa61143b629dba27ba543fc3.tar.bz2 scala-c3d96eb483b11b4dfa61143b629dba27ba543fc3.zip |
Merge pull request #2942 from retronym/topic/build-number-maven
Remove build.number.maven
-rw-r--r-- | build.number.maven | 3 | ||||
-rw-r--r-- | src/build/pack.xml | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/build.number.maven b/build.number.maven deleted file mode 100644 index a8da54397d..0000000000 --- a/build.number.maven +++ /dev/null @@ -1,3 +0,0 @@ -version.major=2 -version.minor=11 -version.patch=0 diff --git a/src/build/pack.xml b/src/build/pack.xml index 8e2d2f19fa..ed628726fb 100644 --- a/src/build/pack.xml +++ b/src/build/pack.xml @@ -12,7 +12,7 @@ PROPERTIES <!-- the maven stuff requires version.major, version.minor and version.patch properties. the "get-scala-revision" script only returns "version.number" --> - <property file="${basedir}/build.number.maven"/> + <property file="${basedir}/build.number"/> <!-- also need to know scala binary version and versions for xml and parsers --> <property file="${basedir}/versions.properties"/> |