Author: rmannibucau
Date: Mon Sep 15 20:02:39 2014
New Revision: 1625145
URL: http://svn.apache.org/r1625145
Log:
using tomcat servlet api to be up to date and aligned on tomcat
Modified:
tomee/javaee-api/trunk/pom.xml
Modified: tomee/javaee-api/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/javaee-api/trunk/pom.xml?rev=1625145&r1=1625144&r2=1625145&view=diff
==============================================================================
--- tomee/javaee-api/trunk/pom.xml (original)
+++ tomee/javaee-api/trunk/pom.xml Mon Sep 15 20:02:39 2014
@@ -126,7 +126,7 @@
<excludes>
<exclude>*:*:sources</exclude>
<exclude>*:geronimo-jsp*</exclude>
- <exclude>*:geronimo-servlet*</exclude>
+ <exclude>*:tomcat-servlet-api*</exclude>
<exclude>*:tomcat-el-api*</exclude>
</excludes>
</artifactSet>
@@ -551,16 +551,16 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- <version>${geronimo-servlet_3.0_spec.version}</version>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
+ <version>${tomcat.version}</version>
<classifier>sources</classifier>
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- <version>${geronimo-servlet_3.0_spec.version}</version>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
+ <version>${tomcat.version}</version>
<optional>true</optional>
</dependency>
<dependency>
@@ -662,13 +662,13 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-el-api</artifactId>
- <version>${tomcat-el-api.version}</version>
+ <version>${tomcat.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-el-api</artifactId>
- <version>${tomcat-el-api.version}</version>
+ <version>${tomcat.version}</version>
<optional>true</optional>
<classifier>sources</classifier>
</dependency>
@@ -693,7 +693,6 @@
<geronimo-validation_1.1_spec.version>1.0-SNAPSHOT</geronimo-validation_1.1_spec.version>
<geronimo-activation_1.1_spec.version>1.1</geronimo-activation_1.1_spec.version>
<geronimo-stax-api_1.2_spec.version>1.1</geronimo-stax-api_1.2_spec.version>
- <geronimo-servlet_3.0_spec.version>1.0</geronimo-servlet_3.0_spec.version>
<geronimo-saaj_1.3_spec.version>1.1</geronimo-saaj_1.3_spec.version>
<geronimo-atinject_1.0_spec.version>1.0</geronimo-atinject_1.0_spec.version>
<geronimo-jaspic_1.0_spec.version>1.1</geronimo-jaspic_1.0_spec.version>
@@ -704,6 +703,6 @@
<geronimo-concurrent_1.0_spec.version>1.0-SNAPSHOT</geronimo-concurrent_1.0_spec.version>
<geronimo-jbatch_1.0_spec.version>1.0</geronimo-jbatch_1.0_spec.version>
<geronimo-jcache_1.0_spec.version>1.0-SNAPSHOT</geronimo-jcache_1.0_spec.version>
- <tomcat-el-api.version>8.0.9</tomcat-el-api.version>
+ <tomcat.version>8.0.12</tomcat.version>
</properties>
</project>
