This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch feature/SLING-12287-oak-1.22
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock-oak.git
commit 715c7bbbcee58d8eef53e1f02b2898747d3eb902
Author: Stefan Seifert <stefanseif...@users.noreply.github.com>
AuthorDate: Fri Apr 12 08:51:41 2024 +0200
SLING-12287 Switch back to Oak 1.22, which is the officially support
"legacy" version of oak
switch back to parent 52 and limit build to java 11, as build with the old
oak version is not working with Java 17+
---
.sling-module.json | 2 +-
pom.xml | 14 +++++++++++---
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/.sling-module.json b/.sling-module.json
index cfad4d2..17d8b22 100644
--- a/.sling-module.json
+++ b/.sling-module.json
@@ -1,5 +1,5 @@
{
"jenkins": {
- "jdks": [17, 21]
+ "jdks": [11]
}
}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 2917c2c..1469ba0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling-bundle-parent</artifactId>
- <version>60</version>
+ <version>52</version>
<relativePath />
</parent>
<artifactId>org.apache.sling.testing.sling-mock-oak</artifactId>
- <version>3.2.0-1.44.0-SNAPSHOT</version>
+ <version>3.2.0-1.22.15-SNAPSHOT</version>
<!-- second component is the oak version, please keep in sync with
oak.version property -->
<packaging>jar</packaging>
@@ -43,7 +43,7 @@
</scm>
<properties>
- <oak.version>1.44.0</oak.version>
+ <oak.version>1.22.15</oak.version>
<jackrabbit.version>2.20.9</jackrabbit.version>
<sling-mock.version>3.5.0-SNAPSHOT</sling-mock.version>
@@ -109,6 +109,14 @@
</exclusions>
</dependency>
+ <!-- Embed Guava version required by Oak 1.22 -->
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>15.0</version>
+ <scope>compile</scope>
+ </dependency>
+
<!-- Ensure we depend on more recent jackrabbit artifacts required by
Oak -->
<dependency>
<groupId>org.apache.jackrabbit</groupId>
