X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=server%2Fdep%2Forg.argeo.server.dep.tomcat%2Fpom.xml;h=0aedd4cae51b2c4d0e67ee03cd25f285314e5375;hb=d4965ca4ec8fc5489bd947a36b3435a9ffec74d0;hp=8aab7db73a945dcd84ddfd79e89f8f1549f0a750;hpb=ed7bc12c0c7bc20d032c8486ae6279086111765a;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 8aab7db73..0aedd4cae 100644
--- a/server/dep/org.argeo.server.dep.tomcat/pom.xml
+++ b/server/dep/org.argeo.server.dep.tomcat/pom.xml
@@ -1,21 +1,20 @@
-<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">
+<?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.2.3-SNAPSHOT</version>
+		<version>1.1.4-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.4-SNAPSHOT</version>
 			<type>pom</type>
 		</dependency>
 
@@ -23,92 +22,90 @@
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
 			<artifactId>org.argeo.server.catalina</artifactId>
-			<version>${version.argeo-commons}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.tomcat</artifactId>
-			<version>${version.argeo-commons}</version>
+			<version>1.1.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>
-			<artifactId>com.springsource.javax.servlet</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>com.springsource.javax.servlet.jsp</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>javax.servlet</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>javax.persistence</groupId>
-			<artifactId>com.springsource.javax.persistence</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>javax.servlet.jsp</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.geronimo.specs</groupId>
-			<artifactId>com.springsource.javax.management.j2ee</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>javax.persistence</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>javax.ejb</groupId>
-			<artifactId>com.springsource.javax.ejb</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>javax.management.j2ee</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>javax.xml.rpc</groupId>
-			<artifactId>com.springsource.javax.xml.rpc</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>javax.ejb</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>com.springsource.javax.servlet.jsp</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>javax.xml.rpc</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>com.springsource.javax.servlet.jsp.jstl</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>javax.servlet.jsp.jstl</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>javax.el</groupId>
-			<artifactId>com.springsource.javax.el</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>
+			<groupId>org.argeo.tp</groupId>
 			<artifactId>org.argeo.dep.osgi.catalina.start</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.coyote</groupId>
-			<artifactId>com.springsource.org.apache.coyote</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>org.apache.coyote</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.catalina</groupId>
-			<artifactId>com.springsource.org.apache.catalina</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>org.apache.catalina</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.jasper</groupId>
-			<artifactId>com.springsource.org.apache.jasper</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>org.apache.jasper</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.el</groupId>
-			<artifactId>com.springsource.org.apache.el</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>org.apache.el</artifactId>
 		</dependency>
 
 		<!-- Test with Javax -->
 		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.dep.javax</artifactId>
-			<version>${version.argeo-commons}</version>
-			<type>pom</type>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.xmlcommons</groupId>
-			<artifactId>com.springsource.org.apache.xmlcommons</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>org.apache.xmlcommons</artifactId>
 			<scope>test</scope>
 		</dependency>
+		
+						<!-- OSGi test -->
+				<dependency>
+					<groupId>org.argeo.commons.osgi</groupId>
+					<artifactId>org.argeo.osgi.boot</artifactId>
+					<version>1.1.4-SNAPSHOT</version>
+					<scope>test</scope>
+				</dependency>
+		
 	</dependencies>
 </project>
\ No newline at end of file