X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc%2Fpom.xml;h=1416cfd53f58e72496cd7d07da9bc6e24038347a;hb=743ecb28b3c0236bc91a5d0993f70477236d96fd;hp=a669559e6328b5723d81c012772a00270776b7b1;hpb=e9a424f699960dfde68b6e2aec5523b49dbec3ab;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml
index a669559e6..1416cfd53 100644
--- a/org.argeo.slc/pom.xml
+++ b/org.argeo.slc/pom.xml
@@ -5,25 +5,23 @@
 	<artifactId>argeo-slc</artifactId>
 	<packaging>pom</packaging>
 	<name>Argeo SLC</name>
-	<version>0.11.2-SNAPSHOT</version>
-	<description>SLC Distribution</description>
+	<version>0.11.3-SNAPSHOT</version>
 	<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.spring-osgi>1.1.3.RELEASE</version.spring-osgi>
 		<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>
+		<version.activemq>5.2.0</version.activemq>
 	</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 +32,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>
@@ -70,7 +85,7 @@
 					<artifactId>maven-jar-plugin</artifactId>
 					<configuration>
 						<archive>
-							<manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
+							<manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile>
 						</archive>
 					</configuration>
 				</plugin>
@@ -134,20 +149,51 @@
 							<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>
+						<dependency>
+							<groupId>javax.mail</groupId>
+							<artifactId>com.springsource.javax.mail</artifactId>
+							<version>1.4.1</version>
+						</dependency>
+
+						<!--
+							Required by ActiveMQ admin <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>
+							<version>${version.spring}</version> </dependency> <dependency>
+							<groupId>org.apache.activemq</groupId>
+							<artifactId>com.springsource.org.apache.activemq.web</artifactId>
+							<version>${version.activemq}</version> </dependency> <dependency>
+							<groupId>javax.jms</groupId>
+							<artifactId>com.springsource.javax.jms</artifactId>
+							<version>1.1.0</version> </dependency> <dependency>
+							<groupId>org.apache.geronimo.specs</groupId>
+							<artifactId>com.springsource.javax.management.j2ee</artifactId>
+							<version>1.0.1</version> </dependency> <dependency>
+							<groupId>com.opensymphony.sitemesh</groupId>
+							<artifactId>com.springsource.com.opensymphony.sitemesh</artifactId>
+							<version>2.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>
+						<manifestLocation>target/classes/META-INF</manifestLocation>
 						<instructions>
 							<Bundle-SymbolicName>
 								${pom.artifactId}
@@ -200,6 +246,79 @@
 	</reporting>
 	<dependencyManagement>
 		<dependencies>
+			<!-- SLC (itself) -->
+			<dependency>
+				<groupId>org.argeo.slc.runtime</groupId>
+				<artifactId>org.argeo.slc.specs</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.argeo.slc.runtime</groupId>
+				<artifactId>org.argeo.slc.launcher</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.argeo.slc.runtime</groupId>
+				<artifactId>org.argeo.slc.detached</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.argeo.slc.runtime</groupId>
+				<artifactId>org.argeo.slc.support.simple</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.argeo.slc.runtime</groupId>
+				<artifactId>org.argeo.slc.support.ant</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.argeo.slc.runtime</groupId>
+				<artifactId>org.argeo.slc.support.hibernate</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.argeo.slc.runtime</groupId>
+				<artifactId>org.argeo.slc.support.castor</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.argeo.slc.runtime</groupId>
+				<artifactId>org.argeo.slc.support.activemq</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.argeo.slc.runtime</groupId>
+				<artifactId>org.argeo.slc.server</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.argeo.slc.runtime</groupId>
+				<artifactId>org.argeo.slc.support.equinox</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.argeo.slc.runtime</groupId>
+				<artifactId>org.argeo.slc.support.ws.client</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.argeo.slc</groupId>
+				<artifactId>org.argeo.slc.webapp</artifactId>
+				<version>${project.version}</version>
+				<type>war</type>
+			</dependency>
+
+			<!-- SLC dubious -->
+			<dependency>
+				<groupId>org.argeo.slc</groupId>
+				<artifactId>org.argeo.slc.detached.launcher</artifactId>
+				<version>${project.version}</version>
+				<type>tar.gz</type>
+				<classifier>dist</classifier>
+			</dependency>
+
+
 			<!-- Javax -->
 			<dependency>
 				<groupId>javax.transaction</groupId>
@@ -234,7 +353,26 @@
 					com.springsource.javax.activation
 				</artifactId>
 				<version>1.1.1</version>
