Author: markt Date: Mon Jul 2 11:20:19 2012 New Revision: 1356185 URL: http://svn.apache.org/viewvc?rev=1356185&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53034 Add project.url and project.licenses sections to the POMs for the Maven artifacts. Patch by kkolinko
Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/res/maven/annotations-api.pom tomcat/tc6.0.x/trunk/res/maven/catalina-ha.pom tomcat/tc6.0.x/trunk/res/maven/catalina.pom tomcat/tc6.0.x/trunk/res/maven/coyote.pom tomcat/tc6.0.x/trunk/res/maven/dbcp.pom tomcat/tc6.0.x/trunk/res/maven/el-api.pom tomcat/tc6.0.x/trunk/res/maven/jasper-el.pom tomcat/tc6.0.x/trunk/res/maven/jasper.pom tomcat/tc6.0.x/trunk/res/maven/jsp-api.pom tomcat/tc6.0.x/trunk/res/maven/juli-adapters.pom tomcat/tc6.0.x/trunk/res/maven/juli-extras.pom tomcat/tc6.0.x/trunk/res/maven/juli.pom tomcat/tc6.0.x/trunk/res/maven/servlet-api.pom tomcat/tc6.0.x/trunk/res/maven/tribes.pom tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1356185&r1=1356184&r2=1356185&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Jul 2 11:20:19 2012 @@ -182,13 +182,6 @@ PATCHES PROPOSED TO BACKPORT: +1: kkolinko, markt, kfujino -1: -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53034 - Add project.url and project.licenses sections to the POMs for the Maven - artifacts. - https://issues.apache.org/bugzilla/attachment.cgi?id=28987 - +1: kkolinko, markt, kfujino - -1: - PATCHES/ISSUES THAT ARE STALLED Modified: tomcat/tc6.0.x/trunk/res/maven/annotations-api.pom URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/maven/annotations-api.pom?rev=1356185&r1=1356184&r2=1356185&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/res/maven/annotations-api.pom (original) +++ tomcat/tc6.0.x/trunk/res/maven/annotations-api.pom Mon Jul 2 11:20:19 2012 @@ -21,4 +21,12 @@ <artifactId>annotations-api</artifactId> <version>@MAVEN.DEPLOY.VERSION@</version> <description>Annotations Package</description> + <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> + </licenses> </project> \ No newline at end of file Modified: tomcat/tc6.0.x/trunk/res/maven/catalina-ha.pom URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/maven/catalina-ha.pom?rev=1356185&r1=1356184&r2=1356185&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/res/maven/catalina-ha.pom (original) +++ tomcat/tc6.0.x/trunk/res/maven/catalina-ha.pom Mon Jul 2 11:20:19 2012 @@ -21,6 +21,14 @@ <artifactId>catalina-ha</artifactId> <version>@MAVEN.DEPLOY.VERSION@</version> <description>Tomcat High Availability Implementation</description> + <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> + </licenses> <dependencies> <dependency> <groupId>org.apache.tomcat</groupId> Modified: tomcat/tc6.0.x/trunk/res/maven/catalina.pom URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/maven/catalina.pom?rev=1356185&r1=1356184&r2=1356185&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/res/maven/catalina.pom (original) +++ tomcat/tc6.0.x/trunk/res/maven/catalina.pom Mon Jul 2 11:20:19 2012 @@ -21,6 +21,14 @@ <artifactId>catalina</artifactId> <version>@MAVEN.DEPLOY.VERSION@</version> <description>Tomcat Servlet Engine Core Classes and Standard implementations</description> + <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> + </licenses> <dependencies> <!-- <dependency> Modified: tomcat/tc6.0.x/trunk/res/maven/coyote.pom URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/maven/coyote.pom?rev=1356185&r1=1356184&r2=1356185&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/res/maven/coyote.pom (original) +++ tomcat/tc6.0.x/trunk/res/maven/coyote.pom Mon Jul 2 11:20:19 2012 @@ -21,6 +21,14 @@ <artifactId>coyote</artifactId> <version>@MAVEN.DEPLOY.VERSION@</version> <description>Tomcat Connectors and HTTP parser</description> + <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> + </licenses> <dependencies> <dependency> <groupId>org.apache.tomcat</groupId> Modified: tomcat/tc6.0.x/trunk/res/maven/dbcp.pom URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/maven/dbcp.pom?rev=1356185&r1=1356184&r2=1356185&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/res/maven/dbcp.pom (original) +++ tomcat/tc6.0.x/trunk/res/maven/dbcp.pom Mon Jul 2 11:20:19 2012 @@ -21,4 +21,12 @@ <artifactId>dbcp</artifactId> <version>@MAVEN.DEPLOY.VERSION@</version> <description>Tomcat Database Connection Pooling package</description> + <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> + </licenses> </project> Modified: tomcat/tc6.0.x/trunk/res/maven/el-api.pom URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/maven/el-api.pom?rev=1356185&r1=1356184&r2=1356185&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/res/maven/el-api.pom (original) +++ tomcat/tc6.0.x/trunk/res/maven/el-api.pom Mon Jul 2 11:20:19 2012 @@ -21,4 +21,12 @@ <artifactId>el-api</artifactId> <version>@MAVEN.DEPLOY.VERSION@</version> <description>Expression language package</description> + <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> + </licenses> </project> Modified: tomcat/tc6.0.x/trunk/res/maven/jasper-el.pom URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/maven/jasper-el.pom?rev=1356185&r1=1356184&r2=1356185&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/res/maven/jasper-el.pom (original) +++ tomcat/tc6.0.x/trunk/res/maven/jasper-el.pom Mon Jul 2 11:20:19 2012 @@ -21,6 +21,14 @@ <artifactId>jasper-el</artifactId> <version>@MAVEN.DEPLOY.VERSION@</version> <description>Jasper Expression Language Impl</description> + <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> + </licenses> <dependencies> <dependency> <groupId>org.apache.tomcat</groupId> Modified: tomcat/tc6.0.x/trunk/res/maven/jasper.pom URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/maven/jasper.pom?rev=1356185&r1=1356184&r2=1356185&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/res/maven/jasper.pom (original) +++ tomcat/tc6.0.x/trunk/res/maven/jasper.pom Mon Jul 2 11:20:19 2012 @@ -21,6 +21,14 @@ <artifactId>jasper</artifactId> <version>@MAVEN.DEPLOY.VERSION@</version> <description>Tomcats JSP Parser</description> + <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> + </licenses> <dependencies> <dependency> <groupId>org.apache.tomcat</groupId> Modified: tomcat/tc6.0.x/trunk/res/maven/jsp-api.pom URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/maven/jsp-api.pom?rev=1356185&r1=1356184&r2=1356185&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/res/maven/jsp-api.pom (original) +++ tomcat/tc6.0.x/trunk/res/maven/jsp-api.pom Mon Jul 2 11:20:19 2012 @@ -21,6 +21,14 @@ <artifactId>jsp-api</artifactId> <version>@MAVEN.DEPLOY.VERSION@</version> <description>JSP package</description> + <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> + </licenses> <dependencies> <dependency> <groupId>org.apache.tomcat</groupId> Modified: tomcat/tc6.0.x/trunk/res/maven/juli-adapters.pom URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/maven/juli-adapters.pom?rev=1356185&r1=1356184&r2=1356185&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/res/maven/juli-adapters.pom (original) +++ tomcat/tc6.0.x/trunk/res/maven/juli-adapters.pom Mon Jul 2 11:20:19 2012 @@ -21,6 +21,14 @@ <artifactId>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> + <licenses> + <license> + <name>Apache License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + </license> + </licenses> <dependencies> <dependency> <groupId>org.apache.tomcat.extras</groupId> Modified: tomcat/tc6.0.x/trunk/res/maven/juli-extras.pom URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/maven/juli-extras.pom?rev=1356185&r1=1356184&r2=1356185&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/res/maven/juli-extras.pom (original) +++ tomcat/tc6.0.x/trunk/res/maven/juli-extras.pom Mon Jul 2 11:20:19 2012 @@ -21,4 +21,12 @@ <artifactId>juli</artifactId> <version>@MAVEN.DEPLOY.VERSION@</version> <description>Replacement for Tomcat Core Logging Package</description> + <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> + </licenses> </project> Modified: tomcat/tc6.0.x/trunk/res/maven/juli.pom URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/maven/juli.pom?rev=1356185&r1=1356184&r2=1356185&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/res/maven/juli.pom (original) +++ tomcat/tc6.0.x/trunk/res/maven/juli.pom Mon Jul 2 11:20:19 2012 @@ -21,4 +21,12 @@ <artifactId>juli</artifactId> <version>@MAVEN.DEPLOY.VERSION@</version> <description>Tomcat Core Logging Package</description> + <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> + </licenses> </project> Modified: tomcat/tc6.0.x/trunk/res/maven/servlet-api.pom URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/maven/servlet-api.pom?rev=1356185&r1=1356184&r2=1356185&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/res/maven/servlet-api.pom (original) +++ tomcat/tc6.0.x/trunk/res/maven/servlet-api.pom Mon Jul 2 11:20:19 2012 @@ -21,4 +21,12 @@ <artifactId>servlet-api</artifactId> <version>@MAVEN.DEPLOY.VERSION@</version> <description>javax.servlet package</description> + <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> + </licenses> </project> Modified: tomcat/tc6.0.x/trunk/res/maven/tribes.pom URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/maven/tribes.pom?rev=1356185&r1=1356184&r2=1356185&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/res/maven/tribes.pom (original) +++ tomcat/tc6.0.x/trunk/res/maven/tribes.pom Mon Jul 2 11:20:19 2012 @@ -21,6 +21,14 @@ <artifactId>tribes</artifactId> <version>@MAVEN.DEPLOY.VERSION@</version> <description>Tomcat Group Communication Package</description> + <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> + </licenses> <dependencies> <dependency> <groupId>org.apache.tomcat</groupId> Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1356185&r1=1356184&r2=1356185&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Jul 2 11:20:19 2012 @@ -319,6 +319,11 @@ (<code>res/maven/mvn-pub.xml</code>) with the Tomcat 7 version, making full use of Nexus. (markt) </update> + <add> + <bug>53034</bug>: Add <code>project.url</code> and + <code>project.licenses</code> sections to the POMs for the Maven + artifacts. (kkolinko) + </add> <fix> <bug>53454</bug>: Return correct content-length header for HEAD requests when content length is greater than 2GB. (markt) --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org