X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc%2Fpom.xml;h=ac3a081f957753dca9e78c29147174aa4272863d;hb=92504fe5f1c0193852d3fef1b499714e692d6f76;hp=18f445486f4e9f6663da904f788e8f1002cb66ac;hpb=2c09137f6bad6d703a51240c6830b20b437f8ed8;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml
index 18f445486..ac3a081f9 100644
--- a/org.argeo.slc/pom.xml
+++ b/org.argeo.slc/pom.xml
@@ -12,14 +12,11 @@
 	<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.4</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>
 	</properties>
 	<scm>
 		<connection>
@@ -64,8 +61,8 @@
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-compiler-plugin</artifactId>
 					<configuration>
-						<source>1.5</source>
-						<target>1.5</target>
+						<source>1.6</source>
+						<target>1.6</target>
 					</configuration>
 				</plugin>
 				<plugin>
@@ -94,6 +91,23 @@
 						</execution>
 					</executions>
 				</plugin>
+				<plugin>
+					<groupId>org.mortbay.jetty</groupId>
+					<artifactId>maven-jetty-plugin</artifactId>
+					<version>6.1.10</version>
+					<configuration>
+						<contextPath>org.argeo.slc.webapp</contextPath>
+						<stopKey>stopKey</stopKey>
+						<stopPort>8081</stopPort>
+						<connectors>
+							<connector
+								implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+								<port>9090</port>
+								<maxIdleTime>60000</maxIdleTime>
+							</connector>
+						</connectors>
+					</configuration>
+				</plugin>
 			</plugins>
 		</pluginManagement>
 		<plugins>
@@ -134,6 +148,12 @@
 				<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>
@@ -162,7 +182,7 @@
 			<dependency>
 				<groupId>org.hibernate</groupId>
 				<artifactId>hibernate</artifactId>
-				<version>3.2.5.ga</version>
+				<version>3.2.6.ga</version>
 			</dependency>
 
 			<dependency>
@@ -185,31 +205,32 @@
 				<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>
 
 			<dependency>
 				<groupId>org.apache.ant</groupId>
 				<artifactId>ant</artifactId>
-				<version>1.7.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.ant</groupId>
-				<artifactId>ant-util</artifactId>
-				<version>1.7.0</version>
+				<version>${version.ant}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.ant</groupId>
 				<artifactId>ant-commons-logging</artifactId>
-				<version>1.7.0</version>
+				<version>${version.ant}</version>
 			</dependency>
 
 			<dependency>
@@ -218,15 +239,11 @@
 				<version>1.3.2</version>
 			</dependency>
 			<dependency>
-				<groupId>org.dbunit</groupId>
-				<artifactId>dbunit</artifactId>
-				<version>2.2</version>
-			</dependency>
-			<dependency>
-				<groupId>junit</groupId>
-				<artifactId>junit</artifactId>
-				<version>3.8.2</version>
+				<groupId>commons-cli</groupId>
+				<artifactId>commons-cli</artifactId>
+				<version>1.1</version>
 			</dependency>
+
 			<dependency>
 				<groupId>hsqldb</groupId>
 				<artifactId>hsqldb</artifactId>
@@ -236,7 +253,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>
@@ -301,6 +318,29 @@
 				<artifactId>c3p0</artifactId>
 				<version>0.9.1.2</version>
 			</dependency>
+
+			<dependency>
+				<groupId>org.apache.maven</groupId>
+				<artifactId>maven-core</artifactId>
+				<version>${version.maven}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.maven</groupId>
+				<artifactId>maven-embedder</artifactId>
+				<!-- no higher version available -->
+				<version>2.0.4</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.maven</groupId>
+				<artifactId>maven-settings</artifactId>
+				<version>${version.maven}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>org.aspectj</groupId>
+				<artifactId>aspectjweaver</artifactId>
+				<version>1.6.0</version>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 	<repositories>
@@ -312,6 +352,11 @@
 				<updatePolicy>daily</updatePolicy>
 				<checksumPolicy>warn</checksumPolicy>
 			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+				<updatePolicy>never</updatePolicy>
+				<checksumPolicy>fail</checksumPolicy>
+			</snapshots>
 		</repository>
 		<repository>
 			<id>argeo</id>