[maven-release-plugin] prepare for next development iteration

[lgpl/argeo-commons.git] / server / dep / org.argeo.server.dep.tomcat / pom.xml

diff --git a/server/dep/org.argeo.server.dep.tomcat/pom.xml b/server/dep/org.argeo.server.dep.tomcat/pom.xml
index 781a8444837a568bd935800f840ed4b22138af89..7ef2f44d2b5d6a7fa395718e5159da52fbf1dd1b 100644 (file)
--- a/server/dep/org.argeo.server.dep.tomcat/pom.xml
+++ b/server/dep/org.argeo.server.dep.tomcat/pom.xml
@@ -2,22 +2,34 @@
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons.server</groupId>
-               <version>0.1.2</version>
+               <version>0.3.5-SNAPSHOT</version>
                <artifactId>dep</artifactId>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.server.dep.tomcat</artifactId>
        <packaging>pom</packaging>
-       <name>Dep Apache Tomcat</name>
+       <name>Commons Tomcat Dependencies</name>
        <dependencies>
-               <!--  Commons Dep -->
+               <!-- Commons Dep -->
                <dependency>
                        <groupId>org.argeo.commons.basic</groupId>
                        <artifactId>org.argeo.basic.dep.log4j</artifactId>
-                       <version>0.1.2</version>
+                       <version>0.3.4-SNAPSHOT</version>
                        <type>pom</type>
                </dependency>
 
+               <!-- Modules -->
+               <dependency>
+                       <groupId>org.argeo.commons.server</groupId>
+                       <artifactId>org.argeo.server.catalina</artifactId>
+                       <version>0.3.4-SNAPSHOT</version>
+               </dependency>
+<!--           <dependency> -->
+<!--                   <groupId>org.argeo.commons.server</groupId> -->
+<!--                   <artifactId>org.argeo.server.tomcat</artifactId> -->
+<!--                   <version>0.3.1-SNAPSHOT</version> -->
+<!--           </dependency> -->
+
                <!-- JEE -->
                <dependency>
                        <groupId>javax.servlet</groupId>
@@ -27,18 +39,10 @@
                        <groupId>javax.servlet</groupId>
                        <artifactId>com.springsource.javax.servlet.jsp</artifactId>
                </dependency>
-               <dependency>
-                       <groupId>javax.annotation</groupId>
-                       <artifactId>com.springsource.javax.annotation</artifactId>
-               </dependency>
                <dependency>
                        <groupId>javax.persistence</groupId>
                        <artifactId>com.springsource.javax.persistence</artifactId>
                </dependency>
-               <dependency>
-                       <groupId>javax.activation</groupId>
-                       <artifactId>com.springsource.javax.activation</artifactId>
-               </dependency>
                <dependency>
                        <groupId>org.apache.geronimo.specs</groupId>
                        <artifactId>com.springsource.javax.management.j2ee</artifactId>
@@ -51,22 +55,6 @@
                        <groupId>javax.xml.rpc</groupId>
                        <artifactId>com.springsource.javax.xml.rpc</artifactId>
                </dependency>
-               <dependency>
-                       <groupId>javax.xml.soap</groupId>
-                       <artifactId>com.springsource.javax.xml.soap</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>javax.transaction</groupId>
-                       <artifactId>com.springsource.javax.transaction</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>javax.xml.stream</groupId>
-                       <artifactId>com.springsource.javax.xml.stream</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>javax.servlet</groupId>
-                       <artifactId>com.springsource.javax.servlet.jsp</artifactId>
-               </dependency>
                <dependency>
                        <groupId>javax.servlet</groupId>
                        <artifactId>com.springsource.javax.servlet.jsp.jstl</artifactId>
@@ -75,14 +63,6 @@
                        <groupId>javax.el</groupId>
                        <artifactId>com.springsource.javax.el</artifactId>
                </dependency>
-               <dependency>
-                       <groupId>javax.xml.ws</groupId>
-                       <artifactId>com.springsource.javax.xml.ws</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>javax.xml.bind</groupId>
-                       <artifactId>com.springsource.javax.xml.bind</artifactId>
-               </dependency>
 
                <!-- Taglibs -->
                <dependency>
@@ -96,20 +76,34 @@
                        <artifactId>org.argeo.dep.osgi.catalina.start</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.apache.coyote.springsource</groupId>
-                       <artifactId>com.springsource.org.apache.coyote.springsource</artifactId>
+                       <groupId>org.apache.coyote</groupId>
+                       <artifactId>com.springsource.org.apache.coyote</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.apache.catalina.springsource</groupId>
-                       <artifactId>com.springsource.org.apache.catalina.springsource</artifactId>
+                       <groupId>org.apache.catalina</groupId>
+                       <artifactId>com.springsource.org.apache.catalina</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.apache.jasper.springsource</groupId>
-                       <artifactId>com.springsource.org.apache.jasper.springsource</artifactId>
+                       <groupId>org.apache.jasper</groupId>
+                       <artifactId>com.springsource.org.apache.jasper</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.el</groupId>
+                       <artifactId>com.springsource.org.apache.el</artifactId>
+               </dependency>
+
+               <!-- Test with Javax -->
+               <dependency>
+                       <groupId>org.argeo.commons.server</groupId>
+                       <artifactId>org.argeo.server.dep.javax</artifactId>
+                       <version>0.3.4-SNAPSHOT</version>
+                       <type>pom</type>
+                       <scope>test</scope>
                </dependency>
                <dependency>
-                       <groupId>org.apache.el.springsource</groupId>
-                       <artifactId>com.springsource.org.apache.el.springsource</artifactId>
+                       <groupId>org.apache.xmlcommons</groupId>
+                       <artifactId>com.springsource.org.apache.xmlcommons</artifactId>
+                       <scope>test</scope>
                </dependency>
        </dependencies>
 </project>
\ No newline at end of file