This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new 3b1fb196ea OAK-10992: rdbmk: update to Derby 15.x (also affects
oak-jcr) (#1680)
3b1fb196ea is described below
commit 3b1fb196ea534a2d9ea0f3838a11139ef7ae8723
Author: Julian Reschke <[email protected]>
AuthorDate: Tue Sep 3 10:48:41 2024 +0200
OAK-10992: rdbmk: update to Derby 15.x (also affects oak-jcr) (#1680)
* OAK-10992: rdbmk: update to Derby 15.x (also affects oak-jcr)
* OAK-10992: rdbmk: update to Derby 15.x (oak-upgrade)
---
oak-jcr/pom.xml | 8 ++++++++
oak-parent/pom.xml | 7 ++++++-
oak-upgrade/pom.xml | 8 ++++++++
3 files changed, 22 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>
diff --git a/oak-upgrade/pom.xml b/oak-upgrade/pom.xml
index f25b184777..4616095b6d 100644
--- a/oak-upgrade/pom.xml
+++ b/oak-upgrade/pom.xml
@@ -242,12 +242,20 @@
<version>${project.version}</version>
<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>com.h2database</groupId>
<artifactId>h2</artifactId>
