X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc%2Fpom.xml;h=b194dc5252b5e436121eacfe2dcb86f2e9e0ce1b;hb=cdb5a9f10678f41914d6eeebd6620c0a84dbd208;hp=9e831f351561140763a1387bc6e43649c4124b97;hpb=4af418ad1d16e736d7e205567d994eb73c8f7e83;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml
index 9e831f351..b194dc525 100644
--- a/org.argeo.slc/pom.xml
+++ b/org.argeo.slc/pom.xml
@@ -14,7 +14,7 @@
 		<version.spring>2.5.6.A</version.spring>
 		<version.spring-ws>1.5.5.A</version.spring-ws>
 		<version.maven>2.0.9</version.maven>
-		<version.ant>1.7.1</version.ant>
+		<version.ant>1.7.0</version.ant>
 		<version.jetty>6.1.11</version.jetty>
 	</properties>
 	<scm>
@@ -248,23 +248,8 @@
 				<artifactId>com.springsource.org.dbunit</artifactId>
 				<version>2.2.0</version>
 			</dependency>
-			<!--
-				<dependency> <groupId>org.dbunit</groupId>
-				<artifactId>dbunit</artifactId> <version>2.2.3</version>
-				<exclusions> <exclusion> <groupId>junit-addons</groupId>
-				<artifactId>junit-addons</artifactId> </exclusion> <exclusion>
-				<groupId>poi</groupId> <artifactId>poi</artifactId> </exclusion>
-				</exclusions> </dependency> <dependency> <groupId>log4j</groupId>
-				<artifactId>log4j</artifactId> <version>1.2.15</version>
-				<exclusions> <exclusion> <groupId>com.sun.jmx</groupId>
-				<artifactId>jmxri</artifactId> </exclusion> <exclusion>
-				<groupId>com.sun.jdmk</groupId> <artifactId>jmxtools</artifactId>
-				</exclusion> <exclusion> <groupId>javax.mail</groupId>
-				<artifactId>mail</artifactId> </exclusion> <exclusion>
-				<groupId>javax.jms</groupId> <artifactId>jms</artifactId>
-				</exclusion> </exclusions> </dependency>
-			-->
 
+			<!-- Logging -->
 			<dependency>
 				<groupId>org.apache.log4j</groupId>
 				<artifactId>
@@ -284,12 +269,27 @@
 				<artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
 				<version>1.5.3</version>
 			</dependency>
+			<dependency>
+				<groupId>org.slf4j</groupId>
+				<artifactId>com.springsource.slf4j.jcl</artifactId>
+				<version>1.5.3</version>
+			</dependency>
+			<dependency>
+				<groupId>org.slf4j</groupId>
+				<artifactId>com.springsource.slf4j.org.apache.log4j</artifactId>
+				<version>1.5.3</version>
+			</dependency>
 			<!-- Spring -->
 			<dependency>
 				<groupId>org.springframework</groupId>
 				<artifactId>org.springframework.core</artifactId>
 				<version>${version.spring}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>org.springframework.beans</artifactId>
+				<version>${version.spring}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.springframework</groupId>
 				<artifactId>org.springframework.context</artifactId>
@@ -312,6 +312,11 @@
 				<artifactId>org.springframework.jdbc</artifactId>
 				<version>${version.spring}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>org.springframework.web</artifactId>
+				<version>${version.spring}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.springframework</groupId>
 				<artifactId>org.springframework.web.servlet</artifactId>
@@ -334,53 +339,42 @@
 				<version>${version.spring-ws}</version>
 			</dependency>
 
-			<!-- Ant -->
-			<dependency>
-				<groupId>org.apache.ant</groupId>
-				<artifactId>
-					com.springsource.org.apache.tools.ant
-				</artifactId>
-				<version>1.7.0</version>
-			</dependency>
 			<dependency>
-				<groupId>org.apache.ant</groupId>
-				<artifactId>
-					ant
-				</artifactId>
-				<version>${version.ant}</version>
+				<groupId>org.springframework.osgi</groupId>
+				<artifactId>org.springframework.osgi.extender</artifactId>
+				<version>1.1.2.B</version>
 			</dependency>
+
+			<!-- Ant -->
 			<dependency>
-				<groupId>org.apache.ant</groupId>
-				<artifactId>ant-commons-logging</artifactId>
-				<version>${version.ant}</version>
+				<groupId>org.argeo.dep.osgi</groupId>
+				<artifactId>org.argeo.dep.osgi.ant</artifactId>
+				<version>1.7.1</version>
 			</dependency>
+
+			<!-- Required by specific Ant tasks -->
 			<dependency>
-				<groupId>org.apache.ant</groupId>
-				<artifactId>ant-commons-net</artifactId>
-				<version>${version.ant}</version>
+				<groupId>org.apache.commons</groupId>
+				<artifactId>com.springsource.org.apache.commons.net</artifactId>
+				<version>1.4.1</version>
 			</dependency>
 			<dependency>
-				<groupId>org.apache.ant</groupId>
-				<artifactId>ant-apache-oro</artifactId>
-				<version>${version.ant}</version>
+				<groupId>org.apache.oro</groupId>
+				<artifactId>com.springsource.org.apache.oro</artifactId>
+				<version>2.0.8</version>
 			</dependency>
 			<dependency>
