Author: kkolinko Date: Sun May 27 13:45:59 2012 New Revision: 1343048 URL: http://svn.apache.org/viewvc?rev=1343048&view=rev Log: Merged revision 1343045 from tomcat/trunk: Followup for http://issues.apache.org/bugzilla/show_bug.cgi?id=53034 Correct license name and version
Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/res/maven/tomcat-jsp-api.pom tomcat/tc7.0.x/trunk/res/maven/tomcat-servlet-api.pom Propchange: tomcat/tc7.0.x/trunk/ ------------------------------------------------------------------------------ Merged /tomcat/trunk:r1343045 Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-jsp-api.pom URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-jsp-api.pom?rev=1343048&r1=1343047&r2=1343048&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/res/maven/tomcat-jsp-api.pom (original) +++ tomcat/tc7.0.x/trunk/res/maven/tomcat-jsp-api.pom Sun May 27 13:45:59 2012 @@ -34,7 +34,7 @@ </url> <distribution>repo</distribution> <comments> - The Apache license, version 2 applies to all files apart from + The Apache License, version 2.0 applies to all files apart from jsp_2_2.xsd to which the CDDL version 1.0 applies. </comments> </license> Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-servlet-api.pom URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-servlet-api.pom?rev=1343048&r1=1343047&r2=1343048&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/res/maven/tomcat-servlet-api.pom (original) +++ tomcat/tc7.0.x/trunk/res/maven/tomcat-servlet-api.pom Sun May 27 13:45:59 2012 @@ -34,7 +34,7 @@ </url> <distribution>repo</distribution> <comments> - The Apache license, version 2 applies to all files apart from + The Apache License, version 2.0 applies to all files apart from javaee_5.xsd, javaee_web_services_1_2.xsd, javaee_web_services_client_1_2.xsd, javaee_6.xsd, javaee_web_services_1_3.xsd, javaee_web_services_client_1_3.xsd, --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org