[tor-commits] [metrics-base/master] Tweaked base.xml and build template. The copyright year for javadoc is now computed from the current time UTC.

[karsten at torproject.org]

commit 832624476ca540a63efe711d9935be9227254db1
Author: iwakeh <iwakeh at torproject.org>
Date:   Tue Jan 3 18:00:00 2017 +0100

    Tweaked base.xml and build template. The copyright year for javadoc is now computed from the current time UTC.
---
 java/base.xml           | 23 +++++++++++++----------
 java/build.xml.template |  8 +++++++-
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/java/base.xml b/java/base.xml
index 989a85f..0658cdb 100644
--- a/java/base.xml
+++ b/java/base.xml
@@ -10,7 +10,6 @@
   <property name="dist" value="${generated}/dist"/>
   <property name="signed" value="${dist}/signed"/>
   <property name="classes" value="${generated}/classes/"/>
-  <property name="source-and-target-java-version" value="1.7" />
   <property name="docs" value="${generated}/javadoc"/>
   <property name="testsources" value="src/test/java"/>
   <property name="testresources" value="src/test/resources/"/>
@@ -18,7 +17,6 @@
   <property name="coverageresult" value="${generated}/coverage-report/"/>
   <property name="instrument" value="${generated}/instrument/"/>
   <property name="testclasses" value="${generated}/testclasses/"/>
-  <property name="libs" value="lib"/>
   <property name="cobertura.ser.file" value="${basedir}/cobertura.ser" />
   <property name="jarfile" value="${name}-${release.version}.jar" />
   <property name="jarsourcesfile"
@@ -94,13 +92,13 @@
 
   <target name="usage">
     <echo message="The main ant targets are:" />
-    <echo message="'clean' Remove all generated files." />
-    <echo message="'compile' compile sources to ${classes}." />
-    <echo message="'test' run all tests (see ${testresult} for results)." />
-    <echo message="'docs' create all javadoc in ${docs}." />
-    <echo message="'checks' Checkstyle checks (see ${generated}/checkstyle_report.txt)." />
-    <echo message="'coverage' Cobertura coverage check ${coverageresult}." />
-    <echo message="'tar' Creates a release tarball in ${dist}." />
+    <echo message="'clean' removes all generated files." />
+    <echo message="'compile' compiles sources to ${classes}." />
+    <echo message="'test' runs all tests (see ${testresult})." />
+    <echo message="'docs' creates all javadoc in ${docs}." />
+    <echo message="'checks' checks coding style (see ${generated}/checkstyle_report.txt)." />
+    <echo message="'coverage' checks coverage (see ${coverageresult})." />
+    <echo message="'tar' creates a release tarball in ${dist}." />
   </target>
 
   <target name="submoduleupdate" >
@@ -152,8 +150,13 @@
   </target>
 
   <target name="docs">
+    <tstamp>
+      <format property="copyyear"
+              pattern="yyyy"
+              timezone="UTC" />
+    </tstamp>
     <javadoc destdir="${docs}"
-             footer="&copy; 2016 The Tor Project"
+             footer="&copy; ${copyyear} The Tor Project"
              doctitle="${javadoc-title}"
              overview="${basedir}/${resources}/overview.html"
              use="true"
diff --git a/java/build.xml.template b/java/build.xml.template
index baa2c03..7c29704 100644
--- a/java/build.xml.template
+++ b/java/build.xml.template
@@ -11,6 +11,11 @@
   <property name="javadoc-title" value="XXXX API Documentation"/>
   <property name="implementation-title" value="XXXX" />
   <property name="release.version" value="XXXX" />
+  <!-- XXXX If this project uses a different java version,
+       uncomment and set the following property.
+       Remove, if this project uses the java version defined in base.xml
+       <property name="source-and-target-java-version" value="1.7" />
+  -->
 
   <!-- Name to appear in jar names etc. -->
   <property name="name" value="XXXX"/>
@@ -23,8 +28,9 @@
   <property name="jarincludes" value="XXXX" />
 
   <!-- Pattern for jar library includes.
+       Remove, if not used.
        jar task uses 'runtime', if not set. -->
-  <property name="jarpatterprop" value="XXXX" />
+  <property name="jarpatternprop" value="XXXX" />
 
   <!-- XXXX Has to be provided for each project. -->
   <target name="coverage-check">