You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by kw...@apache.org on 2021/11/26 16:45:39 UTC
[sling-org-apache-sling-testing-sling-mock-oak] branch feature/SLING-10942-update-to-Oak1.40 created (now d55abb5)
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a change to branch feature/SLING-10942-update-to-Oak1.40
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock-oak.git.
at d55abb5 SLING-10942 update to Oak 1.40
This branch includes the following new commits:
new d55abb5 SLING-10942 update to Oak 1.40
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-sling-mock-oak] 01/01: SLING-10942 update to Oak 1.40
Posted by kw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch feature/SLING-10942-update-to-Oak1.40
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock-oak.git
commit d55abb5864fa5a23472296c5f4d31e3af4f8ec8d
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Fri Nov 26 17:45:28 2021 +0100
SLING-10942 update to Oak 1.40
---
pom.xml | 23 +++++------------------
1 file changed, 5 insertions(+), 18 deletions(-)
diff --git a/pom.xml b/pom.xml
index 830ae0e..b0eb7e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,15 +28,15 @@
</parent>
<artifactId>org.apache.sling.testing.sling-mock-oak</artifactId>
- <version>3.0.1-1.16.0-SNAPSHOT</version> <!-- second component is the oak version, please keep in sync with oak.version property -->
+ <version>3.0.1-1.40.0-SNAPSHOT</version> <!-- second component is the oak version, please keep in sync with oak.version property -->
<packaging>jar</packaging>
<name>Apache Sling Testing Sling Mock Oak</name>
<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.16.0</oak.version>
- <jackrabbit.version>2.18.2</jackrabbit.version>
+ <oak.version>1.40.0</oak.version>
+ <jackrabbit.version>2.20.2</jackrabbit.version>
<sling-mock.version>3.1.2</sling-mock.version>
<project.build.outputTimestamp>2021-08-30T16:55:49Z</project.build.outputTimestamp>
@@ -67,12 +67,6 @@
<artifactId>org.apache.sling.testing.sling-mock.core</artifactId>
<version>${sling-mock.version}</version>
<scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
@@ -80,14 +74,7 @@
<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>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.sling-mock.junit4</artifactId>
@@ -180,7 +167,7 @@
<artifactId>maven-shade-plugin</artifactId>
<configuration>
<!--
- embed all jackrabbit artifacts to prevent classpath clashes
+ embed all jackrabbit artifacts, to prevent classpath clashes
also include selected Sling bundles which are required
at runtime. Note that we don't relocate the packages
since org.apache.sling.jcr.resource already embeds some
@@ -191,7 +178,7 @@
<include>org.apache.jackrabbit:*</include>
</includes>
<excludes>
- <include>org.apache.jackrabbit:oak-jackrabbit-api</include>
+ <exclude>org.apache.jackrabbit:oak-jackrabbit-api</exclude>
</excludes>
</artifactSet>
<createSourcesJar>true</createSourcesJar>