Adapt to new Argeo Third-Parties.

diff --git a/dep/org.argeo.dep.cms.client/pom.xml b/dep/org.argeo.dep.cms.client/pom.xml
index 75b49c5edc30c8a39fe342f8b63fbd6e26674f09..761dcdb2c2020079c47762bae79bc1fc365b559b 100644 (file)
--- 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 8b9735c3aa224d3ca3d2f9463e1473a970ac2c2c..e287e19da47f524ae90424fe597075b871033b9b 100644 (file)
--- 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 d6b784f4dbcb7664c1166607535bb8419044b78f..57f8eead2ba23d0f08694401092570634ed256d5 100644 (file)
--- 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>