You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2011/05/04 09:48:37 UTC
svn commit: r1099357 -
/geronimo/server/branches/3.0-osgi/plugins/tomcat/tomcat7/pom.xml
Author: djencks
Date: Wed May 4 07:48:36 2011
New Revision: 1099357
URL: http://svn.apache.org/viewvc?rev=1099357&view=rev
Log:
start using more features in tomcat7 car
Modified:
geronimo/server/branches/3.0-osgi/plugins/tomcat/tomcat7/pom.xml
Modified: geronimo/server/branches/3.0-osgi/plugins/tomcat/tomcat7/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/tomcat/tomcat7/pom.xml?rev=1099357&r1=1099356&r2=1099357&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/tomcat/tomcat7/pom.xml (original)
+++ geronimo/server/branches/3.0-osgi/plugins/tomcat/tomcat7/pom.xml Wed May 4 07:48:36 2011
@@ -36,29 +36,13 @@
<description>Geronimo Tomcat web server integration.</description>
<dependencies>
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.framework</groupId>-->
- <!--<artifactId>geronimo-gbean-deployer</artifactId>-->
- <!--<version>${project.version}</version>-->
- <!--<type>car</type>-->
- <!--<scope>provided</scope>-->
- <!--</dependency>-->
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- </dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.1_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>j2ee-server</artifactId>
+ <groupId>org.apache.geronimo.feature</groupId>
+ <artifactId>org.apache.geronimo.javaee-specs</artifactId>
<version>${project.version}</version>
- <type>car</type>
+ <type>xml</type>
+ <classifier>features</classifier>
</dependency>
-
<dependency>
<groupId>org.apache.geronimo.framework.feature</groupId>
<artifactId>j2ee-system</artifactId>
@@ -75,11 +59,18 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>transaction-1_6</artifactId>
+ <artifactId>j2ee-server</artifactId>
<version>${project.version}</version>
<type>car</type>
</dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.configs</groupId>-->
+ <!--<artifactId>transaction-1_6</artifactId>-->
+ <!--<version>${project.version}</version>-->
+ <!--<type>car</type>-->
+ <!--</dependency>-->
+
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-tomcat7</artifactId>
@@ -94,12 +85,12 @@
</dependency>
<!-- Required because tomcat STARTS its default web.xml which has a jasper servlet in it -->
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jasper</artifactId>
- <type>car</type>
- <version>${project.version}</version>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.configs</groupId>-->
+ <!--<artifactId>jasper</artifactId>-->
+ <!--<type>car</type>-->
+ <!--<version>${project.version}</version>-->
+ <!--</dependency>-->
<dependency>
<groupId>${tomcatGroupId}</groupId>
@@ -135,6 +126,8 @@
<artifactId>car-maven-plugin</artifactId>
<configuration>
<features>
+ <feature>org.apache.geronimo.jaxb-support</feature>
+ <feature>org.apache.geronimo.javaee-specs</feature>
<feature>j2ee-system</feature>
<feature>server-security-config</feature>
</features>