This is an automated email from the ASF dual-hosted git repository. miroslav pushed a commit to branch issue/OAK-10006 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 97317f3c64353ddce98efd781c20191484e7a4d6 Merge: 5d322e710c 873434545c Author: smiroslav <[email protected]> AuthorDate: Wed Nov 8 16:06:33 2023 +0100 OAK-10006 Merge with 'trunk' .../external/basic/DefaultSyncContext.java | 11 +- .../external/basic/package-info.java | 2 +- .../external/impl/DynamicSyncContext.java | 19 +- .../external/impl/ExternalIdentityConstants.java | 9 + .../external/impl/DynamicSyncContextTest.java | 5 +- .../external/impl/SwitchSyncModeTest.java | 161 +++++++++++++ .../oak/plugins/index/nodetype/NodeTypeIndex.java | 5 +- .../plugins/index/property/PropertyIndexPlan.java | 22 +- .../plugins/index/reference/ReferenceIndex.java | 17 +- .../oak/plugins/version/VersionEditor.java | 16 +- .../oak/plugins/version/VersionableState.java | 84 ++++--- .../jackrabbit/oak/query/QueryEngineImpl.java | 5 +- .../jackrabbit/oak/query/QueryFormatter.java | 156 +++++++++++++ .../org/apache/jackrabbit/oak/query/QueryImpl.java | 4 - .../jackrabbit/oak/query/ast/SelectorImpl.java | 9 +- .../oak/query/index/TraversingIndex.java | 25 +- .../index/nodetype/NodeTypeIndexQueryTest.java | 15 +- .../index/property/MultiPropertyOrTest.java | 15 +- .../index/property/OptionIndexTagTests.java | 8 +- .../index/property/PropertyIndexDisabledTest.java | 13 +- .../jackrabbit/oak/query/QueryFormatterTest.java | 183 +++++++++++++++ .../org/apache/jackrabbit/oak/query/sql2_index.txt | 253 ++++++++++++++------- .../site/markdown/nodestore/segment/overview.md | 6 +- oak-jcr/pom.xml | 1 - .../jackrabbit/oak/jcr/SameNameSiblingTest.java | 13 ++ .../oak/jcr/query/QueryFulltextTest.java | 7 +- .../jackrabbit/oak/jcr/query/QueryPlanTest.java | 68 +++--- .../apache/jackrabbit/oak/jcr/query/QueryTest.java | 25 +- .../jackrabbit/oak/jcr/version/RestoreTest.java | 9 + .../index/lucene/tools/IndexComparator.java | 247 ++++++++++++++++++++ .../CompositeNodeStoreLuceneIndexTest.java | 20 +- .../oak/composite/CompositeNodeStoreQueryTest.java | 10 +- .../index/lucene/LuceneIndexAugmentTest.java | 12 +- .../index/lucene/LuceneIndexQueryCommonTest.java | 3 +- .../lucene/LucenePropertyIndexCommonTest.java | 4 +- .../index/lucene/LucenePropertyIndexTest.java | 117 +++++----- .../dynamicBoost/LuceneDynamicBoostTest.java | 5 +- .../property/SynchronousPropertyIndexTest.java | 4 +- oak-parent/pom.xml | 14 +- .../pipelined/PipelinedMergeSortTaskTest.java | 9 +- oak-run/pom.xml | 2 +- .../apache/jackrabbit/oak/index/IndexCommand.java | 8 +- .../apache/jackrabbit/oak/run/CompactCommand.java | 23 +- .../org/apache/jackrabbit/oak/index/ReindexIT.java | 59 +---- .../apache/jackrabbit/oak/run/JsonIndexTest.java | 23 +- .../index/elastic/ElasticDynamicBoostTest.java | 5 +- .../index/elastic/ElasticIndexQueryCommonTest.java | 16 +- .../index/elastic/ElasticPropertyIndexTest.java | 2 +- .../index/search/spi/query/FulltextIndex.java | 32 ++- .../search/spi/query/FulltextIndexPlanner.java | 2 +- .../oak/plugins/index/DynamicBoostCommonTest.java | 17 +- .../oak/plugins/index/FunctionIndexCommonTest.java | 42 ++-- .../oak/plugins/index/IndexQueryCommonTest.java | 4 +- .../oak/plugins/index/OrderByCommonTest.java | 24 +- .../oak/plugins/index/PropertyIndexCommonTest.java | 16 +- .../AbstractAccessControlManagerTest.java | 10 +- oak-segment-aws/pom.xml | 5 - .../oak/segment/aws/tool/AwsCompact.java | 28 ++- .../oak/segment/azure/tool/AzureCompact.java | 28 ++- .../persistentcache/PersistentRedisCacheTest.java | 6 + .../oak/segment/CheckpointCompactor.java | 46 ++-- .../oak/segment/DefaultSegmentWriter.java | 8 + .../jackrabbit/oak/segment/tool/Compact.java | 28 ++- .../oak/segment/DefaultSegmentWriterTest.java | 40 +++- .../oak/segment/test/TemporaryBlobStore.java | 33 ++- .../oak/segment/test/TemporaryFileStore.java | 37 ++- oak-store-document/pom.xml | 5 - .../document/VersionGarbageCollectorIT.java | 69 ++++++ 68 files changed, 1700 insertions(+), 529 deletions(-) diff --cc oak-parent/pom.xml index 1b2d809416,490cd083fd..4bda72f364 --- a/oak-parent/pom.xml +++ b/oak-parent/pom.xml @@@ -704,18 -704,13 +704,20 @@@ <artifactId>httpmime</artifactId> <version>4.5.14</version> </dependency> + <!-- Testcontainers dependency --> <dependency> - <groupId>com.arakelian</groupId> - <artifactId>docker-junit-rule</artifactId> - <version>2.3.0</version> + <groupId>org.testcontainers</groupId> + <artifactId>testcontainers</artifactId> + <version>${testcontainers.version}</version> + <scope>test</scope> </dependency> + <!-- Testcontainers dependency --> + <dependency> + <groupId>org.testcontainers</groupId> + <artifactId>testcontainers</artifactId> + <version>${testcontainers.version}</version> + <scope>test</scope> + </dependency> <dependency> <groupId>com.microsoft.azure</groupId> <artifactId>azure-storage</artifactId>
