X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.slc%2Fpom.xml;h=530a1f51bd99e4989ee95d13b63091003a291623;hb=a3191216525d94baf9c5f1fa437e89f659683607;hp=9e831f351561140763a1387bc6e43649c4124b97;hpb=4af418ad1d16e736d7e205567d994eb73c8f7e83;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml
index 9e831f351..530a1f51b 100644
--- a/org.argeo.slc/pom.xml
+++ b/org.argeo.slc/pom.xml
@@ -8,14 +8,15 @@
 	<version>0.11.2-SNAPSHOT</version>
 	<description>SLC Distribution</description>
 	<url>
-		http://www.argeo.org/projects/slc/${project.artfactId}/${project.version}
+		http://www.argeo.org/projects/slc/${project.artifactId}/${project.version}
 	</url>
 	<properties>
 		<version.spring>2.5.6.A</version.spring>
 		<version.spring-ws>1.5.5.A</version.spring-ws>
 		<version.maven>2.0.9</version.maven>
-		<version.ant>1.7.1</version.ant>
-		<version.jetty>6.1.11</version.jetty>
+		<version.ant>1.7.0</version.ant>
+		<version.jetty>6.1.14</version.jetty>
+		<version.maven-bundle-plugin>1.4.3</version.maven-bundle-plugin>
 	</properties>
 	<scm>
 		<connection>
@@ -34,7 +35,24 @@
 			<name>Apache 2</name>
 			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
 			<distribution>repo</distribution>
-			<comments>A business-friendly OSS license</comments>
+			<comments><![CDATA[
+SLC - Software LifeCycle framework
+			   
+Copyright 2008 Mathieu Baudier - Argeo e.U.
+
+Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an &quot;AS IS&quot; BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+]]>
+		</comments>
 		</license>
 	</licenses>
 	<organization>
@@ -134,17 +152,21 @@
 							<version>${version.jetty}</version>
 						</dependency>
 						<dependency>
-							<groupId>log4j</groupId>
-							<artifactId>log4j</artifactId>
-							<version>1.2.14</version>
-							<type>jar</type>
+							<groupId>org.apache.log4j</groupId>
+							<artifactId>com.springsource.org.apache.log4j</artifactId>
+							<version>1.2.15</version>
+						</dependency>
+						<dependency>
+							<groupId>javax.xml.soap</groupId>
+							<artifactId>com.springsource.javax.xml.soap</artifactId>
+							<version>1.3.0</version>
 						</dependency>
 					</dependencies>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.felix</groupId>
 					<artifactId>maven-bundle-plugin</artifactId>
-					<version>1.4.3</version>
+					<version>${version.maven-bundle-plugin}</version>
 					<extensions>true</extensions>
 					<configuration>
 						<manifestLocation>src/main/resources/META-INF</manifestLocation>
@@ -248,23 +270,8 @@
 				<artifactId>com.springsource.org.dbunit</artifactId>
 				<version>2.2.0</version>
 			</dependency>
-			<!--
-				<dependency> <groupId>org.dbunit</groupId>
-				<artifactId>dbunit</artifactId> <version>2.2.3</version>
-				<exclusions> <exclusion> <groupId>junit-addons</groupId>
-				<artifactId>junit-addons</artifactId> </exclusion> <exclusion>
-				<groupId>poi</groupId> <artifactId>poi</artifactId> </exclusion>
-				</exclusions> </dependency> <dependency> <groupId>log4j</groupId>
-				<artifactId>log4j</artifactId> <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>
-			-->
 
+			<!-- Logging -->
 			<dependency>
 				<groupId>org.apache.log4j</groupId>
 				<artifactId>
@@ -284,12 +291,27 @@
 				<artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
 				<version>1.5.3</version>
 			</dependency>
+			<dependency>
+				<groupId>org.slf4j</groupId>
+				<artifactId>com.springsource.slf4j.jcl</artifactId>
+				<version>1.5.3</version>
+			</dependency>
+			<dependency>
+				<groupId>org.slf4j</groupId>
+				<artifactId>com.springsource.slf4j.org.apache.log4j</artifactId>
+				<version>1.5.3</version>
+			</dependency>
 			<!-- Spring -->
 			<dependency>
 				<groupId>org.springframework</groupId>
 				<artifactId>org.springframework.core</artifactId>
 				<version>${version.spring}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>org.springframework.beans</artifactId>
+				<version>${version.spring}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.springframework</groupId>
 				<artifactId>org.springframework.context</artifactId>
