X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.server%2Fpom.xml;h=bce230f7e1a65a6da59977b0db2984c011267485;hb=ad42a84b78e26be716e2bf42ef1b7208bc021a7d;hp=f054997d7028834017c050dba1e00302773dacf2;hpb=4310f8fad4057f2781dee82494b3112f5cd673f4;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.server/pom.xml b/runtime/org.argeo.slc.server/pom.xml
index f054997d7..bce230f7e 100644
--- a/runtime/org.argeo.slc.server/pom.xml
+++ b/runtime/org.argeo.slc.server/pom.xml
@@ -1,10 +1,9 @@
-<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>runtime</artifactId>
-		<version>0.11.4-SNAPSHOT</version>
+		<version>1.1.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.argeo.slc.runtime</groupId>
@@ -13,62 +12,43 @@
 	<description>SLC Server</description>
 	<build>
 		<plugins>
-			<!-- Look to parent pom for inheritances -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<!--
-					<executions> <execution> <goals> <goal>test-jar</goal> </goals>
-					</execution> </executions>
-				-->
-			</plugin>
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-				<version>${version.maven-bundle-plugin}</version>
 				<configuration>
 					<instructions>
 						<Export-Package>
 							org.argeo.slc.*,org.argeo.slc.server,org.argeo.slc.server.spring
 						</Export-Package>
-						<Import-Package>org.w3c.dom;version="0.0.0",javax.xml.*;version="0.0.0",org.argeo.slc.activemq,org.argeo.slc.execution,*</Import-Package>
+						<Import-Package>org.w3c.dom;version="0.0.0",
+							javax.xml.*;version="0.0.0",
+							org.argeo.slc.activemq;resolution:=optional,
+							org.argeo.slc.execution,
+							org.springframework.context.support,
+							org.tmatesoft.svn.*;resolution:=optional,
+							com.lowagie.*;resolution:=optional,
+							com.springsource.json.*;resolution:=optional,
+							org.springframework.oxm.*;resolution:=optional,
+							*
+						</Import-Package>
 					</instructions>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.mortbay.jetty</groupId>
-				<artifactId>maven-jetty-plugin</artifactId>
-				<configuration>
-					<webAppSourceDirectory>
-						../../org.argeo.slc.webapp/src/main/webapp
-					</webAppSourceDirectory>
-					<jettyConfig>
-						../../org.argeo.slc.webapp/src/main/config/jetty/jetty-test-local.xml
-					</jettyConfig>
-					<webDefaultXml>../../org.argeo.slc.webapp/src/main/config/jetty/webdefault.xml</webDefaultXml>
-					<systemProperties>
-						<systemProperty>
-							<name>activemq.base</name>
-							<value>${user.home}/share/apache-activemq-5.2.0</value>
-						</systemProperty>
-					</systemProperties>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>
 	<dependencies>
+		<!-- Commons -->
+		<dependency>
+			<groupId>org.argeo.commons.security</groupId>
+			<artifactId>org.argeo.security.core</artifactId>
+			<version>${version.argeo-commons}</version>
+		</dependency>
+
 		<!-- SLC -->
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.core</artifactId>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Spring -->
@@ -83,6 +63,7 @@
 		<dependency>
 			<groupId>org.springframework.ws</groupId>
 			<artifactId>org.springframework.oxm</artifactId>
+			<optional>true</optional>
 		</dependency>
 
 		<!-- Web -->
@@ -114,20 +95,27 @@
 		</dependency>
 
 		<!-- Security -->
-		<dependency>
-			<groupId>org.springframework.security</groupId>
-			<artifactId>org.springframework.security</artifactId>
-		</dependency>
 
 		<dependency>
 			<groupId>com.springsource.json</groupId>
 			<artifactId>com.springsource.json</artifactId>
 			<version>1.0.1.RELEASE</version>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.antlr</groupId>
 			<artifactId>com.springsource.org.antlr</artifactId>
+			<optional>true</optional>
+		</dependency>
+
+		<!-- SVN -->
+		<dependency>
+			<groupId>com.svnkit</groupId>
+			<artifactId>com.springsource.org.tmatesoft.svn</artifactId>
+			<optional>true</optional>
 		</dependency>
 
+		<!-- Commons VFS <dependency> <groupId>org.apache.commons</groupId> <artifactId>com.springsource.org.apache.commons.vfs</artifactId> 
+			</dependency> -->
 	</dependencies>
 </project>