You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2023/05/12 07:09:39 UTC

[sling-org-apache-sling-testing-jcr-mock] branch feature/SLING-11870-oak-dep-management created (now 3a7426e)

This is an automated email from the ASF dual-hosted git repository.

sseifert pushed a change to branch feature/SLING-11870-oak-dep-management
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-jcr-mock.git


      at 3a7426e  SLING-11870 Use org.apache.jackrabbit:oak-jcr as only oak dependency

This branch includes the following new commits:

     new 3a7426e  SLING-11870 Use org.apache.jackrabbit:oak-jcr as only oak dependency

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



[sling-org-apache-sling-testing-jcr-mock] 01/01: SLING-11870 Use org.apache.jackrabbit:oak-jcr as only oak dependency

Posted by ss...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

sseifert pushed a commit to branch feature/SLING-11870-oak-dep-management
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-jcr-mock.git

commit 3a7426e4491786ddb8cfbd3ce11cdb3de93a5235
Author: Stefan Seifert <st...@users.noreply.github.com>
AuthorDate: Fri May 12 09:09:27 2023 +0200

    SLING-11870 Use org.apache.jackrabbit:oak-jcr as only oak dependency
---
 pom.xml | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index e96af82..0ad614b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,6 +43,8 @@
     
     <properties>
         <project.build.outputTimestamp>2023-04-23T19:19:52Z</project.build.outputTimestamp>
+        <oak.version>1.22.5</oak.version>
+        <jackrabbit.version>2.20.1</jackrabbit.version>
     </properties>
 
     <dependencies>
@@ -67,20 +69,40 @@
         <dependency>
             <groupId>org.apache.jackrabbit</groupId>
             <artifactId>jackrabbit-jcr-commons</artifactId>
-            <version>2.20.1</version>
+            <version>${jackrabbit.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.jackrabbit</groupId>
             <artifactId>oak-jackrabbit-api</artifactId>
-            <version>1.22.5</version>
+            <version>${oak.version}</version>
             <scope>compile</scope>
         </dependency>
+        <!-- Depend on oak-jcr to simplify Maven dependency management in downstream unit test contexts.
+             Some of Oak's helper classes are used in jcr-mock as well. -->
         <dependency>
             <groupId>org.apache.jackrabbit</groupId>
-            <artifactId>oak-security-spi</artifactId>
-            <version>1.22.5</version>
+            <artifactId>oak-jcr</artifactId>
+            <version>${oak.version}</version>
             <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.osgi</groupId>
+                    <artifactId>org.osgi.annotation</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.osgi</groupId>
+                    <artifactId>org.osgi.service.component.annotations</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.osgi</groupId>
+                    <artifactId>org.osgi.service.metatype.annotations</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>jcl-over-slf4j</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>