You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2024/09/02 16:32:38 UTC
(jackrabbit-oak) 01/01: OAK-10992: rdbmk: update to Derby 15.x (also affects oak-jcr)
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch OAK-10992b
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit c3c48a9c9611f4f9fe1271d146a6f46144f3cdf0
Author: Julian Reschke <ju...@gmx.de>
AuthorDate: Mon Sep 2 17:32:17 2024 +0100
OAK-10992: rdbmk: update to Derby 15.x (also affects oak-jcr)
---
oak-jcr/pom.xml | 8 ++++++++
oak-parent/pom.xml | 7 ++++++-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/oak-jcr/pom.xml b/oak-jcr/pom.xml
index 8b8fd7878d..2c2567c46e 100644
--- a/oak-jcr/pom.xml
+++ b/oak-jcr/pom.xml
@@ -497,12 +497,20 @@
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
+
+ <!-- test dependency of classic Jackrabbit -->
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>${derby.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbytools</artifactId>
+ <version>${derby.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>junit-addons</groupId>
diff --git a/oak-parent/pom.xml b/oak-parent/pom.xml
index 8fa08f06d9..c886906185 100644
--- a/oak-parent/pom.xml
+++ b/oak-parent/pom.xml
@@ -64,7 +64,7 @@
<logback.version>1.2.13</logback.version>
<h2.version>2.1.214</h2.version>
<tika.version>1.28.5</tika.version>
- <derby.version>10.14.2.0</derby.version>
+ <derby.version>10.15.2.0</derby.version>
<jackson.version>2.17.1</jackson.version>
<testcontainers.version>1.20.1</testcontainers.version>
<pax-exam.version>4.13.1</pax-exam.version>
@@ -1002,6 +1002,11 @@
<artifactId>derby</artifactId>
<version>${derby.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyshared</artifactId>
+ <version>${derby.version}</version>
+ </dependency>
</dependencies>
</profile>