Author: markt
Date: Fri May 25 20:48:34 2012
New Revision: 1342808
URL: http://svn.apache.org/viewvc?rev=1342808&view=rev
Log:
BZ53034. Improve POM license info
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/res/maven/tomcat-annotations-api.pom
tomcat/tc7.0.x/trunk/res/maven/tomcat-api.pom
tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-ant.pom
tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-ha.pom
tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-jmx-remote.pom
tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-ws.pom
tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina.pom
tomcat/tc7.0.x/trunk/res/maven/tomcat-coyote.pom
tomcat/tc7.0.x/trunk/res/maven/tomcat-dbcp.pom
tomcat/tc7.0.x/trunk/res/maven/tomcat-el-api.pom
tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-core.pom
tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-jasper.pom
tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-logging-juli.pom
tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-logging-log4j.pom
tomcat/tc7.0.x/trunk/res/maven/tomcat-extras-juli-adapters.pom
tomcat/tc7.0.x/trunk/res/maven/tomcat-extras-juli.pom
tomcat/tc7.0.x/trunk/res/maven/tomcat-i18n-es.pom
tomcat/tc7.0.x/trunk/res/maven/tomcat-i18n-fr.pom
tomcat/tc7.0.x/trunk/res/maven/tomcat-i18n-ja.pom
tomcat/tc7.0.x/trunk/res/maven/tomcat-jasper-el.pom
tomcat/tc7.0.x/trunk/res/maven/tomcat-jasper.pom
tomcat/tc7.0.x/trunk/res/maven/tomcat-jdbc.pom
tomcat/tc7.0.x/trunk/res/maven/tomcat-jsp-api.pom
tomcat/tc7.0.x/trunk/res/maven/tomcat-juli.pom
tomcat/tc7.0.x/trunk/res/maven/tomcat-servlet-api.pom
tomcat/tc7.0.x/trunk/res/maven/tomcat-tribes.pom
tomcat/tc7.0.x/trunk/res/maven/tomcat-util.pom
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1342805
Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-annotations-api.pom
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-annotations-api.pom?rev=1342808&r1=1342807&r2=1342808&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-annotations-api.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-annotations-api.pom Fri May 25
20:48:34 2012
@@ -21,7 +21,7 @@
<artifactId>tomcat-annotations-api</artifactId>
<version>@MAVEN.DEPLOY.VERSION@</version>
<description>Annotations Package</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-api.pom
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-api.pom?rev=1342808&r1=1342807&r2=1342808&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-api.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-api.pom Fri May 25 20:48:34 2012
@@ -21,7 +21,7 @@
<artifactId>tomcat-api</artifactId>
<version>@MAVEN.DEPLOY.VERSION@</version>
<description>Definition of interfaces shared by Catalina and
Jasper</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-ant.pom
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-ant.pom?rev=1342808&r1=1342807&r2=1342808&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-ant.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-ant.pom Fri May 25 20:48:34
2012
@@ -21,7 +21,7 @@
<artifactId>tomcat-catalina-ant</artifactId>
<version>@MAVEN.DEPLOY.VERSION@</version>
<description>Tomcat Ant tasks for remote management</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-ha.pom
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-ha.pom?rev=1342808&r1=1342807&r2=1342808&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-ha.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-ha.pom Fri May 25 20:48:34
2012
@@ -21,7 +21,7 @@
<artifactId>tomcat-catalina-ha</artifactId>
<version>@MAVEN.DEPLOY.VERSION@</version>
<description>Tomcat High Availability Implementation</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-jmx-remote.pom
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-jmx-remote.pom?rev=1342808&r1=1342807&r2=1342808&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-jmx-remote.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-jmx-remote.pom Fri May 25
20:48:34 2012
@@ -21,7 +21,7 @@
<artifactId>tomcat-catalina-jmx-remote</artifactId>
<version>@MAVEN.DEPLOY.VERSION@</version>
<description>Tomcat Remote JMX listener</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-ws.pom
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-ws.pom?rev=1342808&r1=1342807&r2=1342808&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-ws.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina-ws.pom Fri May 25 20:48:34
2012
@@ -21,7 +21,7 @@
<artifactId>tomcat-catalina-ws</artifactId>
<version>@MAVEN.DEPLOY.VERSION@</version>
<description>Tomcat JNDI Factory for Web Services</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina.pom
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina.pom?rev=1342808&r1=1342807&r2=1342808&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-catalina.pom Fri May 25 20:48:34 2012
@@ -21,7 +21,7 @@
<artifactId>tomcat-catalina</artifactId>
<version>@MAVEN.DEPLOY.VERSION@</version>
<description>Tomcat Servlet Engine Core Classes and Standard
implementations</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-coyote.pom
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-coyote.pom?rev=1342808&r1=1342807&r2=1342808&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-coyote.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-coyote.pom Fri May 25 20:48:34 2012
@@ -21,7 +21,7 @@
<artifactId>tomcat-coyote</artifactId>
<version>@MAVEN.DEPLOY.VERSION@</version>
<description>Tomcat Connectors and HTTP parser</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-dbcp.pom
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-dbcp.pom?rev=1342808&r1=1342807&r2=1342808&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-dbcp.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-dbcp.pom Fri May 25 20:48:34 2012
@@ -21,7 +21,7 @@
<artifactId>tomcat-dbcp</artifactId>
<version>@MAVEN.DEPLOY.VERSION@</version>
<description>Tomcat Database Connection Pooling package</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-el-api.pom
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-el-api.pom?rev=1342808&r1=1342807&r2=1342808&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-el-api.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-el-api.pom Fri May 25 20:48:34 2012
@@ -21,7 +21,7 @@
<artifactId>tomcat-el-api</artifactId>
<version>@MAVEN.DEPLOY.VERSION@</version>
<description>Expression language package</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-core.pom
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-core.pom?rev=1342808&r1=1342807&r2=1342808&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-core.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-core.pom Fri May 25 20:48:34
2012
@@ -21,7 +21,7 @@
<artifactId>tomcat-embed-core</artifactId>
<version>@MAVEN.DEPLOY.VERSION@</version>
<description>Core Tomcat implementation</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-jasper.pom
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-jasper.pom?rev=1342808&r1=1342807&r2=1342808&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-jasper.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-jasper.pom Fri May 25 20:48:34
2012
@@ -21,7 +21,7 @@
<artifactId>tomcat-embed-jasper</artifactId>
<version>@MAVEN.DEPLOY.VERSION@</version>
<description>Core Tomcat implementation</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-logging-juli.pom
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-logging-juli.pom?rev=1342808&r1=1342807&r2=1342808&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-logging-juli.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-logging-juli.pom Fri May 25
20:48:34 2012
@@ -21,7 +21,7 @@
<artifactId>tomcat-embed-logging-juli</artifactId>
<version>@MAVEN.DEPLOY.VERSION@</version>
<description>JULI logging implementation for embedded Tomcat</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-logging-log4j.pom
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-logging-log4j.pom?rev=1342808&r1=1342807&r2=1342808&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-logging-log4j.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-logging-log4j.pom Fri May 25
20:48:34 2012
@@ -21,7 +21,7 @@
<artifactId>tomcat-embed-logging-log4j</artifactId>
<version>@MAVEN.DEPLOY.VERSION@</version>
<description>log4j logging implementation for embedded Tomcat</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-extras-juli-adapters.pom
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-extras-juli-adapters.pom?rev=1342808&r1=1342807&r2=1342808&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-extras-juli-adapters.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-extras-juli-adapters.pom Fri May 25
20:48:34 2012
@@ -21,7 +21,7 @@
<artifactId>tomcat-extras-juli-adapters</artifactId>
<version>@MAVEN.DEPLOY.VERSION@</version>
<description>Adapters to plug in other logging frameworks in
Tomcat</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-extras-juli.pom
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-extras-juli.pom?rev=1342808&r1=1342807&r2=1342808&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-extras-juli.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-extras-juli.pom Fri May 25 20:48:34
2012
@@ -21,7 +21,7 @@
<artifactId>tomcat-extras-juli</artifactId>
<version>@MAVEN.DEPLOY.VERSION@</version>
<description>Replacement for Tomcat Core Logging Package</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-i18n-es.pom
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-i18n-es.pom?rev=1342808&r1=1342807&r2=1342808&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-i18n-es.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-i18n-es.pom Fri May 25 20:48:34 2012
@@ -21,7 +21,7 @@
<artifactId>tomcat-i18n-es</artifactId>
<version>@MAVEN.DEPLOY.VERSION@</version>
<description>Spanish translations</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-i18n-fr.pom
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-i18n-fr.pom?rev=1342808&r1=1342807&r2=1342808&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-i18n-fr.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-i18n-fr.pom Fri May 25 20:48:34 2012
@@ -21,7 +21,7 @@
<artifactId>tomcat-i18n-fr</artifactId>
<version>@MAVEN.DEPLOY.VERSION@</version>
<description>French translations</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-i18n-ja.pom
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-i18n-ja.pom?rev=1342808&r1=1342807&r2=1342808&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-i18n-ja.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-i18n-ja.pom Fri May 25 20:48:34 2012
@@ -21,7 +21,7 @@
<artifactId>tomcat-i18n-ja</artifactId>
<version>@MAVEN.DEPLOY.VERSION@</version>
<description>Japanese translations</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-jasper-el.pom
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-jasper-el.pom?rev=1342808&r1=1342807&r2=1342808&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-jasper-el.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-jasper-el.pom Fri May 25 20:48:34 2012
@@ -21,7 +21,7 @@
<artifactId>tomcat-jasper-el</artifactId>
<version>@MAVEN.DEPLOY.VERSION@</version>
<description>Jasper Expression Language Impl</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-jasper.pom
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-jasper.pom?rev=1342808&r1=1342807&r2=1342808&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-jasper.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-jasper.pom Fri May 25 20:48:34 2012
@@ -21,7 +21,7 @@
<artifactId>tomcat-jasper</artifactId>
<version>@MAVEN.DEPLOY.VERSION@</version>
<description>Tomcats JSP Parser</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-jdbc.pom
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-jdbc.pom?rev=1342808&r1=1342807&r2=1342808&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-jdbc.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-jdbc.pom Fri May 25 20:48:34 2012
@@ -21,7 +21,7 @@
<artifactId>tomcat-jdbc</artifactId>
<version>@MAVEN.DEPLOY.VERSION@</version>
<description>Tomcat JDBC Pool Package</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
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=1342808&r1=1342807&r2=1342808&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 Fri May 25 20:48:34 2012
@@ -21,17 +21,22 @@
<artifactId>tomcat-jsp-api</artifactId>
<version>@MAVEN.DEPLOY.VERSION@</version>
<description>JSP package</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
- <name>Apache License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- <license>
- <name>Common Development And Distribution License (CDDL) Version
1.0</name>
- <url>http://www.opensource.org/licenses/cddl1.txt</url>
+ <name>
+ Apache License, Version 2.0 and
+ Common Development And Distribution License (CDDL) Version 1.0
+ </name>
+ <url>
+ http://www.apache.org/licenses/LICENSE-2.0.txt and
+ http://www.opensource.org/licenses/cddl1.txt
+ </url>
<distribution>repo</distribution>
+ <comments>
+ The Apache license, version 2 applies to all files apart from
+ jsp_2_2.xsd to which the CDDL version 1.0 applies.
+ </comments>
</license>
</licenses>
<dependencies>
Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-juli.pom
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-juli.pom?rev=1342808&r1=1342807&r2=1342808&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-juli.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-juli.pom Fri May 25 20:48:34 2012
@@ -21,7 +21,7 @@
<artifactId>tomcat-juli</artifactId>
<version>@MAVEN.DEPLOY.VERSION@</version>
<description>Tomcat Core Logging Package</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
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=1342808&r1=1342807&r2=1342808&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 Fri May 25 20:48:34
2012
@@ -21,17 +21,26 @@
<artifactId>tomcat-servlet-api</artifactId>
<version>@MAVEN.DEPLOY.VERSION@</version>
<description>javax.servlet package</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
- <name>Apache License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- <license>
- <name>Common Development And Distribution License (CDDL) Version
1.0</name>
- <url>http://www.opensource.org/licenses/cddl1.txt</url>
+ <name>
+ Apache License, Version 2.0 and
+ Common Development And Distribution License (CDDL) Version 1.0
+ </name>
+ <url>
+ http://www.apache.org/licenses/LICENSE-2.0.txt and
+ http://www.opensource.org/licenses/cddl1.txt
+ </url>
<distribution>repo</distribution>
+ <comments>
+ The Apache license, version 2 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,
+ web-app_3_0.xsd, web-common_3_0.xsd, web-fragment_3_0.xsd to which the
+ CDDL version 1.0 applies.
+ </comments>
</license>
</licenses>
</project>
Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-tribes.pom
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-tribes.pom?rev=1342808&r1=1342807&r2=1342808&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-tribes.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-tribes.pom Fri May 25 20:48:34 2012
@@ -21,7 +21,7 @@
<artifactId>tomcat-tribes</artifactId>
<version>@MAVEN.DEPLOY.VERSION@</version>
<description>Tomcat Group Communication Package</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-util.pom
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-util.pom?rev=1342808&r1=1342807&r2=1342808&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-util.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-util.pom Fri May 25 20:48:34 2012
@@ -21,7 +21,7 @@
<artifactId>tomcat-util</artifactId>
<version>@MAVEN.DEPLOY.VERSION@</version>
<description>Common code shared by Catalina and Jasper</description>
- <url>http://tomcat.apache.org</url>
+ <url>http://tomcat.apache.org/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
