X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc%2Fpom.xml;h=d4384b4f47cad06f889b32f3b6c213193c6798f8;hb=e36cc1c9c01f926c7bd4677ffbebb41e8e13874d;hp=2f974db1064e4e68b1e05013c157cbb94a794203;hpb=04322c762f1704f0510f972ecd81c53b632899b3;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml
index 2f974db10..d4384b4f4 100644
--- a/org.argeo.slc/pom.xml
+++ b/org.argeo.slc/pom.xml
@@ -5,10 +5,13 @@
 	<artifactId>argeo-slc</artifactId>
 	<packaging>pom</packaging>
 	<name>Argeo SLC</name>
-	<version>0.11.3-SNAPSHOT</version>
+	<version>0.11.4-SNAPSHOT</version>
+	<!-- 
 	<url>
 		http://www.argeo.org/projects/slc/${project.artifactId}/${project.version}
 	</url>
+	 -->
+	<url>file:///home/mbaudier/dev/work/slcSite/${project.version}/</url>
 	<properties>
 		<version.spring>2.5.6.A</version.spring>
 		<version.spring-ws>1.5.5.A</version.spring-ws>
@@ -20,12 +23,11 @@
 		<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.0006</version.activemq>
-		<version.activemq-web>5.2.0.0005</version.activemq-web>
-		<version.maven-argeo-osgi>0.1.7</version.maven-argeo-osgi>
+		<version.maven-argeo-osgi>0.1.12</version.maven-argeo-osgi>
 	</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</connection>
+		<url>https://www.argeo.org/svn/slc/trunk</url>
 	</scm>
 	<issueManagement>
 		<system>Bugzilla</system>
@@ -98,19 +100,12 @@ limitations under the License.
 						</execution>
 					</executions>
 				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-javadoc-plugin</artifactId>
-					<executions>
-						<execution>
-							<id>attach-javadoc</id>
-							<phase>package</phase>
-							<goals>
-								<goal>jar</goal>
-							</goals>
-						</execution>
-					</executions>
-				</plugin>
+				<!--
+					<plugin> <groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-javadoc-plugin</artifactId> <executions>
+					<execution> <id>attach-javadoc</id> <phase>package</phase> <goals>
+					<goal>jar</goal> </goals> </execution> </executions> </plugin>
+				-->
 				<plugin>
 					<groupId>org.mortbay.jetty</groupId>
 					<artifactId>maven-jetty-plugin</artifactId>
@@ -159,27 +154,6 @@ limitations under the License.
 							<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>
@@ -192,34 +166,42 @@ limitations under the License.
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<inherited>false</inherited>
+				<artifactId>maven-resources-plugin</artifactId>
 				<configuration>
-					<descriptors>
-						<descriptor>
-							src/assembly/with-dependencies.xml
-						</descriptor>
-					</descriptors>
+					<encoding>UTF-8</encoding>
 				</configuration>
 			</plugin>
-		</plugins>
-	</build>
-	<reporting>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-report-plugin</artifactId>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>cobertura-maven-plugin</artifactId>
+				<artifactId>maven-site-plugin</artifactId>
+				<version>2.0-beta-5</version>
+				<!--
+					The site plugin is buggy with multi modules.
+					http://jira.codehaus.org/browse/MSITE-276
+				-->
 			</plugin>
+
+
+			<!--
+				<plugin> <groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<inherited>false</inherited> <configuration> <descriptors>
+				<descriptor> src/assembly/with-dependencies.xml </descriptor>
+				</descriptors> </configuration> </plugin>
+			-->
 		</plugins>
-	</reporting>
+
+	</build>
+	<!--
+		<reporting> <plugins> <plugin>
+		<groupId>org.apache.maven.plugins</groupId>
+		<artifactId>maven-surefire-report-plugin</artifactId> </plugin>
+		<plugin> <groupId>org.apache.maven.plugins</groupId>
+		<artifactId>maven-javadoc-plugin</artifactId> </plugin> <plugin>
+		<groupId>org.codehaus.mojo</groupId>
+		<artifactId>cobertura-maven-plugin</artifactId> </plugin> </plugins>
+		</reporting>
+	-->
 	<dependencyManagement>
 		<dependencies>
 			<!-- SLC (itself) -->
@@ -243,17 +225,11 @@ limitations under the License.
 				<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>
+			<!--
+				<dependency> <groupId>org.argeo.slc.runtime</groupId>
 				<artifactId>org.argeo.slc.support.ant</artifactId>
-				<version>${project.version}</version>
-			</dependency>
+				<version>${project.version}</version> </dependency>
+			-->
 			<dependency>
 				<groupId>org.argeo.slc.runtime</groupId>
 				<artifactId>org.argeo.slc.support.hibernate</artifactId>
