X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.server%2Fpom.xml;h=d616d5e619db4993d63194cbd85573dee2e10681;hb=22853740b02ae132eec41a01229b29e9b295796a;hp=9133b46dc1fac296bd2ad5a198e4184a1b607363;hpb=270c1e7fdf6835a14bfc4c89f4ca129014c18fe9;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.server/pom.xml b/org.argeo.slc.server/pom.xml
index 9133b46dc..d616d5e61 100644
--- a/org.argeo.slc.server/pom.xml
+++ b/org.argeo.slc.server/pom.xml
@@ -1,93 +1,99 @@
-<?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">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.argeo.slc</groupId>
-		<artifactId>argeo-slc</artifactId>
-		<version>0.9-SNAPSHOT</version>
-		<relativePath>../org.argeo.slc</relativePath>
-	</parent>
-	<artifactId>argeo-slc-server</artifactId>
-	<name>Argeo SLC Server</name>
-	<description>SLC Server</description>
-	<build>
-		<plugins>
-			<!-- Look to parent pom for inheritances -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.mortbay.jetty</groupId>
-				<artifactId>maven-jetty-plugin</artifactId>
-				<version>6.1.9</version>
-				<configuration>
-					<scanIntervalSeconds>10</scanIntervalSeconds>
-					<contextPath>org.argeo.slc.webapp</contextPath>
-					<useTestClasspath>true</useTestClasspath>
-					<webAppSourceDirectory>
-						../org.argeo.slc.webapp/src/main/webapp
-					</webAppSourceDirectory>
-					<stopKey>stopKey</stopKey>
-					<stopPort>8081</stopPort>
-					<scanTargetPatterns>
-						<scanTargetPattern>
-							<directory>
-								../org.argeo.slc.webapp/src/main/webapp
-							</directory>
-							<includes>
-								<include>**/*.xml</include>
-								<include>**/*.properties</include>
-							</includes>
-						</scanTargetPattern>
-					</scanTargetPatterns>
-				</configuration>
-			</plugin>
-
-		</plugins>
-	</build>
-	<dependencies>
+<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.11.0</version>
+		<relativePath>../org.argeo.slc</relativePath>
+	</parent>
+	<artifactId>argeo-slc-server</artifactId>
+	<name>Argeo SLC Server</name>
+	<description>SLC Server</description>
+	<build>
+		<plugins>
+			<!-- Look to parent pom for inheritances -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.mortbay.jetty</groupId>
+				<artifactId>maven-jetty-plugin</artifactId>
+				<configuration>
+					<webAppSourceDirectory>
+						../org.argeo.slc.webapp/src/main/webapp
+					</webAppSourceDirectory>
+					<jettyConfig>
+						../org.argeo.slc.webapp/src/main/config/jetty/jetty-test.xml
+					</jettyConfig>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+	<dependencies>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>argeo-slc-core</artifactId>
 			<version>${project.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>xerces</groupId>
+					<artifactId>xercesImpl</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>argeo-slc-hibernate</artifactId>
 			<version>${project.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>xerces</groupId>
+					<artifactId>xercesImpl</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>jstl</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>taglibs</groupId>
+			<artifactId>standard</artifactId>
 		</dependency>
-
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>jstl</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>taglibs</groupId>
-			<artifactId>standard</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.ws</groupId>
 			<artifactId>spring-ws-core</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-webmvc</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>c3p0</groupId>
-			<artifactId>c3p0</artifactId>
-		</dependency>
-	</dependencies>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-webmvc</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-aop</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>servlet-api</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>aspectjweaver</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>net.sourceforge.jexcelapi</groupId>
+			<artifactId>jxl</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.lowagie</groupId>
+			<artifactId>itext</artifactId>
+		</dependency>
+	</dependencies>
 </project>
\ No newline at end of file