-				<scope>runtime</scope>
+			</dependency>
+			<dependency>
+				<groupId>javax.annotation</groupId>
+				<artifactId>com.springsource.javax.annotation</artifactId>
+				<version>1.0.0</version>
+			</dependency>
+			<dependency>
+				<groupId>javax.persistence</groupId>
+				<artifactId>com.springsource.javax.persistence</artifactId>
+				<version>1.0.0</version>
+			</dependency>
+			<dependency>
+				<groupId>javax.xml.ws</groupId>
+				<artifactId>com.springsource.javax.xml.ws</artifactId>
+				<version>2.1.1</version>
+			</dependency>
+			<dependency>
+				<groupId>javax.xml.bind</groupId>
+				<artifactId>com.springsource.javax.xml.bind</artifactId>
+				<version>2.1.7</version>
 			</dependency>
 
 			<!-- Unit tests -->
@@ -269,11 +407,17 @@
 				<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>
@@ -307,6 +451,11 @@
 				<artifactId>org.springframework.jdbc</artifactId>
 				<version>${version.spring}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>org.springframework.transaction</artifactId>
+				<version>${version.spring}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.springframework</groupId>
 				<artifactId>org.springframework.web</artifactId>
@@ -322,6 +471,11 @@
 				<artifactId>org.springframework.aop</artifactId>
 				<version>${version.spring}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>org.springframework.jms</artifactId>
+				<version>${version.spring}</version>
+			</dependency>
 
 			<dependency>
 				<groupId>org.springframework.ws</groupId>
@@ -334,45 +488,60 @@
 				<version>${version.spring-ws}</version>
 			</dependency>
 
+			<dependency>
+				<groupId>org.springframework.osgi</groupId>
+				<artifactId>org.springframework.osgi.extender</artifactId>
+				<version>${version.spring-osgi}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.osgi</groupId>
+				<artifactId>org.springframework.osgi.core</artifactId>
+				<version>${version.spring-osgi}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.osgi</groupId>
+				<artifactId>org.springframework.osgi.web.extender</artifactId>
+				<version>${version.spring-osgi}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.osgi</groupId>
+				<artifactId>org.springframework.osgi.web</artifactId>
+				<version>${version.spring-osgi}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.argeo.slc.dep.osgi</groupId>
+				<artifactId>org.argeo.dep.osgi.catalina.start</artifactId>
+				<version>1.0.0</version>
+			</dependency>
+
+			<!-- AOP -->
+			<dependency>
+				<groupId>org.aspectj</groupId>
+				<artifactId>com.springsource.org.aspectj.runtime</artifactId>
+				<version>1.6.2.RELEASE</version>
+			</dependency>
+			<dependency>
+				<groupId>org.aspectj</groupId>
+				<artifactId>com.springsource.org.aspectj.weaver</artifactId>
+				<version>1.6.2.RELEASE</version>
+			</dependency>
+			<dependency>
+				<groupId>net.sourceforge.cglib</groupId>
+				<artifactId>com.springsource.net.sf.cglib</artifactId>
+				<version>2.1.3</version>
+			</dependency>
+			<dependency>
+				<groupId>org.objectweb.asm</groupId>
+				<artifactId>com.springsource.org.objectweb.asm.attrs</artifactId>
+				<version>2.2.0</version>
+			</dependency>
+
 			<!-- Ant -->
 			<dependency>
 				<groupId>org.argeo.dep.osgi</groupId>
 				<artifactId>org.argeo.dep.osgi.ant</artifactId>
 				<version>1.7.1</version>
 			</dependency>
-			<!--
-				<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-commons-logging</artifactId>
-				<version>${version.ant}</version> <exclusions> <exclusion>
-				<groupId>commons-logging</groupId>
-				<artifactId>commons-logging</artifactId> </exclusion> <exclusion>
-				<groupId>commons-logging</groupId>
-				<artifactId>commons-logging-api</artifactId> </exclusion>
-				<exclusion> <groupId>org.apache.ant</groupId>
-				<artifactId>ant</artifactId> </exclusion> </exclusions>
-				</dependency> <dependency> <groupId>org.apache.ant</groupId>
-				<artifactId>ant-commons-net</artifactId>
-				<version>${version.ant}</version> <exclusions> <exclusion>
-				<groupId>commons-net</groupId> <artifactId>commons-net</artifactId>
-				</exclusion> <exclusion> <groupId>org.apache.ant</groupId>
-				<artifactId>ant</artifactId> </exclusion> </exclusions>
-				</dependency> <dependency> <groupId>org.apache.ant</groupId>
-				<artifactId>ant-apache-oro</artifactId>
-				<version>${version.ant}</version> <exclusions> <exclusion>
-				<groupId>oro</groupId> <artifactId>oro</artifactId> </exclusion>
-				<exclusion> <groupId>org.apache.ant</groupId>
-				<artifactId>ant</artifactId> </exclusion> </exclusions>
-				</dependency> <dependency> <groupId>org.apache.ant</groupId>
-				<artifactId>ant-apache-bsf</artifactId>
-				<version>${version.ant}</version> <exclusions> <exclusion>
-				<groupId>bsf</groupId> <artifactId>bsf</artifactId> </exclusion>
-				<exclusion> <groupId>org.apache.ant</groupId>
-				<artifactId>ant</artifactId> </exclusion> </exclusions>
-				</dependency>
-			-->
 
 			<!-- Required by specific Ant tasks -->
 			<dependency>
