X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc%2Fpom.xml;h=a19a72f89b37b8f29d8f7bfb2f8432a17438542f;hb=ccf7e46030c87cc1dd797a1c462b8eda6436dd39;hp=0ef2bd723b1fde2cc28bd5d64e451ce239894e64;hpb=fc506da61f90d4dd44bf6aa7433c73ec6142590d;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml
index 0ef2bd723..a19a72f89 100644
--- a/org.argeo.slc/pom.xml
+++ b/org.argeo.slc/pom.xml
@@ -6,18 +6,20 @@
 	<packaging>pom</packaging>
 	<name>Argeo SLC</name>
 	<version>0.11.3-SNAPSHOT</version>
-	<description>SLC Distribution</description>
 	<url>
 		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.14</version.jetty>
-		<version.maven-bundle-plugin>1.4.3</version.maven-bundle-plugin>
-		<version.activemq>5.2.0</version.activemq>
+		<version.tomcat>6.0.18</version.tomcat>
+		<version.equinox>3.4.2.R34x_v20080826-1230</version.equinox>
+		<version.maven-bundle-plugin>2.0.0</version.maven-bundle-plugin>
+		<version.activemq>5.2.0.0005</version.activemq>
 	</properties>
 	<scm>
 		<connection>scm:svn:https://www.argeo.org/svn/slc/trunk/org.argeo.slc</connection>
@@ -49,7 +51,7 @@ 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>
+			</comments>
 		</license>
 	</licenses>
 	<organization>
@@ -85,9 +87,16 @@ limitations under the License.
 					<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>
+					<executions>
+						<execution>
+							<goals>
+								<goal>test-jar</goal>
+							</goals>
+						</execution>
+					</executions>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
@@ -158,7 +167,11 @@ limitations under the License.
 							<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>
@@ -188,7 +201,7 @@ limitations under the License.
 					<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}
@@ -241,6 +254,85 @@ limitations under the License.
 	</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.simple</artifactId>
+				<version>${project.version}</version>
+				<classifier>tests</classifier>
+			</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>
@@ -266,7 +358,6 @@ limitations under the License.
 				<artifactId>
 					com.springsource.com.sun.xml.messaging.saaj
 				</artifactId>
-				<scope>runtime</scope>
 				<version>1.3.0</version>
 			</dependency>
 			<dependency>
@@ -275,7 +366,26 @@ limitations under the License.
 					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 -->
@@ -320,6 +430,7 @@ limitations under the License.
 				<artifactId>com.springsource.slf4j.org.apache.log4j</artifactId>
 				<version>1.5.3</version>
 			</dependency>
+
 			<!-- Spring -->
 			<dependency>
 				<groupId>org.springframework</groupId>
@@ -353,6 +464,11 @@ limitations under the License.
 				<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>
@@ -368,6 +484,11 @@ limitations under the License.
 				<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>
@@ -383,7 +504,59 @@ limitations under the License.
 			<dependency>
 				<groupId>org.springframework.osgi</groupId>
 				<artifactId>org.springframework.osgi.extender</artifactId>
-				<version>1.1.2.B</version>
+				<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.argeo.2</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>org.aopalliance</groupId>
+				<artifactId>com.springsource.org.aopalliance</artifactId>
+				<version>1.0.0</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</artifactId>
+				<version>1.5.3</version>
+			</dependency>
+			<dependency>
+				<groupId>org.objectweb.asm</groupId>
+				<artifactId>com.springsource.org.objectweb.asm.attrs</artifactId>
+				<version>1.5.3</version>
 			</dependency>
 
 			<!-- Ant -->
@@ -502,14 +675,6 @@ limitations under the License.
 				<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>
@@ -518,6 +683,22 @@ limitations under the License.
 				<version>2.0.8</version>
 			</dependency>
 
+			<!-- Tomcat -->
+			<dependency>
+				<groupId>org.apache.catalina</groupId>
+				<artifactId>com.springsource.org.apache.catalina</artifactId>
+				<version>${version.tomcat}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.jasper</groupId>
+				<artifactId>com.springsource.org.apache.jasper</artifactId>
+				<version>${version.tomcat}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.el</groupId>
+				<artifactId>com.springsource.org.apache.el</artifactId>
+				<version>${version.tomcat}</version>
+			</dependency>
 
 			<!-- Maven -->
 			<dependency>
@@ -537,21 +718,18 @@ limitations under the License.
 				<version>${version.maven}</version>
 			</dependency>
 
+			<dependency>
+				<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.eclipse.osgi</groupId>
 				<artifactId>org.eclipse.osgi</artifactId>
-				<version>3.4.2.R34x_v20080826-1230</version>
+				<version>${version.equinox}</version>
 			</dependency>
 
 			<!-- Auto UI -->
@@ -605,25 +783,45 @@ limitations under the License.
 				<version>1.1.0</version>
 			</dependency>
 			<dependency>
-				<groupId>org.apache.activemq</groupId>
-				<artifactId>com.springsource.org.apache.activemq</artifactId>
+				<groupId>org.apache.geronimo.specs</groupId>
+				<artifactId>com.springsource.javax.management.j2ee</artifactId>
+				<version>1.0.1</version>
+			</dependency>
+
+			<!-- ActiveMQ -->
+			<dependency>
+				<groupId>org.argeo.dep.osgi</groupId>
+				<artifactId>org.argeo.dep.osgi.activemq</artifactId>
 				<version>${version.activemq}</version>
 			</dependency>
 			<dependency>
-				<groupId>org.apache.activemq</groupId>
-				<artifactId>com.springsource.org.apache.activemq.web</artifactId>
+				<groupId>org.argeo.dep.osgi</groupId>
+				<artifactId>org.argeo.dep.osgi.activemq.web</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>
+				<groupId>javax.xml.soap</groupId>
+				<artifactId>com.springsource.javax.xml.soap</artifactId>
+				<version>1.3.0</version>
 			</dependency>
 			<dependency>
-				<groupId>org.apache.geronimo.specs</groupId>
-				<artifactId>com.springsource.javax.management.j2ee</artifactId>
-				<version>1.0.1</version>
+				<groupId>javax.xml.rpc</groupId>
+				<artifactId>com.springsource.javax.xml.rpc</artifactId>
+				<version>1.1.0</version>
+			</dependency>
+			<dependency>
+				<groupId>javax.ejb</groupId>
+				<artifactId>com.springsource.javax.ejb</artifactId>
+				<version>3.0.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>
@@ -645,7 +843,8 @@ limitations under the License.
 			<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
@@ -665,7 +864,8 @@ limitations under the License.
 			<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