X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.slc%2Fpom.xml;h=30b1f4375219ad3d4de5e451204bdb45fc622f96;hb=8edcba425f7a4a6e929810b66d26befabaa9aeb7;hp=34060d27c47adbad6472d1acb3e98fd92f85147c;hpb=1c6d07ba176c3015b0948a1d2e39f272e5058478;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml
index 34060d27c..30b1f4375 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,7 +6,7 @@
 	<artifactId>argeo-slc</artifactId>
 	<packaging>pom</packaging>
 	<name>Argeo SLC</name>
-	<version>0.9.3-SNAPSHOT</version>
+	<version>0.9.4-SNAPSHOT</version>
 	<description>SLC Distribution</description>
 	<url>
 		http://www.argeo.org/projects/slc/${project.artfactId}/${project.version}
@@ -17,6 +16,7 @@
 		<version.spring-ws>1.5.2</version.spring-ws>
 		<version.maven>2.0.9</version.maven>
 		<version.ant>1.7.0</version.ant>
+		<version.jetty>6.1.11</version.jetty>
 	</properties>
 	<scm>
 		<connection>
@@ -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>
@@ -106,14 +106,30 @@
 								<maxIdleTime>60000</maxIdleTime>
 							</connector>
 						</connectors>
-						<systemProperties>
-							<systemProperty>
-								<!-- some library (JExcelAPi) include log4j config in their jar -->
-								<name>log4j.defaultInitOverride</name>
-								<value>true</value>
-							</systemProperty>
-						</systemProperties>
 					</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>
@@ -279,6 +295,7 @@
 				<version>1.1</version>
 			</dependency>
 
+			<!-- DB Drivers -->
 			<dependency>
 				<groupId>hsqldb</groupId>
 				<artifactId>hsqldb</artifactId>
@@ -348,11 +365,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>
@@ -380,7 +392,7 @@
 			<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>