X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.dist%2Fpom.xml;h=8f0d2e93801093dfb76f6aae6a2637affd745a0e;hb=3f562479efc9f2257909f7d6d349e717592117d2;hp=bce84e0818bf5494d3285a26dbba22e80063035e;hpb=0f0f5d202311dc5a692a4e723008a80de1e2051c;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.dist/pom.xml b/org.argeo.slc.dist/pom.xml
index bce84e081..8f0d2e938 100644
--- a/org.argeo.slc.dist/pom.xml
+++ b/org.argeo.slc.dist/pom.xml
@@ -1,9 +1,10 @@
-<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>
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>argeo-slc</artifactId>
-		<version>0.11.1-SNAPSHOT</version>
+		<version>0.11.2-SNAPSHOT</version>
 		<relativePath>../org.argeo.slc</relativePath>
 	</parent>
 	<artifactId>argeo-slc-dist</artifactId>
@@ -30,20 +31,36 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<configuration>
+					<overWriteReleases>false</overWriteReleases>
+					<overWriteSnapshots>false</overWriteSnapshots>
+					<overWriteIfNewer>true</overWriteIfNewer>
+					<outputDirectory>${project.build.directory}/p2Repository/plugins</outputDirectory>
+				</configuration>
+			</plugin>
+
 		</plugins>
 	</build>
 	<dependencies>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
-			<artifactId>argeo-slc-agent</artifactId>
+			<artifactId>org.argeo.slc.agent</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.server</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
 		<!--  Additional SLC dependencies -->
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
-			<artifactId>argeo-slc-agent</artifactId>
-            <version>${project.version}</version>
+			<artifactId>org.argeo.slc.agent</artifactId>
+			<version>${project.version}</version>
 			<type>tar.gz</type>
 			<classifier>base</classifier>
 		</dependency>
@@ -51,39 +68,58 @@
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.detached.launcher</artifactId>
-            <version>${project.version}</version>
+			<version>${project.version}</version>
 			<type>tar.gz</type>
 			<classifier>dist</classifier>
 		</dependency>
 
-        <dependency>
-            <groupId>org.argeo.dep.jemmy</groupId>
-            <artifactId>org.argeo.dep.jemmy.nb61</artifactId>
-        </dependency>
+		<dependency>
+			<groupId>org.argeo.dep.jemmy</groupId>
+			<artifactId>org.argeo.dep.jemmy.nb61</artifactId>
+		</dependency>
 
-		<!-- Additional Third Parties
+		<!--
+			Artifacts below are required for consistency of the P2 repository
+		-->
+
+		<!-- Required by SOAP and Web Services -->
+		<dependency>
+			<groupId>javax.activation</groupId>
+			<artifactId>com.springsource.javax.activation</artifactId>
+		</dependency>
+		<!-- Required by Xerces -->
+		<dependency>
+			<groupId>org.apache.xmlcommons</groupId>
+			<artifactId>com.springsource.org.apache.xmlcommons</artifactId>
+		</dependency>
+		<!-- Required by DB unit -->
 		<dependency>
-			<groupId>net.sourceforge.jtds</groupId>
-			<artifactId>jtds</artifactId>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>com.springsource.org.apache.commons.collections</artifactId>
 		</dependency>
+		<!-- Required by JSP -->
 		<dependency>
-			<groupId>mysql</groupId>
-			<artifactId>mysql-connector-java</artifactId>
+			<groupId>javax.servlet</groupId>
+			<artifactId>com.springsource.javax.servlet.jsp</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>hsqldb</groupId>
-			<artifactId>hsqldb</artifactId>
+			<groupId>javax.el</groupId>
+			<artifactId>com.springsource.javax.el</artifactId>
 		</dependency>
- -->
-        <!-- Required by FTP Ant task
-        <dependency>
-            <groupId>commons-net</groupId>
-            <artifactId>commons-net</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>oro</groupId>
-            <artifactId>oro</artifactId>
-        </dependency>
- -->
+
+
+		<!--
+			Additional Third Parties <dependency>
+			<groupId>net.sourceforge.jtds</groupId> <artifactId>jtds</artifactId>
+			</dependency> <dependency> <groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId> </dependency>
+			<dependency> <groupId>hsqldb</groupId>
+			<artifactId>hsqldb</artifactId> </dependency>
+		-->
+		<!--
+			Required by FTP Ant task <dependency> <groupId>commons-net</groupId>
+			<artifactId>commons-net</artifactId> </dependency> <dependency>
+			<groupId>oro</groupId> <artifactId>oro</artifactId> </dependency>
+		-->
 	</dependencies>
 </project>
\ No newline at end of file