X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=runtime%2Forg.argeo.slc.server%2Fpom.xml;h=cd5812de5c204f707bb42bc8df79576b5dc1db22;hb=2dc0fd3e90523a0bab5c88cfc4e85869fd675e9f;hp=26c8885faf26f1419198da8fbbef9a5d73b87433;hpb=ef2adcbb986a58a6cfa5352106d5d35559342886;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.server/pom.xml b/runtime/org.argeo.slc.server/pom.xml
index 26c8885fa..cd5812de5 100644
--- a/runtime/org.argeo.slc.server/pom.xml
+++ b/runtime/org.argeo.slc.server/pom.xml
@@ -1,9 +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">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><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.13.0</version>
+		<version>1.1.2-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.argeo.slc.runtime</groupId>
@@ -15,7 +15,6 @@
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-				<version>${version.maven-bundle-plugin}</version>
 				<configuration>
 					<instructions>
 						<Export-Package>
@@ -23,10 +22,13 @@
 						</Export-Package>
 						<Import-Package>org.w3c.dom;version="0.0.0",
 							javax.xml.*;version="0.0.0",
-							org.argeo.slc.activemq,
+							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>
@@ -46,74 +48,78 @@
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.core</artifactId>
+			<version>1.1.2-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Spring -->
 		<dependency>
-			<groupId>org.springframework</groupId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>org.springframework.web</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp</groupId>
 			<artifactId>org.springframework.web.servlet</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework</groupId>
+			<groupId>org.argeo.tp</groupId>
 			<artifactId>org.springframework.aop</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.ws</groupId>
+			<groupId>org.argeo.tp</groupId>
 			<artifactId>org.springframework.oxm</artifactId>
+			<optional>true</optional>
 		</dependency>
 
 		<!-- Web -->
 		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>com.springsource.org.apache.commons.fileupload</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>org.apache.commons.fileupload</artifactId>
 		</dependency>
 
 		<!-- J2EE -->
 		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>com.springsource.javax.servlet</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>javax.servlet</artifactId>
 		</dependency>
 
 		<!-- AOP -->
 		<dependency>
-			<groupId>org.aspectj</groupId>
-			<artifactId>com.springsource.org.aspectj.weaver</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>org.aspectj.weaver</artifactId>
 		</dependency>
 
 		<!-- Docs -->
 		<dependency>
-			<groupId>net.sourceforge.jexcelapi</groupId>
-			<artifactId>com.springsource.jxl</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>jxl</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>com.lowagie.text</groupId>
-			<artifactId>com.springsource.com.lowagie.text</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>com.lowagie.text</artifactId>
 		</dependency>
 
 		<!-- Security -->
 
 		<dependency>
-			<groupId>com.springsource.json</groupId>
+			<groupId>org.argeo.tp</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>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>org.antlr</artifactId>
+			<optional>true</optional>
 		</dependency>
 
 		<!-- SVN -->
 		<dependency>
-			<groupId>com.svnkit</groupId>
-			<artifactId>com.springsource.org.tmatesoft.svn</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>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> -->
-
+		<!-- Commons VFS <dependency> <groupId>org.apache.commons</groupId> <artifactId>com.springsource.org.apache.commons.vfs</artifactId> 
+			</dependency> -->
 	</dependencies>
-</project>
+</project>
\ No newline at end of file