@@ -312,6 +334,11 @@
 				<artifactId>org.springframework.jdbc</artifactId>
 				<version>${version.spring}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>org.springframework.web</artifactId>
+				<version>${version.spring}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.springframework</groupId>
 				<artifactId>org.springframework.web.servlet</artifactId>
@@ -334,53 +361,42 @@
 				<version>${version.spring-ws}</version>
 			</dependency>
 
-			<!-- Ant -->
 			<dependency>
-				<groupId>org.apache.ant</groupId>
-				<artifactId>
-					com.springsource.org.apache.tools.ant
-				</artifactId>
-				<version>1.7.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.ant</groupId>
-				<artifactId>
-					ant
-				</artifactId>
-				<version>${version.ant}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.ant</groupId>
-				<artifactId>ant-commons-logging</artifactId>
-				<version>${version.ant}</version>
+				<groupId>org.springframework.osgi</groupId>
+				<artifactId>org.springframework.osgi.extender</artifactId>
+				<version>1.1.2.B</version>
 			</dependency>
+
+			<!-- Ant -->
 			<dependency>
-				<groupId>org.apache.ant</groupId>
-				<artifactId>ant-commons-net</artifactId>
-				<version>${version.ant}</version>
+				<groupId>org.argeo.dep.osgi</groupId>
+				<artifactId>org.argeo.dep.osgi.ant</artifactId>
+				<version>1.7.1</version>
 			</dependency>
+
+			<!-- Required by specific Ant tasks -->
 			<dependency>
-				<groupId>org.apache.ant</groupId>
-				<artifactId>ant-apache-oro</artifactId>
-				<version>${version.ant}</version>
+				<groupId>org.apache.commons</groupId>
+				<artifactId>com.springsource.org.apache.commons.net</artifactId>
+				<version>1.4.1</version>
 			</dependency>
 			<dependency>
-				<groupId>org.apache.ant</groupId>
-				<artifactId>ant-apache-bsf</artifactId>
-				<version>${version.ant}</version>
+				<groupId>org.apache.oro</groupId>
+				<artifactId>com.springsource.org.apache.oro</artifactId>
+				<version>2.0.8</version>
 			</dependency>
-			<!-- Required by FTP Ant task -->
 			<dependency>
-				<groupId>commons-net</groupId>
-				<artifactId>commons-net</artifactId>
-				<version>1.4.1</version>
+				<groupId>org.apache.bsf</groupId>
+				<artifactId>com.springsource.org.apache.bsf</artifactId>
+				<version>2.4.0</version>
 			</dependency>
 			<dependency>
-				<groupId>oro</groupId>
-				<artifactId>oro</artifactId>
-				<version>2.0.8</version>
+				<groupId>org.beanshell</groupId>
+				<artifactId>com.springsource.bsh</artifactId>
+				<version>2.0.0.b4</version>
 			</dependency>
 
+			<!-- Apache Commons -->
 			<dependency>
 				<groupId>org.apache.commons</groupId>
 				<artifactId>
@@ -389,8 +405,13 @@
 				<version>1.4.0</version>
 			</dependency>
 			<dependency>
-				<groupId>commons-cli</groupId>
-				<artifactId>commons-cli</artifactId>
+				<groupId>org.apache.commons</groupId>
+				<artifactId>com.springsource.org.apache.commons.collections</artifactId>
+				<version>3.2.0</version>
+			</dependency>
+			<dependency>
+				<groupId>org.argeo.dep.osgi</groupId>
+				<artifactId>org.argeo.dep.osgi.commons.cli</artifactId>
 				<version>1.1</version>
 			</dependency>
 
@@ -401,35 +422,18 @@
 				<version>1.8.0.9</version>
 			</dependency>
 
+			<!-- XML -->
 			<dependency>
 				<groupId>org.codehaus.castor</groupId>
 				<artifactId>com.springsource.org.castor</artifactId>
 				<version>1.2.0</version>
 			</dependency>
-			<!--
-				<dependency> <groupId>org.argeo.dep.osgi</groupId>
-				<artifactId>org.argeo.dep.osgi.castor</artifactId>
-				<version>1.2</version> </dependency>
-			-->
-			<!--
-				<dependency> <groupId>org.codehaus.castor</groupId>
-				<artifactId>castor</artifactId> <version>1.2</version> <exclusions>
-				<exclusion> <groupId>xerces</groupId>
-				<artifactId>xerces</artifactId> </exclusion> </exclusions>
-				</dependency>
-			-->
 			<dependency>
 				<groupId>org.apache.xerces</groupId>
 				<artifactId>
 					com.springsource.org.apache.xerces
 				</artifactId>
 				<version>2.8.1</version>
