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 th...@apache.org on 2026/08/10 09:18:32 UTC

(jackrabbit-oak) branch OAK-12089 updated (0dba7cd652 -> 779fbf8b79)

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

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


    from 0dba7cd652 OAK-12238: oak-upgrade: do not override Jackrabbit's Lucene version (for now) (#2931)
     add 70db73d984 OAK-12240: pojosr: remove jackrabbit-data dependency (#2935)
     add ff6ae07e42 OAK-12243 : clarified when an package has been exported (#2937)
     add cbd1b92c1b OAK-12245: update Tomcat dependency to 9.0.118 (#2942)
     add 7701c06ad4 OAK-10578 avoid access to the OSGI registry (#2936)
     add 5bbb07cc3a OAK-12242: Remove embedded verification feature toggle (#2939)
     add a9f1f9e5b2 OAK-12250: update and consolidate hamcrest dependencies (#2944) (ack bhabegger)
     add 0965627d80 OAK-12254: Upgrade mockito-core to 5.23.0 (#2948)
     add 34c7818182 OAK-12252 : removed FULL_GC Feature toggle (#2946)
     add 77bb16dee4 Configure GitHub workflows to use concurrency cancel-in-progress for pull requests
     add cf5f523e0a Use Commit Check action version v2.7.0 (f237ed0085f49444ab5c85bdfa5cdcd490fc09c5)
     add e3cb4e8f1a OAK-12256: document Feature Toggles (#2952)
     add 27e009ef0e OAK-12125: gracefully handle property index missing propertyNames (#2924) (#2926)
     add 03499ab99d OAK-12260 improve cleanup of expired tokens (#2958)
     add 89f2b13e8a OAK-12257: update commit-check plugin to 2.8 (#2960)
     add 8c1e52dd60 OAK-12258: add isFlattened documentation in elastic.md (#2956)
     add cf04a4ecbe OAK-12267 : renew the lease after each background operation (#2962)
     add 12d08321cf OAK-12264: oak-run: sync commons-csv dependency with other modules (#2963)
     add aeaf421c8e OAK-12262 Simplified index mgmt: support indexes without version number (#2961)
     add 77d365073c OAK-12241 : support for S3 tests for oak-blob-cloud to run on S3Mock (#2964)
     add 7d1f742f69 OAK-12272 : increase commit message length to 120 characters (#2965)
     add 72a21df149 OAK-12248: graceful 404 when ES alias is not yet provisioned (#2950)
     add c256918b96 OAK-12273 : added https link for fetching java-docs (#2966)
     add 939aee6c26 OAK-12274: shaded-guava: exclude errorprone dependency (#2968)
     add 908d3164e0 OAK-12265: remove json-simple dependency in oak-pojosr (#2971)
     add 1aee3adee8 OAK-12281: Upgrade jackson-databind dependency to 2.20.2 (#2976)
     add d422aabd3d OAK-12275: NameValidator -> improve logging for unmapped prefixes (#2974)
     add b2f1f35c2f OAK-12283 : bump aws sdk to 2.35.11 (#2979)
     add 2c0c7625ac Revert "OAK-12281: Upgrade jackson-databind dependency to 2.20.2 (#2976)"
     add a6f84489b9 oak-http: extract Authorization Field parsing and add test coverage (#2981)
     add dfa1a3a045 OAK-12285 : fixed issue where SSE-KMS presigned urls were getting ski… (#2980)
     add 0a4ecb3e34 OAK-12288 : disabled blob id tracking for segment node store (#2985)
     add f6cfb14a9e OAK-12289 : disabled blob id tracking for document node store (#2987)
     add 009d96f482 OAK-12287: Update to Apache Parent POM to version 39
     add b73a39916a OAK-12287: Update to Apache Parent POM to version 39 - revert removal of bundle-plugin version
     add 3ce3b66a92 Merge pull request #2984 from apache/OAK-12287
     add 386223e315 OAK-12259: oak-http: OakServlet mis-parses HTTP Basic credentials
     add ebf05973fd OAK-12293 : bump commons-io to 2.21.0 (#2997)
     add ac0fa02d67 OAK-12294 : bump commons-codec to 1.20.0 (#2998)
     add 480eb14540 OAK-12295 : bump mongo-driver-sync to 5.3.1 (#3001)
     add a71cfa3f47 OAK-12296 : bump testcontainers version to 2.0.3 (#3002)
     add 6cfac19789 OAK-12244: index nodes that gain a mixin rule, delete stale docs when… (#2949)
     add 045951c9ea OAK-12282 : defining a fixed bound for the AbstractDiskCache (#2978)
     add bead8ea6f1 OAK-12303: Update mina-core dependency version to 2.1.15 (#3008) (#3010)
     add 69a6c68ac6 Revert "OAK-12295 : bump mongo-driver-sync to 5.3.1 (#3001)" (#3012)
     add 7a782c84e5 OAK-12292: Candidate Release Notes
     add 92860e0916 [maven-release-plugin] prepare release jackrabbit-oak-2.4.0
     add 78c17b812a [maven-release-plugin] prepare for next development iteration
     add 0c357db721 Revert "[maven-release-plugin] prepare for next development iteration"
     add 8073daf5ff Revert "[maven-release-plugin] prepare release jackrabbit-oak-2.4.0"
     add 4edd33a519 [maven-release-plugin] prepare release jackrabbit-oak-2.4.0
     add d1a2c15456 [maven-release-plugin] prepare for next development iteration
     add 4be0b387f6 OAK-12292: Oak 2.4.0 Release
     add 8f3b2fa2da OAK-12312: oak-pojosr: remove unintended org.testcontainers.shaded.com.fasterxml.jackson import (#3024)
     add e3b90971e3 OAK-12311: parent: jackson version - warn wrt non-LTS versions (#3023)
     add 271842c375 OAK-12299 : precompute elementCount and currentWeight in PersistentDiskCache (#3004)
     add 17358dee48 Add draft project security threat-model document (#2923)
     add d8ee224b09 OAK-12314: Builds failing because request to https://www.slf4j.org/apidocs/ times out (#3030)
     add dae67c7419 OAK-12295 : bump mongo version to 5.3.1 (#3031)
     add df72465537 OAK-12315 : add removeRoot parameter to removeDescendantsAndSelfWithLeavesFirst() (#3032)
     add 3d89a722dc OAK-12318 : bump testcontainers to 2.0.5 (#3035)
     add 78dfc00f39 OAK-12300: Remove ServiceListener after awaitServiceEvent completes (#3005)
     add c335cb6709 OAK-12255: SystemPropertySupplier logSuccessAs can throw IAE (#2995)
     add 6dd6bcd5a8 OAK-12239: Remove FT_PREFETCH_OAK-9780 and remove 'no prefetch' code path (#2934)
     add 83e000f7ed OAK-12317 : bump aws sdk to next minor version 2.36.X (#3034)
     add edee3fb588 OAK-12319 : bump commons-io to 2.22.0 (#3036)
     add ac363caf3b OAK-12320 : bump commons-codec to 1.21.0 (#3037)
     add ece05d0072 docs: wire threat model for agent discoverability + rename to THREAT_MODEL.md (#3042)
     add 7db18defef OAK-12326: Flacky test TokenCleanupTest#testBatchSizeLimitsCleanup (#3047)
     add 44eff55bda OAK-12325: Use heap based comparison of blob content (#3045)
     add fb1c2191eb OAK-12323 : bump netty to 4.1.136.FINAL (#3040)
     add b9b83ed389 Revert "OAK-12319 : bump commons-io to 2.22.0 (#3036)" (#3053)
     add 11ad9c9b5f OAK-12328: Update build.yml to use Java 21 for SonarQube Analysis (#3055)
     add 7729dcf731 OAK-12316 : removed FT_NOCOCLEANUP_OAK-10660 feature toggle (#3033)
     add 49730bc8a0 OAK-12324 : bump metrics-core to 3.2.6 (#3041)
     add 8af07c769f OAK-12298: SystemPropertySupplier: document how to signal that property is not present (implies default value) (#3048)
     add c8790f1b01 OAK-12321 : bump gson to 2.14.0 (#3038)
     add f4a36a20ee OAK-12266: move fastQuerySize tests to oak-search for both backends (#2967) (#2988)
     add 685b064787 OAK-12322 : bump tomcat to 9.0.120 (#3039)
     add 8ea53df019 OAK-12332 : bumped quartz dependency to 2.4.1 (#3060)
     add a251dd91db OAK-12017 augment exceptions with path of affected node (#3050)
     add 78711967ae OAK-12333 : bump postgresql version 42.7.13 (#3061)
     add 9bd5175104 OAK-12309: DocumentNodeStoreService may fail to register or double register the NodeStore due to race conditions (#3022)
     add 84a4141870 OAK-12334 : bump mysql-connector version 9.2.0 (#3062)
     add 71483f28bf OAK-10410 : fixed potential NPE from AbstractMongoConnectionTest (#1080)
     add 2a6a85f6b2 OAK-12302: Add Bundle-SCM entries to the bundle manifests. (#3006)
     add 840bbfc888 OAK-12337: Update Oak trunk to Jackrabbit 2.22.4 (#3066)
     add 4984c4cf26 OAK-12340 Simplified index management improvements (#3068)
     add 81a2023b8e OAK-12336 : update Postgres database server to 14 (#3064)
     add 779fbf8b79 OAK-12339 : bumped org.apache.felix.framework to 7.0.5 (#3067)

No new revisions were added by this update.

Summary of changes:
 .commit-check.yml                                  |   32 -
 .../resources/application.yml => .github/cchk.toml |   21 +-
 .github/workflows/build.yml                        |    7 +-
 .github/workflows/commit-check.yml                 |   10 +-
 AGENTS.md                                          |   29 +-
 RELEASE-NOTES.txt                                  |   79 +-
 SECURITY.md                                        |   34 +
 THREAT_MODEL.md                                    | 1268 ++++++++++++++++++
 oak-api/pom.xml                                    |    2 +-
 oak-auth-external/pom.xml                          |    2 +-
 .../external/impl/ExternalLoginModule.java         |   22 +-
 .../external/impl/ExternalLoginModuleFactory.java  |   19 +
 .../impl/ExternalLoginModuleFactoryTest.java       |   29 +
 .../external/impl/ExternalLoginModuleTest.java     |   16 +
 oak-auth-ldap/pom.xml                              |   10 +-
 oak-authorization-cug/pom.xml                      |    2 +-
 oak-authorization-principalbased/pom.xml           |    2 +-
 oak-benchmarks-elastic/pom.xml                     |    2 +-
 oak-benchmarks-lucene/pom.xml                      |    2 +-
 oak-benchmarks/pom.xml                             |    2 +-
 oak-blob-cloud-azure/pom.xml                       |    2 +-
 oak-blob-cloud/pom.xml                             |    7 +-
 .../jackrabbit/oak/blob/cloud/s3/S3Backend.java    |   19 +-
 .../jackrabbit/oak/blob/cloud/s3/S3Constants.java  |    8 +
 .../apache/jackrabbit/oak/blob/cloud/s3/Utils.java |   32 +-
 .../cloud/s3/S3DataRecordAccessProviderIT.java     |    8 +-
 .../cloud/s3/S3DataRecordAccessProviderTest.java   |  164 ++-
 .../oak/blob/cloud/s3/S3DataStoreUtils.java        |  131 +-
 .../oak/blob/cloud/s3/S3EmulatorSupport.java       |  128 ++
 .../oak/blob/cloud/s3/S3EmulatorSupportTest.java   |   94 ++
 .../jackrabbit/oak/blob/cloud/s3/S3MockRule.java   |  109 ++
 .../oak/blob/cloud/s3/TestS3DSWithSmallCache.java  |   10 +
 .../jackrabbit/oak/blob/cloud/s3/TestS3Ds.java     |   35 +-
 .../oak/blob/cloud/s3/TestS3DsCacheOff.java        |   24 +
 .../jackrabbit/oak/blob/cloud/s3/UtilsTest.java    |  171 ++-
 oak-blob-plugins/pom.xml                           |    5 +-
 .../plugins/blob/datastore/BlobIdTrackerTest.java  |   13 +
 .../AbstractDataRecordAccessProviderTest.java      |   12 +-
 oak-blob/pom.xml                                   |    2 +-
 oak-commons/pom.xml                                |    2 +-
 .../commons/properties/SystemPropertySupplier.java |   21 +-
 .../properties/SystemPropertySupplierTest.java     |   43 +
 oak-core-spi/pom.xml                               |    5 +-
 oak-core/pom.xml                                   |    5 +-
 .../jackrabbit/oak/plugins/index/IndexName.java    |    7 +-
 .../oak/plugins/index/diff/DiffIndexMerger.java    |  116 +-
 .../index/property/PropertyIndexEditor.java        |   23 +-
 .../property/PropertyIndexEditorProvider.java      |   30 +-
 .../jackrabbit/oak/plugins/name/NameValidator.java |    6 +-
 .../oak/plugins/version/VersionEditor.java         |   21 +-
 .../authentication/token/TokenProviderImpl.java    |   40 +-
 .../oak/plugins/index/IndexNameTest.java           |   10 +
 .../plugins/index/diff/DiffIndexMergerTest.java    | 1412 ++++++++++++++++++++
 .../oak/plugins/index/diff/DiffIndexTest.java      |  107 ++
 .../plugins/index/property/PropertyIndexTest.java  |  149 +++
 .../oak/plugins/name/NameValidatorTest.java        |   15 +-
 .../oak/plugins/version/VersionEditorTest.java     |  136 ++
 .../authentication/token/TokenCleanupTest.java     |   73 +
 oak-doc/src/site/markdown/osgi_config.md           |   45 +-
 oak-doc/src/site/markdown/plugins/blobstore.md     |   12 +
 oak-doc/src/site/markdown/query/elastic.md         |   13 +
 oak-doc/src/site/markdown/query/hybrid-index.md    |    2 +-
 oak-doc/src/site/markdown/testing.md               |    4 +-
 oak-examples/pom.xml                               |    2 +-
 oak-examples/standalone/pom.xml                    |    2 +-
 oak-examples/webapp/pom.xml                        |    4 +-
 oak-exercise/pom.xml                               |    2 +-
 oak-http/pom.xml                                   |    2 +-
 .../jackrabbit/oak/http/AuthorizationField.java    |   76 ++
 .../org/apache/jackrabbit/oak/http/OakServlet.java |   13 +-
 .../oak/http/AuthorizationFieldTest.java           |  128 ++
 oak-it-osgi/pom.xml                                |    4 +-
 oak-it/pom.xml                                     |    2 +-
 .../blob/DocumentBlobTrackerRegistrationTest.java  |    3 +
 .../plugins/document/S3SharedBlobStoreGCTest.java  |   10 +
 .../document/SharedS3DataStoreUtilsTest.java       |   18 +
 oak-jackrabbit-api/pom.xml                         |    2 +-
 oak-jcr/pom.xml                                    |    2 +-
 .../jackrabbit/oak/jcr/OrderableNodesTest.java     |   30 -
 .../oak/jcr/xml/BufferedStringValueTest.java       |    6 +-
 oak-lucene/pom.xml                                 |    5 +-
 .../index/lucene/LuceneIndexProviderService.java   |    3 +
 .../plugins/index/lucene/hybrid/DocumentQueue.java |    2 +-
 .../lucene/hybrid/LocalIndexWriterFactory.java     |    8 +-
 .../oak/plugins/index/lucene/hybrid/NRTIndex.java  |    7 +-
 .../index/lucene/writer/DefaultIndexWriter.java    |    7 +-
 .../index/lucene/writer/IndexWriterPool.java       |   30 +-
 .../lucene/writer/MultiplexingIndexWriter.java     |   11 +-
 .../lucene/writer/PooledLuceneIndexWriter.java     |   10 +-
 .../jackrabbit/oak/composite/PrefetchTest.java     |   16 -
 .../jackrabbit/oak/jcr/query/ResultSizeTest.java   |  130 --
 .../oak/jcr/query/WhiteboardResultSizeTest.java    |  264 ----
 .../index/lucene/LuceneIndexEditor2Test.java       |  134 +-
 .../plugins/index/lucene/LuceneResultSizeTest.java |  123 ++
 ...st.java => LuceneWhiteboardResultSizeTest.java} |   12 +-
 .../index/lucene/writer/IndexWriterPoolTest.java   |   12 +-
 .../lucene/writer/MultiplexingIndexWriterTest.java |    6 +-
 oak-parent/pom.xml                                 |   45 +-
 oak-pojosr/pom.xml                                 |   12 +-
 .../jackrabbit/oak/run/osgi/ConfigTracker.java     |   14 +-
 .../run/osgi/AbstractRepositoryFactoryTest.java    |   14 +-
 .../apache/jackrabbit/oak/run/osgi/ConfigTest.java |    3 +-
 oak-query-spi/pom.xml                              |    2 +-
 oak-run-commons/pom.xml                            |    9 +-
 .../oak/run/cli/BlobStoreFixtureProvider.java      |   22 +-
 .../oak/run/cli/ReadOnlyBlobStoreWrapper.java      |   16 +-
 .../PipelinedMongoConnectionFailureIT.java         |   38 +-
 .../oak/run/cli/ReadOnlyBlobStoreWrapperTest.java  |   25 +-
 oak-run-elastic/pom.xml                            |    4 +-
 oak-run/pom.xml                                    |    6 +-
 .../oak/index/merge/IndexDefMergerUtils.java       |    4 +-
 .../oak/plugins/tika/CSVFileGenerator.java         |    2 +
 oak-run/src/main/js/oak-mongo.js                   |   59 +-
 .../jackrabbit/oak/index/IncrementalStoreTest.java |    2 +-
 .../index/merge/IndexDefMergerScenariosTest.java   |    4 +-
 .../tika/CSVFileBinaryResourceProviderTest.java    |    1 +
 .../jackrabbit/oak/run/DataStoreCommandTest.java   |   53 +-
 .../oak/index/merge/unversioned-index.json         |   42 +
 oak-search-elastic/pom.xml                         |    9 +-
 .../index/elastic/ElasticIndexProviderService.java |    9 +
 .../index/elastic/ElasticIndexStatistics.java      |   77 +-
 .../index/elastic/index/ElasticIndexWriter.java    |    8 +-
 .../plugins/index/elastic/query/ElasticIndex.java  |   10 +
 .../index/elastic/ElasticGraceful404QueryTest.java |   87 ++
 .../index/elastic/ElasticIndexStatisticsTest.java  |   43 +
 ...icFacetTest.java => ElasticResultSizeTest.java} |   12 +-
 .../plugins/index/elastic/ElasticTestServer.java   |   51 +-
 ...t.java => ElasticWhiteboardResultSizeTest.java} |   13 +-
 .../elastic/index/ElasticIndexWriterTest.java      |    8 +-
 .../src/test/resources/elasticsearch.yml           |   24 -
 oak-search/pom.xml                                 |    5 +-
 .../search/spi/editor/FulltextIndexEditor.java     |   89 +-
 .../spi/editor/FulltextIndexEditorContext.java     |    7 +
 .../search/spi/editor/FulltextIndexWriter.java     |   19 +-
 .../oak/plugins/index/PropertyIndexCommonTest.java |   76 ++
 .../oak/plugins/index/ResultSizeCommonTest.java    |  162 +++
 .../index/WhiteboardResultSizeCommonTest.java      |   90 ++
 oak-security-spi/pom.xml                           |    2 +-
 oak-segment-aws/pom.xml                            |    2 +-
 oak-segment-azure/pom.xml                          |    2 +-
 oak-segment-remote/pom.xml                         |    8 +-
 .../persistentcache/PersistentDiskCache.java       |   40 +-
 .../persistentcache/PersistentRedisCache.java      |    2 +-
 .../PersistentDiskCacheCounterTest.java            |  185 +++
 oak-segment-tar/pom.xml                            |    2 +-
 .../oak/segment/SegmentNodeStoreFactory.java       |    2 +-
 .../oak/segment/SegmentNodeStoreService.java       |    2 +-
 .../persistentcache/AbstractPersistentCache.java   |   35 +-
 .../persistentcache/SegmentCacheStats.java         |   11 +-
 .../persistence/persistentcache/package-info.java  |    2 +-
 .../SegmentBlobTrackerRegistrationTest.java        |    3 +
 .../segment/osgi/SegmentNodeStoreFactoryTest.java  |   16 +
 .../segment/osgi/SegmentNodeStoreServiceTest.java  |    4 +-
 .../persistentcache/MemoryPersistentCache.java     |    3 +-
 .../persistentcache/PersistentCacheStatsTest.java  |    4 +-
 oak-shaded-guava/pom.xml                           |    8 +-
 oak-store-composite/pom.xml                        |    5 +-
 oak-store-document/AGENTS.md                       |   23 +-
 oak-store-document/pom.xml                         |   15 +-
 .../jackrabbit/oak/plugins/document/Commit.java    |   48 +-
 .../oak/plugins/document/DocumentNodeStore.java    |   24 +-
 .../plugins/document/DocumentNodeStoreBuilder.java |   44 -
 .../plugins/document/DocumentNodeStoreService.java |  120 +-
 .../oak/plugins/document/rdb/RDBBlobStoreDB.java   |    2 +-
 .../document/rdb/RDBDocumentNodeStoreBuilder.java  |   22 -
 .../oak/plugins/document/rdb/RDBDocumentStore.java |    3 +
 .../plugins/document/rdb/RDBDocumentStoreDB.java   |    2 +-
 .../oak/plugins/document/util/Utils.java           |   16 +-
 .../oak/fixture/DocumentMemoryFixture.java         |    2 -
 .../oak/fixture/DocumentMongoFixture.java          |    2 -
 .../jackrabbit/oak/fixture/DocumentRdbFixture.java |    2 -
 .../document/AbstractMongoConnectionTest.java      |    9 +-
 .../oak/plugins/document/CommitTest.java           |   39 +
 .../document/ConcurrentPrefetchAndUpdateIT.java    |    7 -
 .../oak/plugins/document/DocumentNodeStoreIT.java  |    1 +
 .../document/DocumentNodeStoreServiceTest.java     |   15 +
 .../document/mongo/LeaseUpdateSocketTimeoutIT.java |   38 +-
 .../mongo/MongoDocumentNodeStoreBuilderTest.java   |   12 -
 .../plugins/document/mongo/MongoTestClient.java    |   27 +
 .../document/prefetch/CacheWarmingTest.java        |   16 +-
 .../rdb/RDBDocumentNodeStoreBuilderTest.java       |   18 -
 .../oak/plugins/document/util/UtilsTest.java       |   56 +-
 oak-store-spi/pom.xml                              |    2 +-
 .../oak/plugins/memory/AbstractBlob.java           |   34 +-
 oak-upgrade/pom.xml                                |    5 +-
 pom.xml                                            |    2 +-
 186 files changed, 6803 insertions(+), 1264 deletions(-)
 delete mode 100644 .commit-check.yml
 copy oak-examples/standalone/src/main/resources/application.yml => .github/cchk.toml (69%)
 create mode 100644 SECURITY.md
 create mode 100644 THREAT_MODEL.md
 create mode 100644 oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3EmulatorSupport.java
 create mode 100644 oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3EmulatorSupportTest.java
 create mode 100644 oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3MockRule.java
 create mode 100644 oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/diff/DiffIndexMergerTest.java
 create mode 100644 oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/version/VersionEditorTest.java
 create mode 100644 oak-http/src/main/java/org/apache/jackrabbit/oak/http/AuthorizationField.java
 create mode 100644 oak-http/src/test/java/org/apache/jackrabbit/oak/http/AuthorizationFieldTest.java
 delete mode 100644 oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/ResultSizeTest.java
 delete mode 100644 oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/WhiteboardResultSizeTest.java
 create mode 100644 oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneResultSizeTest.java
 copy oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/{LuceneIndexDescendantSpellcheckCommonTest.java => LuceneWhiteboardResultSizeTest.java} (81%)
 create mode 100644 oak-run/src/test/resources/org/apache/jackrabbit/oak/index/merge/unversioned-index.json
 create mode 100644 oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticGraceful404QueryTest.java
 copy oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/{ElasticFacetTest.java => ElasticResultSizeTest.java} (81%)
 copy oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/{ElasticFacetTest.java => ElasticWhiteboardResultSizeTest.java} (81%)
 delete mode 100644 oak-search-elastic/src/test/resources/elasticsearch.yml
 create mode 100644 oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/ResultSizeCommonTest.java
 create mode 100644 oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/WhiteboardResultSizeCommonTest.java
 create mode 100644 oak-segment-remote/src/test/java/org/apache/jackrabbit/oak/segment/remote/persistentcache/PersistentDiskCacheCounterTest.java