@@ -284,21 +260,34 @@ limitations under the License.
 				<artifactId>org.argeo.slc.support.equinox</artifactId>
 				<version>${project.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>org.argeo.slc.runtime</groupId>
+			<!--
+				<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>
+			-->
+			<dependency>
+				<groupId>org.argeo.slc.server</groupId>
+				<artifactId>org.argeo.slc.ria</artifactId>
 				<version>${project.version}</version>
 			</dependency>
+			<!--
+				<dependency> <groupId>org.argeo.slc.server</groupId>
+				<artifactId>bundles</artifactId> <version>0.11.3-SNAPSHOT</version>
+				<type>pom</type> </dependency>
+			-->
 			<dependency>
-				<groupId>org.argeo.slc</groupId>
-				<artifactId>org.argeo.slc.webapp</artifactId>
+				<groupId>org.argeo.slc.server</groupId>
+				<artifactId>deploy</artifactId>
 				<version>${project.version}</version>
-				<type>war</type>
+				<type>pom</type>
 			</dependency>
 
 			<!-- SLC dubious -->
 			<dependency>
-				<groupId>org.argeo.slc</groupId>
+				<groupId>org.argeo.slc.runtime</groupId>
 				<artifactId>org.argeo.slc.detached.launcher</artifactId>
 				<version>${project.version}</version>
 				<type>tar.gz</type>
@@ -462,12 +451,11 @@ limitations under the License.
 				<artifactId>org.springframework.jms</artifactId>
 				<version>${version.spring}</version>
 			</dependency>
-
-			<dependency>
-				<groupId>org.springframework.ws</groupId>
+			<!--
+				<dependency> <groupId>org.springframework.ws</groupId>
 				<artifactId>org.springframework.ws</artifactId>
-				<version>${version.spring-ws}</version>
-			</dependency>
+				<version>${version.spring-ws}</version> </dependency>
+			-->
 			<dependency>
 				<groupId>org.springframework.ws</groupId>
 				<artifactId>org.springframework.oxm</artifactId>
@@ -494,10 +482,15 @@ limitations under the License.
 				<artifactId>org.springframework.osgi.web</artifactId>
 				<version>${version.spring-osgi}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework.osgi</groupId>
+				<artifactId>org.springframework.osgi.test</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>
+				<version>1.0.0.argeo3</version>
 			</dependency>
 
 			<!-- AOP -->
@@ -534,9 +527,9 @@ limitations under the License.
 
 			<!-- Ant -->
 			<dependency>
-				<groupId>org.argeo.dep.osgi</groupId>
-				<artifactId>org.argeo.dep.osgi.ant</artifactId>
-				<version>1.7.1</version>
+				<groupId>org.apache.ant</groupId>
+				<artifactId>com.springsource.org.apache.tools.ant</artifactId>
+				<version>1.7.0</version>
 			</dependency>
 
 			<!-- Required by specific Ant tasks -->
@@ -579,6 +572,16 @@ limitations under the License.
 				<artifactId>org.argeo.dep.osgi.commons.cli</artifactId>
 				<version>1.1</version>
 			</dependency>
+			<dependency>
+				<groupId>org.apache.commons</groupId>
+				<artifactId>com.springsource.org.apache.commons.pool</artifactId>
+				<version>1.4.0</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.commons</groupId>
+				<artifactId>com.springsource.org.apache.commons.dbcp</artifactId>
+				<version>1.2.2.osgi</version>
+			</dependency>
 
 			<!-- DB Drivers -->
 			<dependency>
@@ -586,6 +589,16 @@ limitations under the License.
 				<artifactId>com.springsource.org.hsqldb</artifactId>
 				<version>1.8.0.9</version>
 			</dependency>
+			<dependency>
+				<groupId>net.sourceforge.jtds</groupId>
+				<artifactId>com.springsource.net.sourceforge.jtds</artifactId>
+				<version>1.2.2</version>
+			</dependency>
+			<dependency>
+				<groupId>com.mysql.jdbc</groupId>
+				<artifactId>com.springsource.com.mysql.jdbc</artifactId>
+				<version>5.1.6</version>
+			</dependency>
 
 			<!-- XML -->
 			<dependency>
@@ -768,11 +781,21 @@ limitations under the License.
 				<version>${version.activemq}</version>
 			</dependency>
 			<dependency>
-				<groupId>org.argeo.dep.osgi</groupId>
-				<artifactId>org.argeo.dep.osgi.activemq.web</artifactId>
-				<version>${version.activemq-web}</version>
+				<groupId>org.apache.activemq</groupId>
+				<artifactId>com.springsource.org.apache.activemq.pool</artifactId>
+				<version>5.2.0</version>
+				<exclusions>
+					<exclusion>
+						<groupId>org.apache.activemq</groupId>
+						<artifactId>com.springsource.org.apache.activemq</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
-
+			<!--
+				<dependency> <groupId>org.argeo.dep.osgi</groupId>
+				<artifactId>org.argeo.dep.osgi.activemq.web</artifactId>
+				<version>${version.activemq-web}</version> </dependency>
+			-->
 			<dependency>
 				<groupId>javax.xml.soap</groupId>
 				<artifactId>com.springsource.javax.xml.soap</artifactId>
@@ -926,12 +949,15 @@ limitations under the License.
 			<name>Argeo FOSS Snapshots Repository</name>
 			<url>file:///var/argeo/maven2/argeo-snapshots</url>
 		</snapshotRepository>
+		<!--
+			<site> <id>argeo-slc-site</id> <name>SLC Site</name> <url>
+			file:///var/argeo/projects/SLC/www/site/${project.version} </url>
+			</site>
+		-->
 		<site>
 			<id>argeo-slc-site</id>
 			<name>SLC Site</name>
-			<url>
-				file:///var/argeo/projects/SLC/www/site/${project.version}
-			</url>
+			<url>file:///home/mbaudier/dev/work/slcSite/${project.version}/</url>
 		</site>
 	</distributionManagement>
 	<profiles>
@@ -947,4 +973,5 @@ limitations under the License.
 			</distributionManagement>
 		</profile>
 	</profiles>
+	
 </project>