-				<exclusions>
-					<exclusion>
-						<groupId>org.apache.xmlcommons</groupId>
-						<artifactId>com.springsource.org.apache.xmlcommons</artifactId>
-					</exclusion>
-				</exclusions>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.xalan</groupId>
@@ -438,8 +442,28 @@
 				</artifactId>
 				<version>2.7.0</version>
 			</dependency>
+			<dependency>
+				<groupId>org.apache.xmlcommons</groupId>
+				<artifactId>com.springsource.org.apache.xmlcommons</artifactId>
+				<version>1.3.3</version>
+			</dependency>
 
 			<!-- Web -->
+			<dependency>
+				<groupId>javax.servlet</groupId>
+				<artifactId>com.springsource.javax.servlet</artifactId>
+				<version>2.5.0</version>
+			</dependency>
+			<dependency>
+				<groupId>javax.servlet</groupId>
+				<artifactId>com.springsource.javax.servlet.jsp</artifactId>
+				<version>2.1.0</version>
+			</dependency>
+			<dependency>
+				<groupId>javax.el</groupId>
+				<artifactId>com.springsource.javax.el</artifactId>
+				<version>1.0.0</version>
+			</dependency>
 			<dependency>
 				<groupId>javax.servlet</groupId>
 				<artifactId>
@@ -455,9 +479,9 @@
 				<version>1.1.2</version>
 			</dependency>
 			<dependency>
-				<groupId>javax.servlet</groupId>
-				<artifactId>com.springsource.javax.servlet</artifactId>
-				<version>2.5.0</version>
+				<groupId>javax.activation</groupId>
+				<artifactId>com.springsource.javax.activation</artifactId>
+				<version>1.1.1</version>
 			</dependency>
 
 			<dependency>
@@ -495,25 +519,20 @@
 			</dependency>
 
 			<!-- OSGi -->
-			<dependency>
-				<groupId>org.apache.felix</groupId>
+			<!--
+				<dependency> <groupId>org.apache.felix</groupId>
 				<artifactId>org.apache.felix.main</artifactId>
-				<version>1.2.1</version>
-				<exclusions>
-					<exclusion>
-						<groupId>org.apache.felix</groupId>
-						<artifactId>
-							org.apache.felix.framework
-						</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-
+				<version>1.2.1</version> <exclusions> <exclusion>
+				<groupId>org.apache.felix</groupId> <artifactId>
+				org.apache.felix.framework </artifactId> </exclusion> </exclusions>
+				</dependency> <dependency> <groupId>org.apache.felix</groupId>
+				<artifactId>org.osgi.core</artifactId> <version>1.2.0</version>
+				<scope>provided</scope> </dependency>
+			-->
 			<dependency>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>org.osgi.core</artifactId>
-				<version>1.2.0</version>
-				<scope>provided</scope>
+				<groupId>org.eclipse.osgi</groupId>
+				<artifactId>org.eclipse.osgi</artifactId>
+				<version>3.4.2.R34x_v20080826-1230</version>
 			</dependency>
 
 			<!-- Auto UI -->
@@ -535,6 +554,7 @@
 				<groupId>org.hibernate</groupId>
 				<artifactId>com.springsource.org.hibernate</artifactId>
 				<version>3.2.6.ga</version>
+				<!-- <version>3.3.1.GA</version> TODO: fix issues with logging -->
 			</dependency>
 			<dependency>
 				<groupId>net.sourceforge.jexcelapi</groupId>
@@ -644,6 +664,36 @@
 			</snapshots>
 		</repository>
 	</repositories>
+	<pluginRepositories>
+		<pluginRepository>
+			<id>argeo</id>
+			<url>http://www.argeo.org/maven/argeo</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>daily</updatePolicy>
+				<checksumPolicy>fail</checksumPolicy>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+				<updatePolicy>never</updatePolicy>
+				<checksumPolicy>fail</checksumPolicy>
+			</snapshots>
+		</pluginRepository>
+		<pluginRepository>
+			<id>argeo-snapshots</id>
+			<url>http://www.argeo.org/maven/argeo-snapshots</url>
+			<releases>
+				<enabled>false</enabled>
+				<updatePolicy>never</updatePolicy>
+				<checksumPolicy>fail</checksumPolicy>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+				<updatePolicy>always</updatePolicy>
+				<checksumPolicy>fail</checksumPolicy>
+			</snapshots>
+		</pluginRepository>
+	</pluginRepositories>
 	<distributionManagement>
 		<repository>
 			<uniqueVersion>false</uniqueVersion>