X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.support.maven%2Fpom.xml;h=a69e2cca667028562eca74845a458f1c91d60b77;hb=05f3f8d7c67bffd535ecbf5aa575eb9d41a435b4;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..a69e2cca6 100644
--- a/runtime/org.argeo.slc.support.maven/pom.xml
+++ b/runtime/org.argeo.slc.support.maven/pom.xml
@@ -12,8 +12,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.9</version.aether>
+		<version.maven>3.0.2</version.maven>
 		<version.wagon>1.0-beta-7</version.wagon>
 	</properties>
 	<build>
@@ -35,7 +35,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 +67,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>${version.slc}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc.runtime</groupId>
+			<artifactId>org.argeo.slc.support.aether</artifactId>
+			<version>${version.slc}</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 +91,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 +106,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 +143,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 +200,28 @@
 				</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>
 
 	</dependencies>
 </project>