@@ -422,6 +591,7 @@
 				<version>1.8.0.9</version>
 			</dependency>
 
+			<!-- XML -->
 			<dependency>
 				<groupId>org.codehaus.castor</groupId>
 				<artifactId>com.springsource.org.castor</artifactId>
@@ -433,12 +603,6 @@
 					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>
@@ -488,14 +652,6 @@
 				<artifactId>com.springsource.javax.activation</artifactId>
 				<version>1.1.1</version>
 			</dependency>
-
-			<dependency>
-				<groupId>org.aspectj</groupId>
-				<artifactId>
-					com.springsource.org.aspectj.weaver
-				</artifactId>
-				<version>1.6.2.RELEASE</version>
-			</dependency>
 			<dependency>
 				<groupId>com.lowagie.text</groupId>
 				<artifactId>
@@ -504,6 +660,12 @@
 				<version>2.0.8</version>
 			</dependency>
 
+			<!-- Tomcat -->
+			<dependency>
+				<groupId>org.apache.catalina</groupId>
+				<artifactId>com.springsource.org.apache.catalina</artifactId>
+				<version>6.0.18</version>
+			</dependency>
 
 			<!-- Maven -->
 			<dependency>
@@ -523,26 +685,28 @@
 				<version>${version.maven}</version>
 			</dependency>
 
-			<!-- OSGi -->
 			<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>
+				<groupId>org.apache.archiva</groupId>
+				<artifactId>archiva-webapp</artifactId>
+				<version>1.1.3</version>
+				<type>war</type>
 			</dependency>
 
+			<!-- OSGi -->
+			<!--
+				<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>
+			-->
 			<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 -->
@@ -564,6 +728,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>
@@ -587,6 +752,54 @@
 				<artifactId>com.springsource.javax.wsdl</artifactId>
 				<version>1.6.1</version>
 			</dependency>
+
+			<!-- JMS -->
+			<dependency>
+				<groupId>javax.jms</groupId>
+				<artifactId>com.springsource.javax.jms</artifactId>
+				<version>1.1.0</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.geronimo.specs</groupId>
+				<artifactId>com.springsource.javax.management.j2ee</artifactId>
+				<version>1.0.1</version>
+			</dependency>
+
+			<!-- ActiveMQ -->
+			<dependency>
+				<groupId>org.apache.activemq</groupId>
+				<artifactId>com.springsource.org.apache.activemq</artifactId>
+				<version>${version.activemq}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.activemq</groupId>
+				<artifactId>com.springsource.org.apache.activemq.web</artifactId>
+				<version>${version.activemq}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.activemq</groupId>
+				<artifactId>com.springsource.org.apache.activemq.pool</artifactId>
+				<version>${version.activemq}</version>
+			</dependency>
+			<!--
+				<dependency> <groupId>org.apache.activemq</groupId>
+				<artifactId>activemq-pool</artifactId>
+				<version>${version.activemq}</version> </dependency> <dependency>
+				<groupId>org.apache.activemq</groupId>
+				<artifactId>activemq-optional</artifactId>
+				<version>${version.activemq}</version> </dependency>
+			-->
+			<dependency>
+				<groupId>org.apache.xbean</groupId>
+				<artifactId>com.springsource.org.apache.xbean.spring</artifactId>
+				<version>3.3.0</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.camel</groupId>
+				<artifactId>com.springsource.org.apache.camel</artifactId>
+				<version>1.3.0</version>
+			</dependency>
+
 		</dependencies>
 	</dependencyManagement>
 	<repositories>
@@ -608,7 +821,8 @@
 			<id>com.springsource.repository.bundles.release</id>
 			<name>
 				SpringSource Enterprise Bundle Repository - SpringSource
-				Bundle Releases
+				Bundle
+				Releases
 			</name>
 			<url>
 				http://repository.springsource.com/maven/bundles/release
@@ -628,7 +842,8 @@
 			<id>com.springsource.repository.bundles.external</id>
 			<name>
 				SpringSource Enterprise Bundle Repository - External
-				Bundle Releases
+				Bundle
+				Releases
 			</name>
 			<url>
 				http://repository.springsource.com/maven/bundles/external
@@ -673,6 +888,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>