This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch OAK-10001
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 7ac4bfca9ba84ccd6fe0f89a5c35010a66fb4734
Merge: ef4f980802 fb9cd38b8d
Author: Julian Reschke <julian.resc...@gmx.de>
AuthorDate: Fri Jan 13 10:14:07 2023 +0100
merge trunk
oak-blob-cloud/pom.xml | 2 +-
oak-examples/standalone/pom.xml | 4 +-
oak-examples/webapp/pom.xml | 2 +-
oak-parent/pom.xml | 3 +-
oak-pojosr/pom.xml | 14 ++-
oak-run/pom.xml | 17 +++-
.../oak/console/commands/ExportCommand.groovy | 1 +
.../commands/ExportRelevantDocumentsCommand.groovy | 1 +
oak-segment-aws/pom.xml | 2 +-
.../plugins/document/ClusterNodeInfoDocument.java | 17 ++++
.../oak/plugins/document/DocumentNodeStore.java | 48 ++++++++-
.../oak/plugins/document/NodeDocument.java | 19 ++--
.../oak/plugins/document/UnmergedBranches.java | 21 +++-
.../oak/plugins/document/NodeDocumentTest.java | 107 +++++++++++++++++++--
14 files changed, 230 insertions(+), 28 deletions(-)
diff --cc oak-parent/pom.xml
index 4d49cacb5c,e32681e601..48514b5528
--- a/oak-parent/pom.xml
+++ b/oak-parent/pom.xml
@@@ -68,9 -68,9 +68,8 @@@
<jackson.version>2.13.4</jackson.version>
<testcontainers.version>1.17.5</testcontainers.version>
<pax-exam.version>4.13.1</pax-exam.version>
- <groovy.version>2.4.21</groovy.version>
+ <groovy.version>2.5.20</groovy.version>
- <java.version>1.8</java.version>
- <java.version.signature>java18</java.version.signature>
+ <java.version>11</java.version>
-
<!-- specifies on which fixture to run the integration testing tests.
override in profiles or provide from command line to change behaviour.
Provide
