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 2023/01/13 09:14:17 UTC
[jackrabbit-oak] branch OAK-10001 updated (ef4f980802 -> 7ac4bfca9b)
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a change to branch OAK-10001
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
from ef4f980802 merge trunk
add 3e781c7798 OAK-10062: consolidate and update groovy versions to 2.4.21
add dee89565e4 OAK-10056 : provided support for jakarta & hyderabad region for S3
add dc4a0ba7bd Merge pull request #816 from rishabhdaim/OAK-10056
add ed19990895 OAK-10034 : created an background thread to purge unmerged branch commits and collision markers for non active clusters
add 00ac096cbb OAK-10034 : added additional check to check for lastWrittenRootRev before purging for inactive clusters
add df53ab2ae7 OAK-10034 : moved olderThanLastWrittenRootRev Predicate to ClusterNodeInfoDocument
add 2cb1cd3cb0 Merge pull request #812 from rishabhdaim/OAK-10034
add 4c0171f499 OAK-10065: avoid-use of groovy-all artefact (#821)
add 3b3e72a784 OAK-10065: avoid-use of groovy-all artefact
add fb9cd38b8d OAK-10066: update groovy dependency to 2.5.20 (#822)
new 7ac4bfca9b merge trunk
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.
Summary of changes:
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(-)
[jackrabbit-oak] 01/01: merge trunk
Posted by re...@apache.org.
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 <ju...@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