Author: markt
Date: Wed Apr 14 21:25:20 2010
New Revision: 934203
URL: http://svn.apache.org/viewvc?rev=934203&view=rev
Log:
Parametrise current year in all embedded NOTICE files
Don't use the same property name for different output files
Modified:
tomcat/trunk/build.xml
tomcat/trunk/res/META-INF/jasper-jdt.jar.notice
tomcat/trunk/res/META-INF/jsp-api.jar.notice
tomcat/trunk/res/META-INF/servlet-api.jar.notice
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=934203&r1=934202&r2=934203&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Wed Apr 14 21:25:20 2010
@@ -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
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="**/*"/>
Modified: tomcat/trunk/res/META-INF/jasper-jdt.jar.notice
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/META-INF/jasper-jdt.jar.notice?rev=934203&r1=934202&r2=934203&view=diff
==============================================================================
--- tomcat/trunk/res/META-INF/jasper-jdt.jar.notice (original)
+++ tomcat/trunk/res/META-INF/jasper-jdt.jar.notice Wed Apr 14 21:25:20 2010
@@ -1,5 +1,5 @@
Apache Tomcat
-Copyright 1999-2010 The Apache Software Foundation
+Copyright 19...@year@ The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Modified: tomcat/trunk/res/META-INF/jsp-api.jar.notice
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/META-INF/jsp-api.jar.notice?rev=934203&r1=934202&r2=934203&view=diff
==============================================================================
--- tomcat/trunk/res/META-INF/jsp-api.jar.notice (original)
+++ tomcat/trunk/res/META-INF/jsp-api.jar.notice Wed Apr 14 21:25:20 2010
@@ -1,5 +1,5 @@
Apache Tomcat
-Copyright 1999-2010 The Apache Software Foundation
+Copyright 19...@year@ The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Modified: tomcat/trunk/res/META-INF/servlet-api.jar.notice
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/META-INF/servlet-api.jar.notice?rev=934203&r1=934202&r2=934203&view=diff
==============================================================================
--- tomcat/trunk/res/META-INF/servlet-api.jar.notice (original)
+++ tomcat/trunk/res/META-INF/servlet-api.jar.notice Wed Apr 14 21:25:20 2010
@@ -1,5 +1,5 @@
Apache Tomcat
-Copyright 1999-2010 The Apache Software Foundation
+Copyright 19...@year@ The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
