Author: markt
Date: Fri Aug 16 10:51:42 2013
New Revision: 1514648
URL: http://svn.apache.org/r1514648
Log:
Back-porting JSR-356
Coyote has new dependency on Servlet API because upgrade mechanism uses
Servlet[In|Out]putStream.
Modified:
tomcat/tc7.0.x/trunk/res/checkstyle/org-import-control.xml
tomcat/tc7.0.x/trunk/res/maven/tomcat-coyote.pom
Modified: tomcat/tc7.0.x/trunk/res/checkstyle/org-import-control.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/checkstyle/org-import-control.xml?rev=1514648&r1=1514647&r2=1514648&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/checkstyle/org-import-control.xml (original)
+++ tomcat/tc7.0.x/trunk/res/checkstyle/org-import-control.xml Fri Aug 16
10:51:42 2013
@@ -79,6 +79,7 @@
</subpackage>
</subpackage>
<subpackage name="coyote">
+ <allow pkg="javax.servlet"/>
<allow pkg="org.apache.coyote"/>
<allow pkg="org.apache.juli"/>
<allow pkg="org.apache.tomcat.jni"/>
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=1514648&r1=1514647&r2=1514648&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-coyote.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-coyote.pom Fri Aug 16 10:51:42 2013
@@ -32,6 +32,12 @@
<dependencies>
<dependency>
<groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
+ <version>@MAVEN.DEPLOY.VERSION@</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-juli</artifactId>
<version>@MAVEN.DEPLOY.VERSION@</version>
<scope>compile</scope>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
