X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=runtime%2Forg.argeo.slc.support.maven%2Fpom.xml;h=447896221fa36b17bff84052eaff4ca6f73b58c5;hb=ad42a84b78e26be716e2bf42ef1b7208bc021a7d;hp=43840d804135c0348836300b11d827c748495e90;hpb=c6cf306142a4b287096726b94beb3fd92635e429;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.support.maven/pom.xml b/runtime/org.argeo.slc.support.maven/pom.xml
index 43840d804..447896221 100644
--- a/runtime/org.argeo.slc.support.maven/pom.xml
+++ b/runtime/org.argeo.slc.support.maven/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.13.1-SNAPSHOT</version>
+		<version>1.1.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.argeo.slc.runtime</groupId>
@@ -12,8 +11,8 @@
 	<packaging>bundle</packaging>
 	<name>SLC Support Maven</name>
 	<properties>
-		<version.maven>3.0.1</version.maven>
-		<version.aether>1.8</version.aether>
+		<version.aether>1.11</version.aether>
+		<version.maven>3.0.3</version.maven>
 		<version.wagon>1.0-beta-7</version.wagon>
 	</properties>
 	<build>
@@ -21,7 +20,7 @@
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-				<version>${version.maven-bundle-plugin}</version>
+
 				<configuration>
 					<instructions>
 						<Export-Package>
@@ -35,7 +34,6 @@
 							*
 						</Import-Package>
 						<_exportcontents>
-							org.sonatype.aether.*;version=${version.aether},
 							org.apache.maven.*;version=${version.maven},
 						</_exportcontents>
 						<Private-Package>org.apache.xbean.*</Private-Package>
@@ -68,17 +66,20 @@
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.specs</artifactId>
-		</dependency><!-- <dependency> <groupId>org.argeo.dep.osgi</groupId> <artifactId>org.argeo.dep.osgi.maven.embedder</artifactId> 
+			<version>1.1.1-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc.runtime</groupId>
+			<artifactId>org.argeo.slc.support.aether</artifactId>
+			<version>1.1.1-SNAPSHOT</version>
+		</dependency>
+
+		<!-- <dependency> <groupId>org.argeo.dep.osgi</groupId> <artifactId>org.argeo.dep.osgi.maven.embedder</artifactId> 
 			</dependency> -->
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>org.springframework.beans</artifactId>
 		</dependency>
-
-		<!-- <dependency> <groupId>org.argeo.slc.runtime</groupId> <artifactId>org.argeo.slc.support.ant</artifactId> 
-			</dependency> <dependency> <groupId>org.argeo.dep.osgi</groupId> <artifactId>org.argeo.dep.osgi.maven.embedder</artifactId> 
-			<version>2.0.4.argeo.1-SNAPSHOT</version> </dependency> -->
-
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>com.springsource.org.apache.commons.io</artifactId>
@@ -89,41 +90,6 @@
 			<artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
 		</dependency>
 
-		<!-- <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-embedder</artifactId> 
-			<version>2.0.4</version> <optional>true</optional> <exclusions> <exclusion> 
-			<groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> 
-			</exclusion> </exclusions> </dependency> -->
-		<!--<dependency> <groupId>org.argeo.dep.osgi</groupId> <artifactId>org.argeo.dep.osgi.maven.embedder</artifactId> 
-			</dependency> -->
-
-		<!-- Required for the compilation ONLY <dependency> <groupId>org.apache.maven</groupId> 
-			<artifactId>maven-embedder</artifactId> <version>${version.maven}</version> 
-			<scope>provided</scope> <optional>true</optional> <exclusions> <exclusion> 
-			<groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> 
-			</exclusion> <exclusion> <groupId>commons-cli</groupId> <artifactId>commons-cli</artifactId> 
-			</exclusion> </exclusions> </dependency> <dependency> <groupId>org.apache.maven</groupId> 
-			<artifactId>maven-aether-provider</artifactId> <version>${version.maven}</version> 
-			<scope>provided</scope> <optional>true</optional> <exclusions> <exclusion> 
-			<groupId>commons-cli</groupId> <artifactId>commons-cli</artifactId> </exclusion> 
-			</exclusions> </dependency> <dependency> <groupId>org.sonatype.aether</groupId> 
-			<artifactId>aether-connector-wagon</artifactId> <version>1.8</version> <scope>provided</scope> 
-			<optional>true</optional> </dependency> <dependency> <groupId>org.apache.maven.wagon</groupId> 
-			<artifactId>wagon-provider-api</artifactId> <version>${version.wagon}</version> 
-			<scope>provided</scope> <optional>true</optional> <exclusions> <exclusion> 
-			<groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> 
-			</exclusion> </exclusions> </dependency> <dependency> <groupId>org.apache.maven.wagon</groupId> 
-			<artifactId>wagon-file</artifactId> <version>${version.wagon}</version> <scope>provided</scope> 
-			<optional>true</optional> <exclusions> <exclusion> <groupId>commons-logging</groupId> 
-			<artifactId>commons-logging</artifactId> </exclusion> </exclusions> </dependency> 
-			<dependency> <groupId>org.apache.maven.wagon</groupId> <artifactId>wagon-http-lightweight</artifactId> 
-			<version>${version.wagon}</version> <optional>true</optional> <exclusions> 
-			<exclusion> <groupId>nekohtml</groupId> <artifactId>nekohtml</artifactId> 
-			</exclusion> <exclusion> <groupId>nekohtml</groupId> <artifactId>xercesMinimal</artifactId> 
-			</exclusion> <exclusion> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> 
-			</exclusion> </exclusions> </dependency> -->
-
-
-
 		<dependency>
 			<groupId>org.apache.maven</groupId>
 			<artifactId>maven-embedder</artifactId>
@@ -139,6 +105,18 @@
 					<groupId>commons-cli</groupId>
 					<artifactId>commons-cli</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>org.sonatype.aether</groupId>
+					<artifactId>aether-spi</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.sonatype.aether</groupId>
+					<artifactId>aether-api</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.sonatype.aether</groupId>
+					<artifactId>aether-util</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>
@@ -164,6 +142,18 @@
 					<groupId>junit</groupId>
 					<artifactId>junit</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>org.sonatype.aether</groupId>
+					<artifactId>aether-spi</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.sonatype.aether</groupId>
+					<artifactId>aether-api</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.sonatype.aether</groupId>
+					<artifactId>aether-util</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>
@@ -209,6 +199,32 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.maven.wagon</groupId>
+			<artifactId>wagon-webdav-jackrabbit</artifactId>
+			<version>${version.wagon}</version>
+			<optional>true</optional>
+			<scope>provided</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>org.slf4j</groupId>
+					<artifactId>slf4j-nop</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.apache.jackrabbit</groupId>
+					<artifactId>jackrabbit-webdav</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
 
+		<dependency>
+			<groupId>org.argeo.dep.osgi</groupId>
+			<artifactId>org.argeo.dep.osgi.aether</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.junit</groupId>
+			<artifactId>com.springsource.junit</artifactId>
+		</dependency>
 	</dependencies>
 </project>