X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Forg.argeo.slc.siteserver%2Fpom.xml;h=37d37e8355e0e45b8142ce88fc38893441153bca;hb=27c92a7e65dc2d52426dd3cbf9030da42285e862;hp=f2591a576651fb3dd06b14876d54de62f797ec21;hpb=e36cc1c9c01f926c7bd4677ffbebb41e8e13874d;p=gpl%2Fargeo-slc.git

diff --git a/server/org.argeo.slc.siteserver/pom.xml b/server/org.argeo.slc.siteserver/pom.xml
index f2591a576..37d37e835 100644
--- a/server/org.argeo.slc.siteserver/pom.xml
+++ b/server/org.argeo.slc.siteserver/pom.xml
@@ -1,4 +1,5 @@
-<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.server</groupId>
@@ -15,130 +16,68 @@
 	</modules>
 	<dependencies>
 		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.server</artifactId>
+			<groupId>org.argeo.slc.dep</groupId>
+			<artifactId>org.argeo.slc.dep.server</artifactId>
+			<version>${project.version}</version>
 		</dependency>
+		<!--
+			<dependency> <groupId>org.argeo.slc.runtime</groupId>
+			<artifactId>org.argeo.slc.server</artifactId> </dependency>
 
-		<dependency>
-			<groupId>org.argeo.slc.server</groupId>
-			<artifactId>org.argeo.slc.ria</artifactId>
-		</dependency>
-
-
-		<dependency>
+			<dependency> <groupId>org.argeo.slc.server</groupId>
+			<artifactId>org.argeo.slc.ria</artifactId> </dependency> <dependency>
 			<groupId>org.hsqldb</groupId>
-			<artifactId>com.springsource.org.hsqldb</artifactId>
-		</dependency>
-
-		<!-- OSGi integration -->
-		<dependency>
-			<groupId>org.eclipse.osgi</groupId>
-			<artifactId>org.eclipse.osgi</artifactId>
-		</dependency>
+			<artifactId>com.springsource.org.hsqldb</artifactId> </dependency>
 
-		<dependency>
+			<dependency> <groupId>org.eclipse.osgi</groupId>
+			<artifactId>org.eclipse.osgi</artifactId> </dependency> <dependency>
 			<groupId>javax.annotation</groupId>
 			<artifactId>com.springsource.javax.annotation</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax.persistence</groupId>
+			</dependency> <dependency> <groupId>javax.persistence</groupId>
 			<artifactId>com.springsource.javax.persistence</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax.xml.ws</groupId>
-			<artifactId>com.springsource.javax.xml.ws</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax.xml.bind</groupId>
+			</dependency> <dependency> <groupId>javax.xml.ws</groupId>
+			<artifactId>com.springsource.javax.xml.ws</artifactId> </dependency>
+			<dependency> <groupId>javax.xml.bind</groupId>
 			<artifactId>com.springsource.javax.xml.bind</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.aopalliance</groupId>
+			</dependency> <dependency> <groupId>org.aopalliance</groupId>
 			<artifactId>com.springsource.org.aopalliance</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>javax.ejb</groupId>
-			<artifactId>com.springsource.javax.ejb</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax.activation</groupId>
+			</dependency> <dependency> <groupId>javax.ejb</groupId>
+			<artifactId>com.springsource.javax.ejb</artifactId> </dependency>
+			<dependency> <groupId>javax.activation</groupId>
 			<artifactId>com.springsource.javax.activation</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax.xml.rpc</groupId>
-			<artifactId>com.springsource.javax.xml.rpc</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax.xml.soap</groupId>
+			</dependency> <dependency> <groupId>javax.xml.rpc</groupId>
+			<artifactId>com.springsource.javax.xml.rpc</artifactId> </dependency>
+			<dependency> <groupId>javax.xml.soap</groupId>
 			<artifactId>com.springsource.javax.xml.soap</artifactId>
-		</dependency>
-		<!--
-			Using springsource repo -->
-		<dependency>
+			</dependency> <dependency>
 			<groupId>org.springframework.osgi</groupId>
 			<artifactId>org.springframework.osgi.web.extender</artifactId>
-		</dependency>
-		<dependency>
+			</dependency> <dependency>
 			<groupId>org.springframework.osgi</groupId>
 			<artifactId>org.springframework.osgi.extender</artifactId>
-		</dependency>
-		<dependency>
+			</dependency> <dependency>
 			<groupId>org.springframework.osgi</groupId>
-			<artifactId>org.springframework.osgi.web</artifactId>
-		</dependency>
+			<artifactId>org.springframework.osgi.web</artifactId> </dependency>
 
-		<!-- Tomcat -->
-		<dependency>
-			<groupId>org.apache.catalina</groupId>
+			<dependency> <groupId>org.apache.catalina</groupId>
 			<artifactId>com.springsource.org.apache.catalina</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.jasper</groupId>
+			</dependency> <dependency> <groupId>org.apache.jasper</groupId>
 			<artifactId>com.springsource.org.apache.jasper</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.el</groupId>
-			<artifactId>com.springsource.org.apache.el</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.dep.osgi</groupId>
+			</dependency> <dependency> <groupId>org.apache.el</groupId>
+			<artifactId>com.springsource.org.apache.el</artifactId> </dependency>
+			<dependency> <groupId>org.argeo.slc.dep.osgi</groupId>
 			<artifactId>org.argeo.dep.osgi.catalina.start</artifactId>
-		</dependency>
-
-
-		<dependency>
-			<groupId>org.apache.commons</groupId>
+			</dependency> <dependency> <groupId>org.apache.commons</groupId>
 			<artifactId>com.springsource.org.apache.commons.logging</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.log4j</groupId>
-			<artifactId>
-					com.springsource.org.apache.log4j
-				</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>net.sourceforge.jtds</groupId>
+			</dependency> <dependency> <groupId>org.apache.log4j</groupId>
+			<artifactId> com.springsource.org.apache.log4j </artifactId>
+			</dependency> <dependency> <groupId>net.sourceforge.jtds</groupId>
 			<artifactId>com.springsource.net.sourceforge.jtds</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.mysql.jdbc</groupId>
+			</dependency> <dependency> <groupId>com.mysql.jdbc</groupId>
 			<artifactId>com.springsource.com.mysql.jdbc</artifactId>
-		</dependency>
-
-		<!-- For WS -->
-		<dependency>
-			<groupId>com.sun.xml</groupId>
+			</dependency> <dependency> <groupId>com.sun.xml</groupId>
 			<artifactId>com.springsource.com.sun.xml.messaging.saaj</artifactId>
-		</dependency>
-
-		<!-- For ActiveMQ Web
-		<dependency>
-			<groupId>org.argeo.dep.osgi</groupId>
-			<artifactId>org.argeo.dep.osgi.activemq.web</artifactId>
-		</dependency> -->
-
+			</dependency>
+		-->
 	</dependencies>
 </project>
\ No newline at end of file