From 9e3c2ab0b887fd1799daf5be49da1a71a34590ad Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 5 Oct 2019 13:42:04 +0200
Subject: [PATCH] Adapt to new Argeo Third-Parties.

---
 dep/org.argeo.dep.cms.client/pom.xml | 16 ++++++++++++----
 dep/org.argeo.dep.cms.sdk/pom.xml    |  9 +++++++--
 pom.xml                              |  7 ++++++-
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/dep/org.argeo.dep.cms.client/pom.xml b/dep/org.argeo.dep.cms.client/pom.xml
index 75b49c5ed..761dcdb2c 100644
--- a/dep/org.argeo.dep.cms.client/pom.xml
+++ b/dep/org.argeo.dep.cms.client/pom.xml
@@ -1,5 +1,7 @@
 <?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">
+<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</groupId>
@@ -62,12 +64,12 @@
 			<groupId>org.argeo.tp.misc</groupId>
 			<artifactId>org.slf4j.commons.logging</artifactId>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.argeo.tp.misc</groupId>
 			<artifactId>org.freemarker</artifactId>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.argeo.tp.bouncycastle</groupId>
 			<artifactId>bcprov</artifactId>
@@ -80,7 +82,7 @@
 			<groupId>org.argeo.tp.bouncycastle</groupId>
 			<artifactId>bcpg</artifactId>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.argeo.tp.apache</groupId>
 			<artifactId>org.apache.httpcomponents.httpcore</artifactId>
@@ -324,6 +326,12 @@
 			<artifactId>com.google.guava</artifactId>
 		</dependency>
 
+		<!-- Jackrabbit Vault -->
+		<dependency>
+			<groupId>org.argeo.tp.apache.jackrabbit</groupId>
+			<artifactId>org.apache.jackrabbit.vault</artifactId>
+		</dependency>
+
 		<!-- Git -->
 		<dependency>
 			<groupId>org.argeo.tp.misc</groupId>
diff --git a/dep/org.argeo.dep.cms.sdk/pom.xml b/dep/org.argeo.dep.cms.sdk/pom.xml
index 8b9735c3a..e287e19da 100644
--- a/dep/org.argeo.dep.cms.sdk/pom.xml
+++ b/dep/org.argeo.dep.cms.sdk/pom.xml
@@ -15,7 +15,7 @@
 		<!-- Parent dependencies -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.dep.cms.platform</artifactId>
+			<artifactId>org.argeo.dep.cms.e4.rap</artifactId>
 			<version>2.1.81-SNAPSHOT</version>
 			<type>pom</type>
 		</dependency>
@@ -29,9 +29,14 @@
 		<!-- <groupId>org.argeo.tp.apache.ant</groupId> -->
 		<!-- <artifactId>org.apache.ant.launch</artifactId> -->
 		<!-- </dependency> -->
+
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.tp.sdk</groupId> -->
+<!-- 			<artifactId>org.osgi.annotation.bundle</artifactId> -->
+<!-- 		</dependency> -->
 		<dependency>
 			<groupId>org.argeo.tp.sdk</groupId>
-			<artifactId>biz.aQute.bnd</artifactId>
+			<artifactId>biz.aQute.bndlib</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.sdk</groupId>
diff --git a/pom.xml b/pom.xml
index d6b784f4d..57f8eead2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -372,9 +372,14 @@ limitations under the License.
 					<groupId>org.argeo.tp.apache</groupId>
 					<artifactId>org.apache.xerces</artifactId>
 				</exclusion>
+				<!-- Avoid slf4j implementations lurking in the classpath. -->
 				<exclusion>
 					<groupId>org.argeo.tp.sdk</groupId>
-					<artifactId>biz.aQute.bnd</artifactId>
+					<artifactId>biz.aQute.bndlib</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.argeo.tp.misc</groupId>
+					<artifactId>slf4j.osgi</artifactId>
 				</exclusion>
 			</exclusions>
 		</dependency>
-- 
2.30.2