X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.slc%2Fpom.xml;h=f90ea744d27403d230d80c154d358d8872daddf5;hb=6373b2f2612b8b0a25f752b576f35003760f7be6;hp=82f5b22bb3bc4a9889dad833052fa357f9be68ba;hpb=697330cafbbc3d6e228f8aefdbe44e65db769411;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml
index 82f5b22bb..f90ea744d 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.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>
 	</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>
@@ -51,7 +49,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>
@@ -87,7 +85,7 @@ 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>
 				</plugin>
@@ -160,15 +158,42 @@ 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>
+							<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}
@@ -221,6 +246,79 @@ 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.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>
@@ -255,7 +353,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 -->
@@ -300,6 +417,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>
@@ -333,6 +451,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>
@@ -348,6 +471,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>
@@ -363,7 +491,49 @@ 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</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 -->
@@ -482,14 +652,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>
@@ -498,6 +660,12 @@ 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>6.0.18</version>
+			</dependency>
 
 			<!-- Maven -->
 			<dependency>
@@ -517,6 +685,13 @@ 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>
@@ -553,6 +728,7 @@ limitations under the License.
 				<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>
@@ -576,6 +752,44 @@ limitations under the License.
 				<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>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>
+
 		</dependencies>
 	</dependencyManagement>
 	<repositories>
@@ -597,7 +811,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
@@ -617,7 +832,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