X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.server%2Fpom.xml;h=300cadac0b34fe3673c0b78f8f17d8ee71e3e0cb;hb=5139f6f6b1380da613bb2a309ed30eaa61e09e66;hp=4e46996aca67cbf4f8fa199ed0a2a477df30a360;hpb=00d3470e42c5701482d6b6e9faf45d775295f76d;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.server/pom.xml b/org.argeo.slc.server/pom.xml
index 4e46996ac..300cadac0 100644
--- a/org.argeo.slc.server/pom.xml
+++ b/org.argeo.slc.server/pom.xml
@@ -1,12 +1,9 @@
-<?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">
+<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.slc</groupId>
 		<artifactId>argeo-slc</artifactId>
-		<version>0.9.3-SNAPSHOT</version>
+		<version>0.11.1-SNAPSHOT</version>
 		<relativePath>../org.argeo.slc</relativePath>
 	</parent>
 	<artifactId>argeo-slc-server</artifactId>
@@ -30,13 +27,9 @@
 					<webAppSourceDirectory>
 						../org.argeo.slc.webapp/src/main/webapp
 					</webAppSourceDirectory>
-					<systemProperties>
-						<systemProperty>
-							<!-- some library (JExcelAPi) include log4j config in their jar -->
-							<name>log4j.defaultInitOverride</name>
-							<value>true</value>
-						</systemProperty>
-					</systemProperties>
+					<jettyConfig>
+						../org.argeo.slc.webapp/src/main/config/jetty/jetty-test.xml
+					</jettyConfig>
 				</configuration>
 			</plugin>
 		</plugins>
@@ -90,10 +83,6 @@
 			<artifactId>servlet-api</artifactId>
 			<scope>provided</scope>
 		</dependency>
-		<dependency>
-			<groupId>c3p0</groupId>
-			<artifactId>c3p0</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.aspectj</groupId>
 			<artifactId>aspectjweaver</artifactId>
@@ -101,12 +90,10 @@
 		<dependency>
 			<groupId>net.sourceforge.jexcelapi</groupId>
 			<artifactId>jxl</artifactId>
-			<version>2.6.3</version>
 		</dependency>
 		<dependency>
 			<groupId>com.lowagie</groupId>
 			<artifactId>itext</artifactId>
-			<version>2.1.2</version>
 		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file