Parametrise current year in all embedded NOTICE files

Don't use the same property name for different output files

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@934203 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build.xml b/build.xml
index c961973..4ba1394 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -112,7 +112,7 @@
   <property name="tomcat-embed-dbcp-sources.jar" value="${tomcat.embed.sources}/tomcat-dbcp-src.jar"/>
 
   <!-- Extras JARs -->
-  <property name="tomcat-juli.jar" value="${tomcat.extras}/tomcat-juli.jar"/>
+  <property name="tomcat-juli-extras.jar" value="${tomcat.extras}/tomcat-juli.jar"/>
   <property name="tomcat-juli-adapters.jar" value="${tomcat.extras}/tomcat-juli-adapters.jar"/>
   <property name="catalina-ws.jar" value="${tomcat.extras}/catalina-ws.jar"/>
   <property name="catalina-jmx-remote.jar" value="${tomcat.extras}/catalina-jmx-remote.jar"/>
@@ -824,8 +824,8 @@
     <jarIt jarfile="${tomcat-embed-core.jar}"
            filesDir="${tomcat.classes}"
            filesId="files.tomcat-embed-core"
-           notice="res/META-INF/servlet-api.jar.notice"
-           license="res/META-INF/servlet-api.jar.license"/>
+           notice="${tomcat.manifests}/servlet-api.jar.notice"
+           license="${tomcat.manifests}/servlet-api.jar.license"/>
     <jarIt jarfile="${tomcat-embed-jasper.jar}"
            filesDir="${tomcat.classes}"
            filesId="files.tomcat-embed-jasper"/>
@@ -942,7 +942,7 @@
          dir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src"
          target="compile" />
 
-    <jar jarfile="${tomcat-juli.jar}"
+    <jar jarfile="${tomcat-juli-extras.jar}"
          manifest="${tomcat.manifests}/default.manifest" >
       <fileset dir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src/target/classes">
         <include name="org/apache/juli/logging/*.class" />
@@ -961,13 +961,13 @@
         <exclude name="**/package.html" />
         <exclude name="**/LocalStrings_*" />
       </fileset>
-      <zipfileset file="res/META-INF/default.notice"
+      <zipfileset file="${tomcat.manifests}/default.notice"
         fullpath="META-INF/NOTICE" />
-      <zipfileset file="res/META-INF/default.license"
+      <zipfileset file="${tomcat.manifests}/default.license"
         fullpath="META-INF/LICENSE" />
     </jar>
     <antcall target="md5sum">
-      <param name="file" value="${tomcat-juli.jar}" />
+      <param name="file" value="${tomcat-juli-extras.jar}" />
     </antcall>
 
     <jar jarfile="${tomcat-juli-adapters.jar}"
@@ -980,9 +980,9 @@
         <exclude name="**/package.html" />
         <exclude name="**/LocalStrings_*" />
       </fileset>
-      <zipfileset file="res/META-INF/default.notice"
+      <zipfileset file="${tomcat.manifests}/default.notice"
         fullpath="META-INF/NOTICE" />
-      <zipfileset file="res/META-INF/default.license"
+      <zipfileset file="${tomcat.manifests}/default.license"
         fullpath="META-INF/LICENSE" />
     </jar>
     <antcall target="md5sum">
@@ -1067,9 +1067,9 @@
         <exclude name="**/package.html" />
         <exclude name="**/LocalStrings_*" />
       </fileset>
-      <zipfileset file="res/META-INF/default.notice"
+      <zipfileset file="${tomcat.manifests}/default.notice"
         fullpath="META-INF/NOTICE" />
-      <zipfileset file="res/META-INF/default.license"
+      <zipfileset file="${tomcat.manifests}/default.license"
         fullpath="META-INF/LICENSE" />
     </jar>
     <antcall target="md5sum">
@@ -1810,8 +1810,8 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
          filesDir="${jasper-jdt.home}"
          filesId="files.jasper-jdt"
          manifest="${tomcat.manifests}/default.manifest"
-         notice="${tomcat.home}/res/META-INF/jasper-jdt.jar.notice"
-         license="${tomcat.home}/res/META-INF/jasper-jdt.jar.license"/>
+         notice="${tomcat.manifests}/jasper-jdt.jar.notice"
+         license="${tomcat.manifests}/jasper-jdt.jar.license"/>
     <delete includeEmptyDirs="true">
       <fileset dir="${jasper-jdt.home}">
         <include name="**/*"/>

diff --git a/res/META-INF/jasper-jdt.jar.notice b/res/META-INF/jasper-jdt.jar.notice
index c342aa5..eed1f10 100644 (file)
--- a/res/META-INF/jasper-jdt.jar.notice
+++ b/res/META-INF/jasper-jdt.jar.notice
@@ -1,5 +1,5 @@
 Apache Tomcat
-Copyright 1999-2010 The Apache Software Foundation
+Copyright 1999-@YEAR@ The Apache Software Foundation
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).

diff --git a/res/META-INF/jsp-api.jar.notice b/res/META-INF/jsp-api.jar.notice
index 2ff099f..f8527aa 100644 (file)
--- a/res/META-INF/jsp-api.jar.notice
+++ b/res/META-INF/jsp-api.jar.notice
@@ -1,5 +1,5 @@
 Apache Tomcat
-Copyright 1999-2010 The Apache Software Foundation
+Copyright 1999-@YEAR@ The Apache Software Foundation
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).

diff --git a/res/META-INF/servlet-api.jar.notice b/res/META-INF/servlet-api.jar.notice
index a93f4c5..cd168f7 100644 (file)
--- a/res/META-INF/servlet-api.jar.notice
+++ b/res/META-INF/servlet-api.jar.notice
@@ -1,5 +1,5 @@
 Apache Tomcat
-Copyright 1999-2010 The Apache Software Foundation
+Copyright 1999-@YEAR@ The Apache Software Foundation
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).