Author: violetagg
Date: Fri Oct 18 02:51:08 2013
New Revision: 1533316
URL: http://svn.apache.org/r1533316
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55663
Merged revision 1533312 from tomcat/trunk:
Notice files are corrected according to
http://www.apache.org/legal/src-headers.html#notice
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/NOTICE
tomcat/tc7.0.x/trunk/res/META-INF/default.notice
tomcat/tc7.0.x/trunk/res/META-INF/servlet-api.jar.notice
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1533312
Modified: tomcat/tc7.0.x/trunk/NOTICE
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/NOTICE?rev=1533316&r1=1533315&r2=1533316&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/NOTICE (original)
+++ tomcat/tc7.0.x/trunk/NOTICE Fri Oct 18 02:51:08 2013
@@ -1,7 +1,7 @@
Apache Tomcat
Copyright 1999-2013 The Apache Software Foundation
-This product includes software developed by
+This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
The Windows Installer is built with the Nullsoft
Modified: tomcat/tc7.0.x/trunk/res/META-INF/default.notice
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/META-INF/default.notice?rev=1533316&r1=1533315&r2=1533316&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/META-INF/default.notice (original)
+++ tomcat/tc7.0.x/trunk/res/META-INF/default.notice Fri Oct 18 02:51:08 2013
@@ -1,5 +1,5 @@
Apache Tomcat
Copyright 1999-@YEAR@ The Apache Software Foundation
-This product includes software developed by
+This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Modified: tomcat/tc7.0.x/trunk/res/META-INF/servlet-api.jar.notice
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/META-INF/servlet-api.jar.notice?rev=1533316&r1=1533315&r2=1533316&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/META-INF/servlet-api.jar.notice (original)
+++ tomcat/tc7.0.x/trunk/res/META-INF/servlet-api.jar.notice Fri Oct 18
02:51:08 2013
@@ -1,7 +1,7 @@
Apache Tomcat
Copyright 1999-@YEAR@ The Apache Software Foundation
-This product includes software developed by
+This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
The original XML Schemas for Java EE Deployment Descriptors:
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1533316&r1=1533315&r2=1533316&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri Oct 18 02:51:08 2013
@@ -83,6 +83,15 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Other">
+ <changelog>
+ <fix>
+ <bug>55663</bug>: NOTICE files are corrected according to
+ <a href="http://www.apache.org/legal/src-headers.html#notice";>NOTICE
files requirements</a>.
+ (violetagg)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 7.0.46 (violetagg)" rtext="not released">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
