Author: markt
Date: Fri Jan 24 18:12:45 2014
New Revision: 1561099
URL: http://svn.apache.org/r1561099
Log:
Correct Maven dependencies
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/res/maven/catalina.pom
tomcat/tc6.0.x/trunk/res/maven/coyote.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=1561099&r1=1561098&r2=1561099&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jan 24 18:12:45 2014
@@ -30,10 +30,8 @@ None
PATCHES PROPOSED TO BACKPORT:
[ New proposals should be added at the end of the list ]
-* Correct Maven dependencies
- http://people.apache.org/~markt/patches/2014-01-23-poms-tc6-v1.patch
- +1: markt, kkolinko, rjung
- -1:
+None
+
PATCHES/ISSUES THAT ARE STALLED:
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=1561099&r1=1561098&r2=1561099&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/res/maven/catalina.pom (original)
+++ tomcat/tc6.0.x/trunk/res/maven/catalina.pom Fri Jan 24 18:12:45 2014
@@ -30,14 +30,12 @@
</license>
</licenses>
<dependencies>
- <!--
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>coyote</artifactId>
<version>@MAVEN.DEPLOY.VERSION@</version>
<scope>compile</scope>
</dependency>
- -->
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>servlet-api</artifactId>
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=1561099&r1=1561098&r2=1561099&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/res/maven/coyote.pom (original)
+++ tomcat/tc6.0.x/trunk/res/maven/coyote.pom Fri Jan 24 18:12:45 2014
@@ -32,13 +32,13 @@
<dependencies>
<dependency>
<groupId>org.apache.tomcat</groupId>
- <artifactId>catalina</artifactId>
+ <artifactId>servlet-api</artifactId>
<version>@MAVEN.DEPLOY.VERSION@</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
- <artifactId>servlet-api</artifactId>
+ <artifactId>jsp-api</artifactId>
<version>@MAVEN.DEPLOY.VERSION@</version>
<scope>compile</scope>
</dependency>
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=1561099&r1=1561098&r2=1561099&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Jan 24 18:12:45 2014
@@ -82,6 +82,9 @@
Java 5 JDK when several JDKs are configured. Cleanup the Ant build
files. (kkolinko)
</update>
+ <fix>
+ Correct Maven dependencies for individual JAR file. (markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
