commit 8650f28f16c1c7bf1dd3d44511faae68d18f531a
author sseifert <sseifert@pro-vision.de> Thu Aug 22 11:55:35 2019 +0200
committer Robert Munteanu <robert.munteanu@gmail.com> Tue Sep 17 13:39:59 2019 +0200
tree fa440f35588173b78f8685cd77537c26ac2e0d26
parent ce9acda9c3b3475bf2859960e63b8beb034a23ad

SLING-8625 update oak version to 1.16.0, jackrabbit version to 2.18.2
remove dependency to org.apache.jackrabbit:jackrabbit-api (including the transitive ones) and use org.apache.jackrabbit:oak-jackrabbit-api instead

pom.xml

diff --git a/pom.xml b/pom.xml
index fd95464..3aaad7e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,8 +35,8 @@
     <description>Implements a resource resolver type for Jackrabbit Oak that can be used in unit tests based on Sling Mocks.</description>
   
     <properties>
-        <oak.version>1.8.9</oak.version>
-        <jackrabbit.version>2.16.3</jackrabbit.version>
+        <oak.version>1.16.0</oak.version>
+        <jackrabbit.version>2.18.2</jackrabbit.version>
         <sling-mock.version>2.3.14</sling-mock.version>
     </properties>
 
@@ -70,6 +70,12 @@
             <artifactId>org.apache.sling.testing.sling-mock.core</artifactId>
             <version>${sling-mock.version}</version>
             <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.jackrabbit</groupId>
+                    <artifactId>jackrabbit-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
@@ -77,6 +83,12 @@
             <version>${sling-mock.version}</version>
             <classifier>tests</classifier>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.jackrabbit</groupId>
+                    <artifactId>jackrabbit-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     
         <dependency>
@@ -92,6 +104,12 @@
             <groupId>org.apache.jackrabbit</groupId>
             <artifactId>oak-jcr</artifactId>
             <version>${oak.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.jackrabbit</groupId>
+                    <artifactId>jackrabbit-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         
         <!-- Ensure we depend on more recent jackrabbit artifacts required by Oak -->
@@ -103,8 +121,8 @@
 
         <dependency>
             <groupId>org.apache.jackrabbit</groupId>
-            <artifactId>jackrabbit-api</artifactId>
-            <version>${jackrabbit.version}</version>
+            <artifactId>oak-jackrabbit-api</artifactId>
+            <version>${oak.version}</version>
         </dependency>
 
         <!-- those two compile dependencies are requires to avoid "Dependency-reduced POM written" endless loop in maven-shade-plugin -->
@@ -170,6 +188,9 @@
                         <includes>
                             <include>org.apache.jackrabbit:*</include>
                         </includes>
+                        <excludes>
+                            <include>org.apache.jackrabbit:oak-jackrabbit-api</include>
+                        </excludes>
                     </artifactSet>
                     <createSourcesJar>true</createSourcesJar>
                 </configuration>