X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc%2Fpom.xml;h=5d93a387f7166c4e26f7a551329b6cd91c9d37a1;hb=3ac6b9361cb1761ed67360988931e6103ef3ba9d;hp=02f4aa600ee3f1831e29f412a35b85ed834a680f;hpb=e70ce6aa5fe950f0dba31cf78ff6a85a7e7f91ab;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml
index 02f4aa600..5d93a387f 100644
--- a/org.argeo.slc/pom.xml
+++ b/org.argeo.slc/pom.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <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">
@@ -7,16 +6,17 @@
 	<artifactId>argeo-slc</artifactId>
 	<packaging>pom</packaging>
 	<name>Argeo SLC</name>
-	<version>0.9.3-SNAPSHOT</version>
+	<version>0.11.1-SNAPSHOT</version>
 	<description>SLC Distribution</description>
 	<url>
 		http://www.argeo.org/projects/slc/${project.artfactId}/${project.version}
 	</url>
 	<properties>
 		<version.spring>2.5.5</version.spring>
-		<version.spring-ws>1.5.2</version.spring-ws>
+		<version.spring-ws>1.5.4</version.spring-ws>
 		<version.maven>2.0.9</version.maven>
-		<version.ant>1.7.0</version.ant>
+		<version.ant>1.7.1</version.ant>
+		<version.jetty>6.1.11</version.jetty>
 	</properties>
 	<scm>
 		<connection>
@@ -61,8 +61,8 @@
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-compiler-plugin</artifactId>
 					<configuration>
-						<source>1.6</source>
-						<target>1.6</target>
+						<source>1.5</source>
+						<target>1.5</target>
 					</configuration>
 				</plugin>
 				<plugin>
@@ -94,7 +94,7 @@
 				<plugin>
 					<groupId>org.mortbay.jetty</groupId>
 					<artifactId>maven-jetty-plugin</artifactId>
-					<version>6.1.10</version>
+					<version>${version.jetty}</version>
 					<configuration>
 						<contextPath>org.argeo.slc.webapp</contextPath>
 						<stopKey>stopKey</stopKey>
@@ -107,6 +107,29 @@
 							</connector>
 						</connectors>
 					</configuration>
+					<dependencies>
+						<dependency>
+							<groupId>hsqldb</groupId>
+							<artifactId>hsqldb</artifactId>
+							<version>1.8.0.9</version>
+						</dependency>
+						<dependency>
+							<groupId>org.mortbay.jetty</groupId>
+							<artifactId>jetty-plus</artifactId>
+							<version>${version.jetty}</version>
+						</dependency>
+						<dependency>
+							<groupId>org.mortbay.jetty</groupId>
+							<artifactId>jetty-naming</artifactId>
+							<version>${version.jetty}</version>
+						</dependency>
+						<dependency>
+							<groupId>log4j</groupId>
+							<artifactId>log4j</artifactId>
+							<version>1.2.14</version>
+							<type>jar</type>
+						</dependency>
+					</dependencies>
 				</plugin>
 			</plugins>
 		</pluginManagement>
@@ -250,6 +273,7 @@
 				<version>${version.spring-ws}</version>
 			</dependency>
 
+			<!-- Ant -->
 			<dependency>
 				<groupId>org.apache.ant</groupId>
 				<artifactId>ant</artifactId>
@@ -260,6 +284,32 @@
 				<artifactId>ant-commons-logging</artifactId>
 				<version>${version.ant}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.apache.ant</groupId>
+				<artifactId>ant-commons-net</artifactId>
+				<version>${version.ant}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.ant</groupId>
+				<artifactId>ant-apache-oro</artifactId>
+				<version>${version.ant}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.ant</groupId>
+				<artifactId>ant-apache-bsf</artifactId>
+				<version>${version.ant}</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>
+			</dependency>
 
 			<dependency>
 				<groupId>commons-io</groupId>
@@ -272,6 +322,7 @@
 				<version>1.1</version>
 			</dependency>
 
+			<!-- DB Drivers -->
 			<dependency>
 				<groupId>hsqldb</groupId>
 				<artifactId>hsqldb</artifactId>
@@ -341,11 +392,6 @@
 				<artifactId>servlet-api</artifactId>
 				<version>2.5</version>
 			</dependency>
-			<dependency>
-				<groupId>c3p0</groupId>
-				<artifactId>c3p0</artifactId>
-				<version>0.9.1.2</version>
-			</dependency>
 
 			<dependency>
 				<groupId>org.apache.maven</groupId>
@@ -369,19 +415,47 @@
 				<artifactId>aspectjweaver</artifactId>
 				<version>1.6.0</version>
 			</dependency>
-			
+
 			<dependency>
 				<groupId>net.sourceforge.jexcelapi</groupId>
 				<artifactId>jxl</artifactId>
-				<version>2.6.3</version>
+				<version>2.6.8</version>
 			</dependency>
 			<dependency>
 				<groupId>com.lowagie</groupId>
 				<artifactId>itext</artifactId>
 				<version>2.1.2</version>
 			</dependency>
-			
-			
+
+			<!-- OSGi -->
+			<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>
+
+			<dependency>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>org.osgi.core</artifactId>
+				<version>1.2.0</version>
+				<scope>provided</scope>
+			</dependency>
+
+			<!-- Auto UI -->
+			<dependency>
+				<groupId>org.argeo.dep.jemmy</groupId>
+				<artifactId>org.argeo.dep.jemmy.nb61</artifactId>
+				<version>0.2.2</version>
+			</dependency>
+
 		</dependencies>
 	</dependencyManagement>
 	<repositories>