X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.jcr%2Fpom.xml;h=2f46b79edec3bae0eee8f0b157f17a49bc671c8a;hb=cd50e3711d3b86921f11d9e021fc6a43bef0d400;hp=c9bd5d402b4a313f6a0b42fb0c1146176057e22e;hpb=462f742349458e2bc907e0d7f6bb76012caf2a3b;p=lgpl%2Fargeo-commons.git

diff --git a/server/runtime/org.argeo.server.jcr/pom.xml b/server/runtime/org.argeo.server.jcr/pom.xml
index c9bd5d402..2f46b79ed 100644
--- a/server/runtime/org.argeo.server.jcr/pom.xml
+++ b/server/runtime/org.argeo.server.jcr/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">
+<?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.commons.server</groupId>
 		<artifactId>runtime</artifactId>
-		<version>0.2.2-SNAPSHOT</version>
+		<version>1.1.5-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.server.jcr</artifactId>
@@ -26,20 +25,23 @@
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-				<version>${version.maven-bundle-plugin}</version>
+
 				<configuration>
 					<instructions>
-						<Export-Package>
-							org.argeo.jcr.*,
-							org.argeo.server.jcr.*
-						</Export-Package>
+						<Export-Package>org.argeo.jcr.*</Export-Package>
+						<Import-Package>
+							junit.framework;resolution:=optional,
+							org.xml.sax;version="0.0.0",
+							org.springframework.core;resolution:=optional,
+							org.springframework.core.io;resolution:=optional,
+							org.springframework.*;resolution:=optional,
+							*</Import-Package>
 					</instructions>
 				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.argeo.maven.plugins</groupId>
 				<artifactId>maven-argeo-osgi-plugin</artifactId>
-				<version>${version.maven-argeo-osgi}</version>
 				<configuration>
 					<useDependencies>true</useDependencies>
 					<onlyCheck>true</onlyCheck>
@@ -56,91 +58,79 @@
 	</build>
 	<dependencies>
 		<dependency>
-			<groupId>org.argeo.commons.basic</groupId>
-			<artifactId>org.argeo.basic.nodeps</artifactId>
-			<version>0.2.2-SNAPSHOT</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.core</artifactId>
-			<version>0.2.2-SNAPSHOT</version>
+			<groupId>org.argeo.commons.base</groupId>
+			<artifactId>org.argeo.util</artifactId>
+			<version>1.1.5-SNAPSHOT</version>
 		</dependency>
 
 		<!-- JCR -->
 		<dependency>
-			<groupId>org.argeo.dep.osgi</groupId>
-			<artifactId>org.argeo.dep.osgi.jcr</artifactId>
-		</dependency>
-
-		<!-- Spring -->
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>org.springframework.beans</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>javax.jcr</artifactId>
 		</dependency>
 
 		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>org.springframework.web.servlet</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>org.apache.commons.io</artifactId>
 		</dependency>
 
+		<!-- Spring -->
 		<dependency>
-			<groupId>org.springframework.security</groupId>
-			<artifactId>org.springframework.security.core</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>org.springframework.core</artifactId>
+			<scope>provided</scope>
 		</dependency>
-
 		<dependency>
-			<groupId>org.springframework.ws</groupId>
-			<artifactId>org.springframework.xml</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>org.springframework.beans</artifactId>
+			<scope>provided</scope>
 		</dependency>
 
+		<!-- OSGi -->
 		<dependency>
-			<groupId>javax.activation</groupId>
-			<artifactId>com.springsource.javax.activation</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>org.eclipse.osgi</artifactId>
+			<scope>provided</scope>
 		</dependency>
 
 		<!-- Logging -->
 		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>slf4j.org.apache.commons.logging</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>com.springsource.org.apache.commons.fileupload</artifactId>
-		</dependency>
 
+		<!-- TEST -->
 		<dependency>
-			<groupId>org.junit</groupId>
-			<artifactId>com.springsource.junit</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>junit</artifactId>
 			<optional>true</optional>
 		</dependency>
-
-		<!-- TEST -->
 		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.jackrabbit</artifactId>
-			<version>0.2.2-SNAPSHOT</version>
+			<groupId>org.argeo.commons.base</groupId>
+			<artifactId>org.argeo.dep.jackrabbit</artifactId>
+			<version>1.1.5-SNAPSHOT</version>
+			<type>pom</type>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.commons.basic</groupId>
+			<groupId>org.argeo.commons.base</groupId>
 			<artifactId>org.argeo.support.junit</artifactId>
-			<version>0.2.2-SNAPSHOT</version>
+			<version>1.1.5-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.commons.basic</groupId>
-			<artifactId>org.argeo.basic.dep.log4j</artifactId>
-			<version>0.2.2-SNAPSHOT</version>
+			<groupId>org.argeo.commons.base</groupId>
+			<artifactId>org.argeo.dep.log4j</artifactId>
+			<version>1.1.5-SNAPSHOT</version>
 			<type>pom</type>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.commons.osgi</groupId>
+			<groupId>org.argeo.commons.base</groupId>
 			<artifactId>org.argeo.osgi.boot</artifactId>
-			<version>0.2.2-SNAPSHOT</version>
+			<version>1.1.5-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
-</project>
+</project>
\ No newline at end of file