[tomcat8] 02/04: Updated the Servlet/JSP poms in debian/javaxpoms

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository tomcat8.

commit a9d678023739f3b3a1121b251f5ed2a2a396ab04
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sat Sep 14 00:39:02 2013 +0200

    Updated the Servlet/JSP poms in debian/javaxpoms
---
 debian/javaxpoms/jsp-api.pom     |   14 ++------------
 debian/javaxpoms/servlet-api.pom |   23 ++++++++++++++++++-----
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/debian/javaxpoms/jsp-api.pom b/debian/javaxpoms/jsp-api.pom
index 56271e0..4c281fe 100644
--- a/debian/javaxpoms/jsp-api.pom
+++ b/debian/javaxpoms/jsp-api.pom
@@ -24,19 +24,9 @@
   <url>http://tomcat.apache.org/</url>
   <licenses>
     <license>
-      <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>
+      <name>Apache License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
       <distribution>repo</distribution>
-      <comments>
-        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>
   </licenses>
   <dependencies>
diff --git a/debian/javaxpoms/servlet-api.pom b/debian/javaxpoms/servlet-api.pom
index 493bf91..e75acdb 100644
--- a/debian/javaxpoms/servlet-api.pom
+++ b/debian/javaxpoms/servlet-api.pom
@@ -35,11 +35,24 @@
       <distribution>repo</distribution>
       <comments>
         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,
-        web-app_3_0.xsd, web-common_3_0.xsd, web-fragment_3_0.xsd to which the
-        CDDL version 1.0 applies.
+        javaee_5.xsd,
+        javaee_6.xsd,
+        javaee_7.xsd,
+        javaee_web_services_1_2.xsd,
+        javaee_web_services_client_1_2.xsd,
+        javaee_web_services_1_3.xsd,
+        javaee_web_services_client_1_3.xsd,
+        javaee_web_services_1_4.xsd,
+        javaee_web_services_client_1_4.xsd,
+        jsp_2_2.xsd,
+        jsp_2_3.xsd,
+        web-app_3_0.xsd,
+        web-common_3_0.xsd,
+        web-fragment_3_0.xsd,
+        web-app_3_1.xsd,
+        web-common_3_1.xsd and
+        web-fragment_3_1.xsd
+        to which the CDDL version 1.0 applies.
       </comments>
     </license>
   </licenses>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat8.git