From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 24 Jun 2009 08:08:49 +0000 (+0000)
Subject: Restructure dependencies
X-Git-Tag: argeo-slc-2.1.7~1772
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;ds=sidebyside;h=c60c9a4165f236180d1c06f22aafbc9650fc2b7a;p=gpl%2Fargeo-slc.git

Restructure dependencies

git-svn-id: https://svn.argeo.org/slc/trunk@2570 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/dep/org.argeo.slc.dep.agent/pom.xml b/dep/org.argeo.slc.dep.agent/pom.xml
index c2e53e273..3f6f3e7f3 100644
--- a/dep/org.argeo.slc.dep.agent/pom.xml
+++ b/dep/org.argeo.slc.dep.agent/pom.xml
@@ -28,9 +28,5 @@
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.support.castor</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.equinox</artifactId>
-		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 744f46480..d3b02745a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
 		<version.slf4j>1.5.6</version.slf4j>
 		<version.maven-bundle-plugin>2.0.0</version.maven-bundle-plugin>
 		<version.activemq>5.2.0.0006</version.activemq>
-		<version.maven-argeo-osgi>0.1.14</version.maven-argeo-osgi>
+		<version.maven-argeo-osgi>0.1.15-SNAPSHOT</version.maven-argeo-osgi>
 		<version.maven-argeo-qooxdoo>0.8.1.7</version.maven-argeo-qooxdoo>
 		<site.repoBase>file:///var/argeo/projects/SLC/www/site</site.repoBase>
 		<site.urlBase>http://www.argeo.org/projects/slc/site</site.urlBase>
diff --git a/server/org.argeo.slc.siteserver/pom.xml b/server/org.argeo.slc.siteserver/pom.xml
index 3bc3388b1..f008417d9 100644
--- a/server/org.argeo.slc.siteserver/pom.xml
+++ b/server/org.argeo.slc.siteserver/pom.xml
@@ -15,69 +15,11 @@
 		<module>bundles</module>
 	</modules>
 	<dependencies>
+	<!-- 
 		<dependency>
 			<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>
-			<groupId>org.hsqldb</groupId>
-			<artifactId>com.springsource.org.hsqldb</artifactId> </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>
-			<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>
-			<artifactId>com.springsource.javax.xml.bind</artifactId>
-			</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>
-			<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>
-			<artifactId>com.springsource.javax.xml.soap</artifactId>
-			</dependency> <dependency>
-			<groupId>org.springframework.osgi</groupId>
-			<artifactId>org.springframework.osgi.web.extender</artifactId>
-			</dependency> <dependency>
-			<groupId>org.springframework.osgi</groupId>
-			<artifactId>org.springframework.osgi.extender</artifactId>
-			</dependency> <dependency>
-			<groupId>org.springframework.osgi</groupId>
-			<artifactId>org.springframework.osgi.web</artifactId> </dependency>
-
-			<dependency> <groupId>org.apache.catalina</groupId>
-			<artifactId>com.springsource.org.apache.catalina</artifactId>
-			</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>
-			<artifactId>org.argeo.dep.osgi.catalina.start</artifactId>
-			</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>
-			<artifactId>com.springsource.net.sourceforge.jtds</artifactId>
-			</dependency> <dependency> <groupId>com.mysql.jdbc</groupId>
-			<artifactId>com.springsource.com.mysql.jdbc</artifactId>
-			</dependency> <dependency> <groupId>com.sun.xml</groupId>
-			<artifactId>com.springsource.com.sun.xml.messaging.saaj</artifactId>
-			</dependency>
-		-->
+		</dependency> -->
 	</dependencies>
 </project>
\ No newline at end of file