X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.slc%2Fpom.xml;h=d48735377ee404f89cc57a6d9127541ba5c7a3ce;hb=b2d392b89a6caafb75e8d1fc8ac7925c8e062262;hp=334483877857709472c2748107a352397dd4608a;hpb=f198cdf84f9c6b5312825672450f92bc8451ede3;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml
index 334483877..d48735377 100644
--- a/org.argeo.slc/pom.xml
+++ b/org.argeo.slc/pom.xml
@@ -1,29 +1,25 @@
-<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.11.2-SNAPSHOT</version>
+	<version>0.11.3-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.0</version.ant>
-		<version.jetty>6.1.11</version.jetty>
+		<version.jetty>6.1.14</version.jetty>
+		<version.maven-bundle-plugin>1.4.3</version.maven-bundle-plugin>
 	</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/trunk/org.argeo.slc</connection>
+		<url>https://www.argeo.org/svn/slc/trunk/org.argeo.slc</url>
 	</scm>
 	<issueManagement>
 		<system>Bugzilla</system>
@@ -34,7 +30,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 +147,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>
@@ -269,6 +286,11 @@
 				<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>
@@ -395,6 +417,7 @@
 				<version>1.8.0.9</version>
 			</dependency>
 
+			<!-- XML -->
 			<dependency>
 				<groupId>org.codehaus.castor</groupId>
 				<artifactId>com.springsource.org.castor</artifactId>
@@ -491,28 +514,16 @@
 			</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>
-
-			<dependency>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>org.osgi.core</artifactId>
-				<version>1.2.0</version>
-				<scope>provided</scope>
-			</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.eclipse.osgi</groupId>
 				<artifactId>org.eclipse.osgi</artifactId>
@@ -538,6 +549,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>
@@ -647,6 +659,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>