ARTEMIS-119 Changed dependency to use Tomcat Servlet API 3.1.

This commit is contained in:
John D. Ament 2015-06-04 09:33:41 -04:00 committed by Clebert Suconic
parent ef1b9605dc
commit e2f301dd85
3 changed files with 9 additions and 10 deletions

View File

@ -154,8 +154,8 @@
<artifactId>jetty-all</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_3.0_spec</artifactId>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-servlet-api</artifactId>
</dependency>
<dependency>
<groupId>org.jolokia</groupId>

View File

@ -80,7 +80,7 @@
<include>javax.inject:javax.inject</include>
<include>org.eclipse.jetty.aggregate:jetty-all</include>
<include>org.apache.geronimo.specs:</include>
<include>org.apache.geronimo.specs:geronimo-servlet_3.0_spec</include>
<include>org.apache.tomcat:tomcat-servlet-api</include>
<include>commons-beanutils:commons-beanutils</include>
<include>commons-logging:commons-logging</include>
<include>org.fusesource.hawtbuf:hawtbuf</include>

13
pom.xml
View File

@ -204,7 +204,7 @@
<!-- ### Build Time Dependencies ### -->
<!-- This is a build dependency of this project, but is not needed at compile or runtime by other
projects that depend on this project. This should be in the compiler plugin but can't because of a bug,
see https://jira.codehaus.org/browse/MCOMPILER-203-->
see https://issues.apache.org/jira/browse/MCOMPILER-203-->
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-processor</artifactId>
@ -441,12 +441,11 @@
<version>${jetty.version}</version>
<!-- License: (Joint): Apache 2.0 & EPL 1.0 -->
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_3.0_spec</artifactId>
<version>1.0</version>
<!-- License: Apache 2.0 -->
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-servlet-api</artifactId>
<version>8.0.23</version>
</dependency>
<dependency>
<groupId>org.jolokia</groupId>
<artifactId>jolokia-war</artifactId>