X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc%2Fpom.xml;h=aa61d2df8bed16880236ae5b1181a6a1b10fe7a0;hb=22b0b11dabeb70ce5763f9fecc5bcc0d01646109;hp=835123e9c597bb4989f9f18cf8689e25475cf2e5;hpb=5704af2b7537db654ea0deb09c78d38759da9eeb;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml
index 835123e9c..aa61d2df8 100644
--- a/org.argeo.slc/pom.xml
+++ b/org.argeo.slc/pom.xml
@@ -1,32 +1,23 @@
-<?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.11.1-SNAPSHOT</version>
 	<description>SLC Distribution</description>
 	<url>
 		http://www.argeo.org/projects/slc/${project.artfactId}/${project.version}
 	</url>
-	<!-- 
-		<modules>
-		<module>../org.argeo.slc.core</module>
-		<module>../org.argeo.slc.example</module>
-		</modules>
-	-->
 	<properties>
-		<version.spring>2.5.3</version.spring>
+		<version.spring>2.5.5</version.spring>
+		<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>
-			scm:svn:https://www.argeo.org/svn/slc/trunk/org.argeo.slc
-		</connection>
+		<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>
 	</scm>
 	<issueManagement>
@@ -66,8 +57,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>
@@ -96,6 +87,45 @@
 						</execution>
 					</executions>
 				</plugin>
+				<plugin>
+					<groupId>org.mortbay.jetty</groupId>
+					<artifactId>maven-jetty-plugin</artifactId>
+					<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">
+								<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>
 		<plugins>
@@ -136,10 +166,16 @@
 				<artifactId>jta</artifactId>
 				<version>1.0.1</version>
 			</dependency>
+
+			<dependency>
+				<groupId>junit</groupId>
+				<artifactId>junit</artifactId>
+				<version>3.8.2</version>
+			</dependency>
 			<dependency>
 				<groupId>org.dbunit</groupId>
 				<artifactId>dbunit</artifactId>
-				<version>2.2</version>
+				<version>2.2.3</version>
 				<exclusions>
 					<exclusion>
 						<groupId>junit-addons</groupId>
@@ -154,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>
@@ -164,7 +218,12 @@
 			<dependency>
 				<groupId>org.hibernate</groupId>
 				<artifactId>hibernate</artifactId>
-				<version>3.2.5.ga</version>
+				<version>3.2.6.ga</version>
+			</dependency>
+			<dependency>
+				<groupId>net.sf.ehcache</groupId>
+				<artifactId>ehcache</artifactId>
+				<version>1.4.1</version>
 			</dependency>
 
 			<dependency>
@@ -172,6 +231,11 @@
 				<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>
@@ -187,17 +251,24 @@
 				<artifactId>spring-webmvc</artifactId>
 				<version>${version.spring}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>spring-aop</artifactId>
+				<version>${version.spring}</version>
+			</dependency>
+
 			<dependency>
 				<groupId>org.springframework.ws</groupId>
 				<artifactId>spring-ws-core</artifactId>
-				<version>1.5.0</version>
+				<version>${version.spring-ws}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.ws</groupId>
 				<artifactId>spring-oxm</artifactId>
-				<version>1.5.0</version>
+				<version>${version.spring-ws}</version>
 			</dependency>
 
+			<!-- Ant -->
 			<dependency>
 				<groupId>org.apache.ant</groupId>
 				<artifactId>ant</artifactId>
@@ -208,22 +279,45 @@
 				<artifactId>ant-commons-logging</artifactId>
 				<version>${version.ant}</version>
 			</dependency>
-
 			<dependency>
-				<groupId>org.apache.commons</groupId>
-				<artifactId>commons-io</artifactId>
-				<version>1.3.2</version>
+				<groupId>org.apache.ant</groupId>
+				<artifactId>ant-commons-net</artifactId>
+				<version>${version.ant}</version>
 			</dependency>
 			<dependency>
-				<groupId>org.dbunit</groupId>
-				<artifactId>dbunit</artifactId>
-				<version>2.2</version>
+				<groupId>org.apache.ant</groupId>
+				<artifactId>ant-apache-oro</artifactId>
+				<version>${version.ant}</version>
 			</dependency>
 			<dependency>
-				<groupId>junit</groupId>
-				<artifactId>junit</artifactId>
-				<version>3.8.2</version>
+				<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>
+				<artifactId>commons-io</artifactId>
+				<version>1.4</version>
+			</dependency>
+			<dependency>
+				<groupId>commons-cli</groupId>
+				<artifactId>commons-cli</artifactId>
+				<version>1.1</version>
+			</dependency>
+
+			<!-- DB Drivers -->
 			<dependency>
 				<groupId>hsqldb</groupId>
 				<artifactId>hsqldb</artifactId>
@@ -233,7 +327,7 @@
 			<dependency>
 				<groupId>org.codehaus.castor</groupId>
 				<artifactId>castor</artifactId>
-				<version>1.1.2.1</version>
+				<version>1.2</version>
 				<exclusions>
 					<exclusion>
 						<groupId>xerces</groupId>
@@ -293,11 +387,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>
@@ -316,6 +405,37 @@
 				<version>${version.maven}</version>
 			</dependency>
 
+			<dependency>
+				<groupId>org.aspectj</groupId>
+				<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>
+
+			<!-- OSGi -->
+			<dependency>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>org.apache.felix.main</artifactId>
+				<version>1.2.1</version>
+			</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>
@@ -327,6 +447,11 @@
 				<updatePolicy>daily</updatePolicy>
 				<checksumPolicy>warn</checksumPolicy>
 			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+				<updatePolicy>never</updatePolicy>
+				<checksumPolicy>fail</checksumPolicy>
+			</snapshots>
 		</repository>
 		<repository>
 			<id>argeo</id>