Adds more information to the Version.txt file, namely a git commit ID…

… and dates. Also sets the version to 1.1.0 for a numbered build.

build.properties

@@ -24,11 +24,11 @@
 # so that projects such as mondrian can run on the very latest; we switch for a
 # specific revision number near to a release. Change 'xxx' the latest subversion
 # change number; and put the same number in 'project.revision.minor'.)
-project.revision=1.0.1-SNAPSHOT
+project.revision=1.1.0
 #project.revision=1.0.0.xxx
 
 project.revision.major=1
-project.revision.minor=00010539
+project.revision.minor=01000000
 
 ivy.artifact.id=olap4j
 ivy.artifact.group=org.olap4j

build.xml

@@ -282,7 +282,23 @@ test.properties" />
  </target>
 
  <target name="version-properties">
- <echo message="olap4j ${project.revision}${line.separator}" file="VERSION.txt" />
+ <exec executable="git" outputproperty="git.commit">
+ <arg line="log -n 1 --format=format:%H"/>
+ </exec>
+ <tstamp>
+ <format property="build.time" timezone="UTC" pattern="yyyy/MM/dd HH:mm:ss z"/>
+ </tstamp>
+ <!--echo message="olap4j ${project.revision}${line.separator}" file="VERSION.txt" /-->
+ <echo file="VERSION.txt">Title: ${ant.project.name}
+Version: ${project.revision}
+VersionMajor: ${project.revision.major}
+VersionMinor: ${project.revision.minor}
+Git-Latest-Commit: ${git.commit}
+Ant-Version: ${ant.version}
+Created-By: ${java.version} (${java.vendor})
+Built-On: ${build.time}
+Built-By: ${user.name}
+Built-In: ${user.dir}</echo>
  <echo file="${src.dir}/org/olap4j/driver/xmla/XmlaOlap4jDriverVersion.java">/*
  * Project version information. Generated - do not modify.
  */