[jackrabbit-oak] branch trunk updated (d5cda99 -> c424e1c)

[mi...@apache.org]

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

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


    from d5cda99  Merge pull request #472 from jelmini/issues/bugfix_ignored_mounts
     new 115efcf  OAK-9553: Add config support for multiple mounts in CompositeNodeStore
     new 11acd03  Use OSGi R6 annotations
     new 463321b  Add PaxExam integration tests to oak-store-composite
     new 268fe49  Move PaxExam dependencies to dependencyManagement; fix oak-it-osgi
     new c424e1c  Merge pull request #443 from jelmini/issues/composite_multi_mounts

The 17491 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-it-osgi/pom.xml                                |  17 +-
 oak-parent/pom.xml                                 |  62 ++++++++
 oak-store-composite/pom.xml                        |  94 ++++++++++-
 .../oak/composite/CompositeNodeStore.java          |   2 +-
 .../oak/composite/CompositeNodeStoreService.java   |  61 ++++---
 .../jackrabbit/oak/composite/MountInfoConfig.java  | 111 +++++++++++++
 .../oak/composite/MountInfoProviderService.java    | 177 ++++++++++++++-------
 .../jackrabbit/oak/composite/package-info.java     |   2 +-
 .../composite/CompositeNodeStoreServiceTest.java   |  81 +++++++++-
 .../oak/composite/MountInfoPropsBuilder.java       | 117 ++++++++++++++
 .../composite/MountInfoProviderServiceTest.java    | 128 ++++++++++++---
 .../NonDefaultMountWriteReportingObserverTest.java |  12 +-
 .../it/BackwardCompatibleMountCompositeIT.java     |  76 +++++++++
 .../oak/composite/it/CompositeTestSupport.java     | 114 +++++++++++++
 .../oak/composite/it/MultiMountCompositeIT.java    |  73 +++++++++
 .../oak/composite/it/NodeStoresInitializer.java    |  91 +++++++++++
 .../src/test/resources/exam.properties             |   0
 ....oak.composite.CompositeNodeStoreService.config |   4 +
 ...ite.CrossMountReferenceValidatorProvider.config |   1 +
 ...t.oak.composite.MountInfoProviderService.config |   3 +
 ...ypeMountedNodeStoreChecker-referenceable.config |   3 +
 ...eTypeMountedNodeStoreChecker-versionable.config |   2 +
 ...k.segment.SegmentNodeStoreFactory-global.config |   4 +
 ...oak.segment.SegmentNodeStoreFactory-libs.config |   3 +
 ....oak.composite.CompositeNodeStoreService.config |   4 +
 ...ite.CrossMountReferenceValidatorProvider.config |   1 +
 ...abbit.oak.composite.MountInfoConfig-apps.config |   3 +
 ...abbit.oak.composite.MountInfoConfig-libs.config |   3 +
 ...t.oak.composite.MountInfoProviderService.config |   1 +
 ...ypeMountedNodeStoreChecker-referenceable.config |   3 +
 ...eTypeMountedNodeStoreChecker-versionable.config |   2 +
 ...oak.segment.SegmentNodeStoreFactory-apps.config |   3 +
 ...k.segment.SegmentNodeStoreFactory-global.config |   4 +
 ...oak.segment.SegmentNodeStoreFactory-libs.config |   3 +
 .../src/test/resources/logback-test.xml            |   2 +-
 35 files changed, 1130 insertions(+), 137 deletions(-)
 create mode 100644 oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/MountInfoConfig.java
 create mode 100644 oak-store-composite/src/test/java/org/apache/jackrabbit/oak/composite/MountInfoPropsBuilder.java
 create mode 100644 oak-store-composite/src/test/java/org/apache/jackrabbit/oak/composite/it/BackwardCompatibleMountCompositeIT.java
 create mode 100644 oak-store-composite/src/test/java/org/apache/jackrabbit/oak/composite/it/CompositeTestSupport.java
 create mode 100644 oak-store-composite/src/test/java/org/apache/jackrabbit/oak/composite/it/MultiMountCompositeIT.java
 create mode 100644 oak-store-composite/src/test/java/org/apache/jackrabbit/oak/composite/it/NodeStoresInitializer.java
 copy {oak-it-osgi => oak-store-composite}/src/test/resources/exam.properties (100%)
 create mode 100644 oak-store-composite/src/test/resources/it/compat/org.apache.jackrabbit.oak.composite.CompositeNodeStoreService.config
 create mode 100644 oak-store-composite/src/test/resources/it/compat/org.apache.jackrabbit.oak.composite.CrossMountReferenceValidatorProvider.config
 create mode 100644 oak-store-composite/src/test/resources/it/compat/org.apache.jackrabbit.oak.composite.MountInfoProviderService.config
 create mode 100644 oak-store-composite/src/test/resources/it/compat/org.apache.jackrabbit.oak.composite.checks.NodeTypeMountedNodeStoreChecker-referenceable.config
 create mode 100644 oak-store-composite/src/test/resources/it/compat/org.apache.jackrabbit.oak.composite.checks.NodeTypeMountedNodeStoreChecker-versionable.config
 create mode 100644 oak-store-composite/src/test/resources/it/compat/org.apache.jackrabbit.oak.segment.SegmentNodeStoreFactory-global.config
 create mode 100644 oak-store-composite/src/test/resources/it/compat/org.apache.jackrabbit.oak.segment.SegmentNodeStoreFactory-libs.config
 create mode 100644 oak-store-composite/src/test/resources/it/multi-mounts/org.apache.jackrabbit.oak.composite.CompositeNodeStoreService.config
 create mode 100644 oak-store-composite/src/test/resources/it/multi-mounts/org.apache.jackrabbit.oak.composite.CrossMountReferenceValidatorProvider.config
 create mode 100644 oak-store-composite/src/test/resources/it/multi-mounts/org.apache.jackrabbit.oak.composite.MountInfoConfig-apps.config
 create mode 100644 oak-store-composite/src/test/resources/it/multi-mounts/org.apache.jackrabbit.oak.composite.MountInfoConfig-libs.config
 create mode 100644 oak-store-composite/src/test/resources/it/multi-mounts/org.apache.jackrabbit.oak.composite.MountInfoProviderService.config
 create mode 100644 oak-store-composite/src/test/resources/it/multi-mounts/org.apache.jackrabbit.oak.composite.checks.NodeTypeMountedNodeStoreChecker-referenceable.config
 create mode 100644 oak-store-composite/src/test/resources/it/multi-mounts/org.apache.jackrabbit.oak.composite.checks.NodeTypeMountedNodeStoreChecker-versionable.config
 create mode 100644 oak-store-composite/src/test/resources/it/multi-mounts/org.apache.jackrabbit.oak.segment.SegmentNodeStoreFactory-apps.config
 create mode 100644 oak-store-composite/src/test/resources/it/multi-mounts/org.apache.jackrabbit.oak.segment.SegmentNodeStoreFactory-global.config
 create mode 100644 oak-store-composite/src/test/resources/it/multi-mounts/org.apache.jackrabbit.oak.segment.SegmentNodeStoreFactory-libs.config
 copy {oak-segment-aws => oak-store-composite}/src/test/resources/logback-test.xml (94%)