-				<groupId>org.apache.ant</groupId>
-				<artifactId>ant-apache-bsf</artifactId>
-				<version>${version.ant}</version>
+				<groupId>org.apache.bsf</groupId>
+				<artifactId>com.springsource.org.apache.bsf</artifactId>
+				<version>2.4.0</version>
 			</dependency>
-			<!-- Required by FTP Ant task -->
 			<dependency>
-				<groupId>commons-net</groupId>
-				<artifactId>commons-net</artifactId>
-				<version>1.4.1</version>
-			</dependency>
-			<dependency>
-				<groupId>oro</groupId>
-				<artifactId>oro</artifactId>
-				<version>2.0.8</version>
+				<groupId>org.beanshell</groupId>
+				<artifactId>com.springsource.bsh</artifactId>
+				<version>2.0.0.b4</version>
 			</dependency>
 
+			<!-- Apache Commons -->
 			<dependency>
 				<groupId>org.apache.commons</groupId>
 				<artifactId>
@@ -389,8 +383,13 @@
 				<version>1.4.0</version>
 			</dependency>
 			<dependency>
-				<groupId>commons-cli</groupId>
-				<artifactId>commons-cli</artifactId>
+				<groupId>org.apache.commons</groupId>
+				<artifactId>com.springsource.org.apache.commons.collections</artifactId>
+				<version>3.2.0</version>
+			</dependency>
+			<dependency>
+				<groupId>org.argeo.dep.osgi</groupId>
+				<artifactId>org.argeo.dep.osgi.commons.cli</artifactId>
 				<version>1.1</version>
 			</dependency>
 
@@ -406,30 +405,12 @@
 				<artifactId>com.springsource.org.castor</artifactId>
 				<version>1.2.0</version>
 			</dependency>
-			<!--
-				<dependency> <groupId>org.argeo.dep.osgi</groupId>
-				<artifactId>org.argeo.dep.osgi.castor</artifactId>
-				<version>1.2</version> </dependency>
-			-->
-			<!--
-				<dependency> <groupId>org.codehaus.castor</groupId>
-				<artifactId>castor</artifactId> <version>1.2</version> <exclusions>
-				<exclusion> <groupId>xerces</groupId>
-				<artifactId>xerces</artifactId> </exclusion> </exclusions>
-				</dependency>
-			-->
 			<dependency>
 				<groupId>org.apache.xerces</groupId>
 				<artifactId>
 					com.springsource.org.apache.xerces
 				</artifactId>
 				<version>2.8.1</version>
-				<exclusions>
-					<exclusion>
-						<groupId>org.apache.xmlcommons</groupId>
-						<artifactId>com.springsource.org.apache.xmlcommons</artifactId>
-					</exclusion>
-				</exclusions>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.xalan</groupId>
@@ -438,8 +419,28 @@
 				</artifactId>
 				<version>2.7.0</version>
 			</dependency>
+			<dependency>
+				<groupId>org.apache.xmlcommons</groupId>
+				<artifactId>com.springsource.org.apache.xmlcommons</artifactId>
+				<version>1.3.3</version>
+			</dependency>
 
 			<!-- Web -->
+			<dependency>
+				<groupId>javax.servlet</groupId>
+				<artifactId>com.springsource.javax.servlet</artifactId>
+				<version>2.5.0</version>
+			</dependency>
+			<dependency>
+				<groupId>javax.servlet</groupId>
+				<artifactId>com.springsource.javax.servlet.jsp</artifactId>
+				<version>2.1.0</version>
+			</dependency>
+			<dependency>
+				<groupId>javax.el</groupId>
+				<artifactId>com.springsource.javax.el</artifactId>
+				<version>1.0.0</version>
+			</dependency>
 			<dependency>
 				<groupId>javax.servlet</groupId>
 				<artifactId>
@@ -455,9 +456,9 @@
 				<version>1.1.2</version>
 			</dependency>
 			<dependency>
-				<groupId>javax.servlet</groupId>
-				<artifactId>com.springsource.javax.servlet</artifactId>
-				<version>2.5.0</version>
+				<groupId>javax.activation</groupId>
+				<artifactId>com.springsource.javax.activation</artifactId>
+				<version>1.1.1</version>
 			</dependency>
 
 			<dependency>
@@ -495,25 +496,20 @@
 			</dependency>
 
 			<!-- OSGi -->
-			<dependency>
-				<groupId>org.apache.felix</groupId>
+			<!--
+				<dependency> <groupId>org.apache.felix</groupId>
 				<artifactId>org.apache.felix.main</artifactId>
-				<version>1.2.1</version>
-				<exclusions>
-					<exclusion>
-						<groupId>org.apache.felix</groupId>
-						<artifactId>
-							org.apache.felix.framework
-						</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-
+				<version>1.2.1</version> <exclusions> <exclusion>
+				<groupId>org.apache.felix</groupId> <artifactId>
+				org.apache.felix.framework </artifactId> </exclusion> </exclusions>
+				</dependency> <dependency> <groupId>org.apache.felix</groupId>
+				<artifactId>org.osgi.core</artifactId> <version>1.2.0</version>
+				<scope>provided</scope> </dependency>
+			-->
 			<dependency>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>org.osgi.core</artifactId>
-				<version>1.2.0</version>
-				<scope>provided</scope>
+				<groupId>org.eclipse.osgi</groupId>
+				<artifactId>org.eclipse.osgi</artifactId>
+				<version>3.4.2.R34x_v20080826-1230</version>
 			</dependency>
 
 			<!-- Auto UI -->