X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc%2Fpom.xml;h=789f83875d1c866d28c37cee634a78f828294923;hb=60830a382bfb436ce92ec1b72421a923c517f1e7;hp=cc01e71412448dc24e57d76f6be681b1237041b3;hpb=bf1ae7156047421a89606997210d79f280fcbb33;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml
index cc01e7141..789f83875 100644
--- a/org.argeo.slc/pom.xml
+++ b/org.argeo.slc/pom.xml
@@ -1,28 +1,24 @@
-<?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>
 	<groupId>org.argeo.slc</groupId>
 	<artifactId>argeo-slc</artifactId>
 	<packaging>pom</packaging>
 	<name>Argeo SLC</name>
-	<version>0.9-SNAPSHOT</version>
+	<version>0.10.0</version>
 	<description>SLC Distribution</description>
 	<url>
 		http://www.argeo.org/projects/slc/${project.artfactId}/${project.version}
 	</url>
 	<properties>
-		<version.spring>2.5.4</version.spring>
+		<version.spring>2.5.5</version.spring>
 		<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>
-			scm:svn:https://www.argeo.org/svn/slc/trunk/org.argeo.slc
-		</connection>
-		<url>https://www.argeo.org/svn/slc/trunk/org.argeo.slc</url>
+		<connection>scm:svn:https://www.argeo.org/svn/slc/tags/argeo-slc-all-0.10.0/org.argeo.slc</connection>
+		<url>https://www.argeo.org/svn/slc/tags/argeo-slc-all-0.10.0/org.argeo.slc</url>
 	</scm>
 	<issueManagement>
 		<system>Bugzilla</system>
@@ -94,19 +90,41 @@
 				<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>
 						<stopPort>9091</stopPort>
 						<connectors>
-							<connector
-								implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+							<connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
 								<port>9090</port>
 								<maxIdleTime>60000</maxIdleTime>
 							</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>
@@ -157,7 +175,7 @@
 			<dependency>
 				<groupId>org.dbunit</groupId>
 				<artifactId>dbunit</artifactId>
-				<version>2.2</version>
+				<version>2.2.3</version>
 				<exclusions>
 					<exclusion>
 						<groupId>junit-addons</groupId>
@@ -172,7 +190,25 @@
 			<dependency>
 				<groupId>log4j</groupId>
 				<artifactId>log4j</artifactId>
-				<version>1.2.14</version>
+				<version>1.2.15</version>
+				<exclusions>
+					<exclusion>
+						<groupId>com.sun.jmx</groupId>
+						<artifactId>jmxri</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>com.sun.jdmk</groupId>
+						<artifactId>jmxtools</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>javax.mail</groupId>
+						<artifactId>mail</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>javax.jms</groupId>
+						<artifactId>jms</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 			<dependency>
 				<groupId>commons-logging</groupId>
@@ -184,12 +220,22 @@
 				<artifactId>hibernate</artifactId>
 				<version>3.2.6.ga</version>
 			</dependency>
+			<dependency>
+				<groupId>net.sf.ehcache</groupId>
+				<artifactId>ehcache</artifactId>
+				<version>1.4.1</version>
+			</dependency>
 
 			<dependency>
 				<groupId>org.springframework</groupId>
 				<artifactId>spring-context</artifactId>
 				<version>${version.spring}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>spring-context-support</artifactId>
+				<version>${version.spring}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.springframework</groupId>
 				<artifactId>spring-orm</artifactId>
@@ -234,9 +280,9 @@
 			</dependency>
 
 			<dependency>
-				<groupId>org.apache.commons</groupId>
+				<groupId>commons-io</groupId>
 				<artifactId>commons-io</artifactId>
-				<version>1.3.2</version>
+				<version>1.4</version>
 			</dependency>
 			<dependency>
 				<groupId>commons-cli</groupId>
@@ -244,6 +290,7 @@
 				<version>1.1</version>
 			</dependency>
 
+			<!-- DB Drivers -->
 			<dependency>
 				<groupId>hsqldb</groupId>
 				<artifactId>hsqldb</artifactId>
@@ -313,11 +360,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>
@@ -341,6 +383,19 @@
 				<artifactId>aspectjweaver</artifactId>
 				<version>1.6.0</version>
 			</dependency>
+
+			<dependency>
+				<groupId>net.sourceforge.jexcelapi</groupId>
+				<artifactId>jxl</artifactId>
+				<version>2.6.8</version>
+			</dependency>
+			<dependency>
+				<groupId>com.lowagie</groupId>
+				<artifactId>itext</artifactId>
+				<version>2.1.2</version>
+			</dependency>
+
+
 		</dependencies>
 	</dependencyManagement>
 	<repositories>