X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=server%2Fdep%2Forg.argeo.server.dep.tomcat%2Fpom.xml;h=f6ed8114f15848ceb8998750a0689ff50d53064f;hb=a52e5c9b1cca9109f159b90f3eda439ed6077f04;hp=535ef108b743af43bdc8aabc9a2bdc8ded37668e;hpb=9ecac0dc0810a3cabf8eb75951f1b7a3c149ae94;p=lgpl%2Fargeo-commons.git

diff --git a/server/dep/org.argeo.server.dep.tomcat/pom.xml b/server/dep/org.argeo.server.dep.tomcat/pom.xml
index 535ef108b..f6ed8114f 100644
--- a/server/dep/org.argeo.server.dep.tomcat/pom.xml
+++ b/server/dep/org.argeo.server.dep.tomcat/pom.xml
@@ -1,24 +1,35 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.commons.server</groupId>
-		<version>0.2.3-SNAPSHOT</version>
+		<version>1.1.1-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 -->
 		<dependency>
 			<groupId>org.argeo.commons.basic</groupId>
 			<artifactId>org.argeo.basic.dep.log4j</artifactId>
-			<version>0.2.3-SNAPSHOT</version>
+			<version>1.1.1-SNAPSHOT</version>
 			<type>pom</type>
 		</dependency>
 
+		<!-- Modules -->
+		<dependency>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.server.catalina</artifactId>
+			<version>1.1.1-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>
@@ -44,10 +55,6 @@
 			<groupId>javax.xml.rpc</groupId>
 			<artifactId>com.springsource.javax.xml.rpc</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>
@@ -85,5 +92,18 @@
 			<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>1.1.1-SNAPSHOT</version>
+			<type>pom</type>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.xmlcommons</groupId>
+			<artifactId>com.springsource.org.apache.xmlcommons</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file