X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc%2Fpom.xml;h=e767a74409f6d57dfb286be51cc1218c2ccead30;hb=e1572e2cb9ddf4380ea67f15e113d6c0fb07bab4;hp=e93c0b54c70c1de90554dcc15091be492583a588;hpb=71e99443c33cd109d5dfa4c17acbb84ee73c2908;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml
index e93c0b54c..e767a7440 100644
--- a/org.argeo.slc/pom.xml
+++ b/org.argeo.slc/pom.xml
@@ -15,7 +15,7 @@
 		<version.spring-ws>1.5.5.A</version.spring-ws>
 		<version.maven>2.0.9</version.maven>
 		<version.ant>1.7.0</version.ant>
-		<version.jetty>6.1.11</version.jetty>
+		<version.jetty>6.1.14</version.jetty>
 	</properties>
 	<scm>
 		<connection>
@@ -134,10 +134,14 @@
 							<version>${version.jetty}</version>
 						</dependency>
 						<dependency>
-							<groupId>log4j</groupId>
-							<artifactId>log4j</artifactId>
-							<version>1.2.14</version>
-							<type>jar</type>
+							<groupId>org.apache.log4j</groupId>
+							<artifactId>com.springsource.org.apache.log4j</artifactId>
+							<version>1.2.15</version>
+						</dependency>
+						<dependency>
+							<groupId>javax.xml.soap</groupId>
+							<artifactId>com.springsource.javax.xml.soap</artifactId>
+							<version>1.3.0</version>
 						</dependency>
 					</dependencies>
 				</plugin>
@@ -269,7 +273,16 @@
 				<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>
@@ -330,45 +343,18 @@
 				<version>${version.spring-ws}</version>
 			</dependency>
 
+			<dependency>
+				<groupId>org.springframework.osgi</groupId>
+				<artifactId>org.springframework.osgi.extender</artifactId>
+				<version>1.1.2.B</version>
+			</dependency>
+
 			<!-- Ant -->
 			<dependency>
 				<groupId>org.argeo.dep.osgi</groupId>
 				<artifactId>org.argeo.dep.osgi.ant</artifactId>
 				<version>1.7.1</version>
 			</dependency>
-			<!--
-				<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-commons-logging</artifactId>
-				<version>${version.ant}</version> <exclusions> <exclusion>
-				<groupId>commons-logging</groupId>
-				<artifactId>commons-logging</artifactId> </exclusion> <exclusion>
-				<groupId>commons-logging</groupId>
-				<artifactId>commons-logging-api</artifactId> </exclusion>
-				<exclusion> <groupId>org.apache.ant</groupId>
-				<artifactId>ant</artifactId> </exclusion> </exclusions>
-				</dependency> <dependency> <groupId>org.apache.ant</groupId>
-				<artifactId>ant-commons-net</artifactId>
-				<version>${version.ant}</version> <exclusions> <exclusion>
-				<groupId>commons-net</groupId> <artifactId>commons-net</artifactId>
-				</exclusion> <exclusion> <groupId>org.apache.ant</groupId>
-				<artifactId>ant</artifactId> </exclusion> </exclusions>
-				</dependency> <dependency> <groupId>org.apache.ant</groupId>
-				<artifactId>ant-apache-oro</artifactId>
-				<version>${version.ant}</version> <exclusions> <exclusion>
-				<groupId>oro</groupId> <artifactId>oro</artifactId> </exclusion>
-				<exclusion> <groupId>org.apache.ant</groupId>
-				<artifactId>ant</artifactId> </exclusion> </exclusions>
-				</dependency> <dependency> <groupId>org.apache.ant</groupId>
-				<artifactId>ant-apache-bsf</artifactId>
-				<version>${version.ant}</version> <exclusions> <exclusion>
-				<groupId>bsf</groupId> <artifactId>bsf</artifactId> </exclusion>
-				<exclusion> <groupId>org.apache.ant</groupId>
-				<artifactId>ant</artifactId> </exclusion> </exclusions>
-				</dependency>
-			-->
 
 			<!-- Required by specific Ant tasks -->
 			<dependency>
@@ -418,6 +404,7 @@
 				<version>1.8.0.9</version>
 			</dependency>
 
+			<!-- XML -->
 			<dependency>
 				<groupId>org.codehaus.castor</groupId>
 				<artifactId>com.springsource.org.castor</artifactId>
@@ -429,12 +416,6 @@
 					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>
@@ -463,7 +444,7 @@
 			<dependency>
 				<groupId>javax.el</groupId>
 				<artifactId>com.springsource.javax.el</artifactId>
-				<version>1.0.0</version> 
+				<version>1.0.0</version>
 			</dependency>
 			<dependency>
 				<groupId>javax.servlet</groupId>
@@ -520,25 +501,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 -->