X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Fdep%2Forg.argeo.server.dep.tomcat%2Fpom.xml;h=6f0ae7e84d6a59cf6476a55e2e9b218a80800d41;hb=1df1bf64759d35d3d72b9d96b26b71118fdbe031;hp=781a8444837a568bd935800f840ed4b22138af89;hpb=0c7e0b9314d87092a4926cbaa3725967b0792fa4;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 781a84448..6f0ae7e84 100644
--- a/server/dep/org.argeo.server.dep.tomcat/pom.xml
+++ b/server/dep/org.argeo.server.dep.tomcat/pom.xml
@@ -1,115 +1,108 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <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.1.2</version>
+		<groupId>org.argeo.commons</groupId>
+		<version>2.1.12-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>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.dep.log4j</artifactId>
+			<version>2.1.12-SNAPSHOT</version>
 			<type>pom</type>
 		</dependency>
 
-		<!-- JEE -->
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>com.springsource.javax.servlet</artifactId>
-		</dependency>
-		<dependency>
-			<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>
-		</dependency>
+		<!-- Modules -->
 		<dependency>
-			<groupId>javax.ejb</groupId>
-			<artifactId>com.springsource.javax.ejb</artifactId>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.server.catalina</artifactId>
+			<version>2.1.12-SNAPSHOT</version>
 		</dependency>
 		<dependency>
-			<groupId>javax.xml.rpc</groupId>
-			<artifactId>com.springsource.javax.xml.rpc</artifactId>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.server.catalina.start</artifactId>
+			<version>2.1.12-SNAPSHOT</version>
 		</dependency>
+
+		<!-- JEE -->
 		<dependency>
-			<groupId>javax.xml.soap</groupId>
-			<artifactId>com.springsource.javax.xml.soap</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>javax.servlet</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>javax.transaction</groupId>
-			<artifactId>com.springsource.javax.transaction</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>javax.servlet.jsp</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>javax.xml.stream</groupId>
-			<artifactId>com.springsource.javax.xml.stream</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>javax.persistence</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>com.springsource.javax.servlet.jsp</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>javax.management.j2ee</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>com.springsource.javax.servlet.jsp.jstl</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>javax.ejb</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>javax.el</groupId>
-			<artifactId>com.springsource.javax.el</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>javax.xml.rpc</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>javax.xml.ws</groupId>
-			<artifactId>com.springsource.javax.xml.ws</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>javax.servlet.jsp.jstl</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>javax.xml.bind</groupId>
-			<artifactId>com.springsource.javax.xml.bind</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>javax.el</artifactId>
 		</dependency>
 
 		<!-- Taglibs -->
 		<dependency>
-			<groupId>org.apache.taglibs</groupId>
-			<artifactId>com.springsource.org.apache.taglibs.standard</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>org.apache.taglibs.standard</artifactId>
 		</dependency>
 
 		<!-- Tomcat -->
 		<dependency>
-			<groupId>org.argeo.dep.osgi</groupId>
-			<artifactId>org.argeo.dep.osgi.catalina.start</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>org.apache.coyote</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.coyote.springsource</groupId>
-			<artifactId>com.springsource.org.apache.coyote.springsource</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>org.apache.catalina</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.catalina.springsource</groupId>
-			<artifactId>com.springsource.org.apache.catalina.springsource</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>org.apache.jasper</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.jasper.springsource</groupId>
-			<artifactId>com.springsource.org.apache.jasper.springsource</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>org.apache.el</artifactId>
 		</dependency>
+
+		<!-- Test with Javax -->
 		<dependency>
-			<groupId>org.apache.el.springsource</groupId>
-			<artifactId>com.springsource.org.apache.el.springsource</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>org.apache.xmlcommons</artifactId>
+			<scope>test</scope>
 		</dependency>
+
+		<!-- OSGi test -->
+		<dependency>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.osgi.boot</artifactId>
+			<version>2.1.12-SNAPSHOT</version>
+			<scope>test</scope>
+		</dependency>
+
 	</dependencies>
 </project>
\ No newline at end of file