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 2026/09/28 12:59:23 UTC

(jackrabbit-oak) branch OAK-10339 updated (9cc98aacf1 -> e337f86b3a)

This is an automated email from the ASF dual-hosted git repository.

reschke pushed a change to branch OAK-10339
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git


    from 9cc98aacf1 OAK-10339: Migrate to SLF4J 2.x
     add c1c95bea04 OAK-12353: Group Elasticsearch dynamic boost nested documents by boost score (#3079)
     add c731214129 OAK-12378: Avoid allocating a new Comparator on every PropertyTemplate.compareTo() call (#3095)
     add 6aa6700eed OAK-12354: Use contemporary crypto algorithms for testing in oak-auth-ldap (#3080)
     add 319de75788 OAK-12305: Update OSGi-related dependencies of oak-pojosr (#3013)
     add 7620eac05e OAK-12355: Groovy 3.0.25 doesn't support Java 26. (#3081)
     add 82208b87ca OAK-12249: lazy ES index provisioning — skip creation for empty reindex (#3085)
     add f17a1c5749 OAK-12377 : bump aws sdk to 2.37.5 (#3094)
     add 7c166cf564 OAK-12376 : bump mongo driver version to 5.4.0 (#3093)
     add 0b5faefedb OAK-12379 also output the stack when the session was closed (#3096)
     add 25a98ad0d5 Revert "OAK-12249: lazy ES index provisioning — skip creation for empty reind…" (#3099)
     add 87f46fa41d OAK-12249: lazy ES index provisioning — skip creation for empty reindex (#3100)
     add fa9a8d5c86 Revert "OAK-12249: lazy ES index provisioning — skip creation for empty reindex (#3100)"
     add 1a519dcc9d OAK-12310: oak-search-elastic - add package-info files for packages exported since 2.2.0 (#3088)
     add ef7d93e7c4 OAK-12372: ignore Lucene facet properties that are too long (#3091)
     add 3cf533d253 OAK-12249: lazy ES index provisioning — skip creation for empty reindex (#3107)
     add 535be7951c OAK-12291: oak-pojosr: update org.apache.sling.commons.logservice (#2993)
     add 8871877dc8 OAK-12384 : bump commons-codec to 1.22.1 (#3098)
     add 51c473387b OAK-12388 : bump junit-bom to 5.14.4 (#3103)
     add 123637b6d1 OAK-12386 : bump junit to 4.13.2 (#3101)
     add b53329d7f0 OAK-12387 : bump jetbrains annotations to 26.1.0 (#3102)
     add 0903f12a75 OAK-12389 : bump easymock to 5.7.0 (#3104)
     add 95d8989566 OAK-12319 : bump commons-io to 2.22.0 (#3105)
     add f26e243d22 OAK-12391 : bump tomcat to 9.0.121 (#3108)
     add 5743903eac OAK-12365: Delete stale index document when a node's last aggregated property is removed (#3086)
     add 89f7453128 OAK-12393 : bump mysql-connector version 9.3.0 (#3111)
     add 263f6e508f OAK-12396 : fix countDirectChildren depth (#3114)
     add 75e4002646 OAK-12398 : fix split package issue caused by CacheMaintenanceExecutor (#3117)
     add c88c456f44 OAK-12173: Query traverses even with correct index, at startup (#3119)
     add 9595d3fde5 OAK-12366: bump elasticsearch to v 9.5.3 (#3120)
     add 3042ef8787 OAK-12380: The export-package manifest header of oak-search-elastic contains a class name. (#3097)
     add bffc31a2fd OAK-12307: Indexing a disabled index without async leads to a sync index (#3065)
     add 4c880eba76 OAK-12407: bump elasticsearch to v9.5.4 (#3136)
     add 69b77e2d18 OAK-12364: XPath queries fail to parse if they contain invalid XML characters (#3121) (#3122)
     add 25d9463e79 OAK-12401: cap the ISCHILDNODE cost estimate at 1000 (#3131) (#3138)
     add 09b92f74e4 OAK-12402: Add allocation-free primitive checkArgument overloads to Validate (#3132)
     add 0cf52dfba4 OAK-12410: Create a Workaround for COLLECTIONS-900 in IteratorUtils (#3144)
     add fa5479a5dd OAK-12374: Update commons-collections4 to 4.6.0 (#3092)
     add efbbf206d5 OAK-12405 : initialize the comparator only once (#3145)
     add dac516587c OAK-12409: bump netty to 4.1.138.Final (#3155)
     add 3941fd3667 OAK-12411: Avoid allocation and cache hash code in Template.hashCode() (#3146)
     add 8c63b46952 OAK-12413: Pre-size predictable ArrayList allocations in the compaction write path (#3148)
     add ceaadab91c OAK-12414: Simplify and pre-size list-record bucket construction in DefaultSegmentWriter (#3149)
     add dd75d84e8d OAK-12417: Avoid UUID allocation and add O(1) index for in-archive segment lookup (#3151)
     add 1a83b3550d Revert "OAK-12374: Update commons-collections4 to 4.6.0 (#3092)"
     add ad100bf03a OAK-12412: Cache RecordType.values() in ImmutableRecordNumbers and MutableRecordNumbers (#3147)
     add 1480ff891f OAK-12421 - ForkJoinUtilsTest can be flaky (#3162)
     new e337f86b3a OAK-10339: 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:
 .../authentication/ldap/AbstractServer.java        |  10 +-
 .../authentication/ldap/apacheds-server.p12        | Bin 0 -> 2568 bytes
 .../jackrabbit/oak/benchmark/util/TestHelper.java  |   4 +-
 .../oak/commons/collections/IteratorUtils.java     |  28 +-
 .../oak/commons/conditions/Validate.java           |  40 +++
 .../oak/commons/conditions/package-info.java       |   2 +-
 .../oak/commons/collections/IteratorUtilsTest.java |  14 +
 .../oak/commons/conditions/ValidateTest.java       |  40 +++
 .../internal/concurrent/ForkJoinUtilsTest.java     |   7 +-
 .../jackrabbit/oak/cache/api/CacheBuilder.java     |   2 +-
 .../CacheMaintenanceExecutor.java                  |   2 +-
 .../CacheBuilderMaintenanceTest.java               |   2 +-
 .../CacheMaintenanceExecutorTest.java              |   2 +-
 .../main/java/org/apache/jackrabbit/oak/Oak.java   |   8 +
 .../oak/plugins/index/IndexerMBeanImpl.java        |  17 +-
 .../oak/plugins/index/importer/IndexImporter.java  |  59 +++-
 .../oak/plugins/index/importer/package-info.java   |   2 +-
 .../jackrabbit/oak/query/QueryEngineSettings.java  |  12 +
 .../oak/query/xpath/XPathToSQL2Converter.java      |   6 +-
 .../oak/plugins/index/IndexerMBeanImplTest.java    | 190 ++++++++++++
 .../plugins/index/importer/IndexImporterTest.java  |  68 +++++
 .../org/apache/jackrabbit/oak/query/XPathTest.java |  14 +
 .../oak/query/index/TraversingIndexQueryTest.java  |   9 +
 .../oak/query/xpath/XPathToSQL2Test.java           |  42 +++
 oak-examples/standalone/pom.xml                    |   2 +-
 oak-examples/webapp/pom.xml                        |   2 +-
 .../oak/jcr/delegate/SessionDelegate.java          |   6 +-
 oak-lucene/pom.xml                                 |   2 +-
 .../oak/plugins/index/lucene/IndexTracker.java     |  11 +
 .../plugins/index/lucene/LuceneDocumentMaker.java  |  40 ++-
 .../index/lucene/LuceneIndexProviderService.java   |  25 ++
 .../plugins/index/lucene/LucenePropertyIndex.java  |  19 +-
 .../oak/plugins/index/lucene/IndexTrackerTest.java |  83 ++++++
 .../index/lucene/LuceneDocumentMakerTest.java      |  69 ++++-
 .../index/lucene/LuceneIndexEditor2Test.java       | 116 ++++++++
 ...neIndexProviderServiceTrackerSeedQueryTest.java | 177 +++++++++++
 .../LuceneIndexProviderServiceTrackerSeedTest.java | 151 ++++++++++
 .../LucenePropertyIndexLazyNotReadyTest.java       | 132 +++++++++
 oak-parent/pom.xml                                 |  37 ++-
 oak-pojosr/pom.xml                                 |  54 ++--
 .../oak/index/IndexImporterSupportBase.java        |   5 +-
 oak-run-elastic/pom.xml                            |   3 +-
 .../ElasticPurgeOldIndexVersionTest.java           |  30 +-
 oak-run/pom.xml                                    |  15 +-
 .../jackrabbit/oak/console/GroovyConsole.groovy    |  42 ++-
 .../oak/console/commands/CdCommand.groovy          |   8 +-
 .../oak/console/commands/CheckpointCommand.groovy  |   4 +-
 .../oak/console/commands/ExportCommand.groovy      |   4 +-
 .../commands/ExportRelevantDocumentsCommand.groovy |   4 +-
 .../oak/console/commands/LsCommand.groovy          |   4 +-
 .../oak/console/commands/LsdDocumentCommand.groovy |   4 +-
 .../oak/console/commands/LuceneCommand.groovy      |   4 +-
 .../oak/console/commands/OakHelpCommand.groovy     |  10 +-
 .../oak/console/commands/PnCommand.groovy          |   4 +-
 .../console/commands/PrintDocumentCommand.groovy   |   4 +-
 .../oak/console/commands/RefreshCommand.groovy     |   4 +-
 .../oak/console/commands/RetrieveCommand.groovy    |   4 +-
 oak-run/src/main/js/oak-mongo.js                   |  12 +-
 oak-search-elastic/pom.xml                         |  26 +-
 .../plugins/index/elastic/ElasticConnection.java   |  46 ++-
 .../plugins/index/elastic/ElasticIndexCleaner.java |   2 +-
 .../index/elastic/ElasticIndexDefinition.java      |  11 +
 .../index/elastic/ElasticIndexProviderService.java |  18 +-
 .../index/elastic/ElasticIndexStatistics.java      |   2 +-
 ...dexWriter.java => EagerElasticIndexWriter.java} |  77 ++---
 .../elastic/index/ElasticBulkProcessorHandler.java |   3 +-
 .../index/elastic/index/ElasticDocument.java       |  58 +++-
 .../elastic/index/ElasticIndexEditorContext.java   |   5 -
 .../elastic/index/ElasticIndexEditorProvider.java  |  37 +++
 .../index/elastic/index/ElasticIndexHelper.java    |  12 +-
 .../index/elastic/index/ElasticIndexWriter.java    | 329 +--------------------
 .../elastic/index/ElasticIndexWriterFactory.java   |  19 +-
 .../elastic/index/LazyElasticIndexWriter.java      | 134 +++++++++
 .../plugins/index/elastic/index}/package-info.java |  44 +--
 .../elastic/internal/ElasticFeatureToggles.java    |  45 +++
 .../oak/plugins/index/elastic}/package-info.java   |  44 +--
 .../index/elastic/query/ElasticRequestHandler.java |  16 +-
 .../plugins/index/elastic/query}/package-info.java |  44 +--
 .../plugins/index/elastic/util}/package-info.java  |  40 +--
 .../index/elastic/ElasticAbstractQueryTest.java    |   2 +-
 .../index/elastic/ElasticConnectionTest.java       |  34 +++
 .../index/elastic/ElasticDynamicBoostTest.java     |  79 +++++
 .../index/elastic/ElasticFullTextAnalyzerTest.java |  23 --
 .../index/elastic/ElasticReliabilityTest.java      |   2 +-
 .../index/elastic/ElasticSimilarQueryTest.java     |   6 +-
 .../index/elastic/index/ElasticDocumentTest.java   | 101 +++++++
 .../elastic/index/ElasticIndexWriterITTest.java    |  13 +-
 .../elastic/index/ElasticIndexWriterTest.java      | 119 +++++++-
 .../index/LazyProvisioningReindexITTest.java       |  89 ++++++
 .../index/search/FulltextIndexConstants.java       |   2 +-
 .../search/spi/editor/FulltextIndexEditor.java     |  21 ++
 .../search/spi/query/FulltextIndexPlanner.java     |  22 +-
 .../oak/plugins/index/IndexPlannerCommonTest.java  |  45 +++
 .../oak/plugins/index/PropertyIndexCommonTest.java |  27 ++
 .../remote/AbstractRemoteSegmentArchiveReader.java |  37 ++-
 .../oak/segment/remote/SegmentIndex.java           | 149 ++++++++++
 .../oak/segment/remote/SegmentIndexTest.java       | 125 ++++++++
 .../oak/segment/DefaultSegmentWriter.java          |  29 +-
 .../oak/segment/ImmutableRecordNumbers.java        |   4 +-
 .../apache/jackrabbit/oak/segment/MapEntry.java    |  10 +-
 .../oak/segment/MutableRecordNumbers.java          |   5 +-
 .../jackrabbit/oak/segment/PropertyTemplate.java   |  10 +-
 .../apache/jackrabbit/oak/segment/Template.java    |  30 +-
 oak-store-document/pom.xml                         |   4 +-
 104 files changed, 2926 insertions(+), 745 deletions(-)
 create mode 100644 oak-auth-ldap/src/test/resources/org/apache/jackrabbit/oak/security/authentication/ldap/apacheds-server.p12
 rename oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/{ => maintenance}/CacheMaintenanceExecutor.java (98%)
 rename oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/{ => maintenance}/CacheBuilderMaintenanceTest.java (99%)
 rename oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/{ => maintenance}/CacheMaintenanceExecutorTest.java (96%)
 create mode 100644 oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexerMBeanImplTest.java
 create mode 100644 oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderServiceTrackerSeedQueryTest.java
 create mode 100644 oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderServiceTrackerSeedTest.java
 create mode 100644 oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexLazyNotReadyTest.java
 copy oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/{ElasticIndexWriter.java => EagerElasticIndexWriter.java} (87%)
 create mode 100644 oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/LazyElasticIndexWriter.java
 copy {oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote => oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index}/package-info.java (88%)
 create mode 100644 oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/internal/ElasticFeatureToggles.java
 copy {oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote => oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic}/package-info.java (89%)
 copy {oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote => oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query}/package-info.java (88%)
 copy {oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug => oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/util}/package-info.java (89%)
 create mode 100644 oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticDocumentTest.java
 create mode 100644 oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/LazyProvisioningReindexITTest.java
 create mode 100644 oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote/SegmentIndex.java
 create mode 100644 oak-segment-remote/src/test/java/org/apache/jackrabbit/oak/segment/remote/SegmentIndexTest.java


(jackrabbit-oak) 01/01: OAK-10339: 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-10339
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git

commit e337f86b3a497cb61d110c57b94cfa7b8b4e4f7b
Merge: 9cc98aacf1 1480ff891f
Author: Julian Reschke <ju...@gmx.de>
AuthorDate: Mon Sep 28 13:59:04 2026 +0100

    OAK-10339: merge trunk

 .../authentication/ldap/AbstractServer.java        |  10 +-
 .../authentication/ldap/apacheds-server.p12        | Bin 0 -> 2568 bytes
 .../jackrabbit/oak/benchmark/util/TestHelper.java  |   4 +-
 .../oak/commons/collections/IteratorUtils.java     |  28 +-
 .../oak/commons/conditions/Validate.java           |  40 +++
 .../oak/commons/conditions/package-info.java       |   2 +-
 .../oak/commons/collections/IteratorUtilsTest.java |  14 +
 .../oak/commons/conditions/ValidateTest.java       |  40 +++
 .../internal/concurrent/ForkJoinUtilsTest.java     |   7 +-
 .../jackrabbit/oak/cache/api/CacheBuilder.java     |   2 +-
 .../CacheMaintenanceExecutor.java                  |   2 +-
 .../CacheBuilderMaintenanceTest.java               |   2 +-
 .../CacheMaintenanceExecutorTest.java              |   2 +-
 .../main/java/org/apache/jackrabbit/oak/Oak.java   |   8 +
 .../oak/plugins/index/IndexerMBeanImpl.java        |  17 +-
 .../oak/plugins/index/importer/IndexImporter.java  |  59 +++-
 .../oak/plugins/index/importer/package-info.java   |   2 +-
 .../jackrabbit/oak/query/QueryEngineSettings.java  |  12 +
 .../oak/query/xpath/XPathToSQL2Converter.java      |   6 +-
 .../oak/plugins/index/IndexerMBeanImplTest.java    | 190 ++++++++++++
 .../plugins/index/importer/IndexImporterTest.java  |  68 +++++
 .../org/apache/jackrabbit/oak/query/XPathTest.java |  14 +
 .../oak/query/index/TraversingIndexQueryTest.java  |   9 +
 .../oak/query/xpath/XPathToSQL2Test.java           |  42 +++
 oak-examples/standalone/pom.xml                    |   2 +-
 oak-examples/webapp/pom.xml                        |   2 +-
 .../oak/jcr/delegate/SessionDelegate.java          |   6 +-
 oak-lucene/pom.xml                                 |   2 +-
 .../oak/plugins/index/lucene/IndexTracker.java     |  11 +
 .../plugins/index/lucene/LuceneDocumentMaker.java  |  40 ++-
 .../index/lucene/LuceneIndexProviderService.java   |  25 ++
 .../plugins/index/lucene/LucenePropertyIndex.java  |  19 +-
 .../oak/plugins/index/lucene/IndexTrackerTest.java |  83 ++++++
 .../index/lucene/LuceneDocumentMakerTest.java      |  69 ++++-
 .../index/lucene/LuceneIndexEditor2Test.java       | 116 ++++++++
 ...neIndexProviderServiceTrackerSeedQueryTest.java | 177 +++++++++++
 .../LuceneIndexProviderServiceTrackerSeedTest.java | 151 ++++++++++
 .../LucenePropertyIndexLazyNotReadyTest.java       | 132 +++++++++
 oak-parent/pom.xml                                 |  37 ++-
 oak-pojosr/pom.xml                                 |  54 ++--
 .../oak/index/IndexImporterSupportBase.java        |   5 +-
 oak-run-elastic/pom.xml                            |   3 +-
 .../ElasticPurgeOldIndexVersionTest.java           |  30 +-
 oak-run/pom.xml                                    |  15 +-
 .../jackrabbit/oak/console/GroovyConsole.groovy    |  42 ++-
 .../oak/console/commands/CdCommand.groovy          |   8 +-
 .../oak/console/commands/CheckpointCommand.groovy  |   4 +-
 .../oak/console/commands/ExportCommand.groovy      |   4 +-
 .../commands/ExportRelevantDocumentsCommand.groovy |   4 +-
 .../oak/console/commands/LsCommand.groovy          |   4 +-
 .../oak/console/commands/LsdDocumentCommand.groovy |   4 +-
 .../oak/console/commands/LuceneCommand.groovy      |   4 +-
 .../oak/console/commands/OakHelpCommand.groovy     |  10 +-
 .../oak/console/commands/PnCommand.groovy          |   4 +-
 .../console/commands/PrintDocumentCommand.groovy   |   4 +-
 .../oak/console/commands/RefreshCommand.groovy     |   4 +-
 .../oak/console/commands/RetrieveCommand.groovy    |   4 +-
 oak-run/src/main/js/oak-mongo.js                   |  12 +-
 oak-search-elastic/pom.xml                         |  26 +-
 .../plugins/index/elastic/ElasticConnection.java   |  46 ++-
 .../plugins/index/elastic/ElasticIndexCleaner.java |   2 +-
 .../index/elastic/ElasticIndexDefinition.java      |  11 +
 .../index/elastic/ElasticIndexProviderService.java |  18 +-
 .../index/elastic/ElasticIndexStatistics.java      |   2 +-
 ...dexWriter.java => EagerElasticIndexWriter.java} |  77 ++---
 .../elastic/index/ElasticBulkProcessorHandler.java |   3 +-
 .../index/elastic/index/ElasticDocument.java       |  58 +++-
 .../elastic/index/ElasticIndexEditorContext.java   |   5 -
 .../elastic/index/ElasticIndexEditorProvider.java  |  37 +++
 .../index/elastic/index/ElasticIndexHelper.java    |  12 +-
 .../index/elastic/index/ElasticIndexWriter.java    | 329 +--------------------
 .../elastic/index/ElasticIndexWriterFactory.java   |  19 +-
 .../elastic/index/LazyElasticIndexWriter.java      | 134 +++++++++
 .../plugins/index/elastic/index}/package-info.java |  42 +--
 .../elastic/internal/ElasticFeatureToggles.java    |  45 +++
 .../oak/plugins/index/elastic}/package-info.java   |  42 +--
 .../index/elastic/query/ElasticRequestHandler.java |  16 +-
 .../plugins/index/elastic/query}/package-info.java |  42 +--
 .../plugins/index/elastic/util}/package-info.java  |  40 +--
 .../index/elastic/ElasticAbstractQueryTest.java    |   2 +-
 .../index/elastic/ElasticConnectionTest.java       |  34 +++
 .../index/elastic/ElasticDynamicBoostTest.java     |  79 +++++
 .../index/elastic/ElasticFullTextAnalyzerTest.java |  23 --
 .../index/elastic/ElasticReliabilityTest.java      |   2 +-
 .../index/elastic/ElasticSimilarQueryTest.java     |   6 +-
 .../index/elastic/index/ElasticDocumentTest.java   | 101 +++++++
 .../elastic/index/ElasticIndexWriterITTest.java    |  13 +-
 .../elastic/index/ElasticIndexWriterTest.java      | 119 +++++++-
 .../index/LazyProvisioningReindexITTest.java       |  89 ++++++
 .../index/search/FulltextIndexConstants.java       |   2 +-
 .../search/spi/editor/FulltextIndexEditor.java     |  21 ++
 .../search/spi/query/FulltextIndexPlanner.java     |  22 +-
 .../oak/plugins/index/IndexPlannerCommonTest.java  |  45 +++
 .../oak/plugins/index/PropertyIndexCommonTest.java |  27 ++
 .../remote/AbstractRemoteSegmentArchiveReader.java |  37 ++-
 .../oak/segment/remote/SegmentIndex.java           | 149 ++++++++++
 .../oak/segment/remote/SegmentIndexTest.java       | 125 ++++++++
 .../oak/segment/DefaultSegmentWriter.java          |  29 +-
 .../oak/segment/ImmutableRecordNumbers.java        |   4 +-
 .../apache/jackrabbit/oak/segment/MapEntry.java    |  10 +-
 .../oak/segment/MutableRecordNumbers.java          |   5 +-
 .../jackrabbit/oak/segment/PropertyTemplate.java   |  10 +-
 .../apache/jackrabbit/oak/segment/Template.java    |  30 +-
 oak-store-document/pom.xml                         |   4 +-
 104 files changed, 2926 insertions(+), 739 deletions(-)

diff --cc oak-parent/pom.xml
index 237ac7736c,a475b6c53c..756fb89189
--- a/oak-parent/pom.xml
+++ b/oak-parent/pom.xml
@@@ -58,10 -58,10 +58,10 @@@
      <mongo.version>3.6</mongo.version>
      <segment.db>SegmentMK</segment.db>
      <lucene.version>4.7.2</lucene.version>
 -    <mongo.driver.version>5.4.0</mongo.driver.version>
 +    <mongo.driver.version>5.3.1</mongo.driver.version>
-     <slf4j.api.version>2.0.18</slf4j.api.version>
-     <slf4j.version>2.0.18</slf4j.version> <!-- sync with logback version -->
-     <logback.version>1.6.3</logback.version>
+     <slf4j.api.version>1.7.36</slf4j.api.version>
+     <slf4j.version>1.7.36</slf4j.version> <!-- sync with logback version -->
+     <logback.version>1.2.13</logback.version>
      <h2.version>2.1.214</h2.version>
      <tika.version>1.28.5</tika.version>
      <derby.version>10.16.1.1</derby.version>
diff --cc oak-run-elastic/pom.xml
index 2ea30795c0,05b4ab1251..bd3838e632
--- a/oak-run-elastic/pom.xml
+++ b/oak-run-elastic/pom.xml
@@@ -45,8 -45,10 +45,7 @@@
          124 MB: Aws Sdk 2.x (OAK-11935)
          130 MB: Embed Aws Sdk 2.x in oak-blob-cloud (OAK-12008)
          142 MB: jackson update (OAK-12276)
-         -->
-         <max.jar.size>142000000</max.jar.size>
+         147 MB, Elasticsearch 9.5.x (OAK-12366)
 -        -->
 -        <max.jar.size>147000000</max.jar.size>
 -                      
      </properties>
  
      <build>