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 2022/03/14 15:43:57 UTC

[jackrabbit-oak] branch trunk updated (24c54e5 -> ae5ef0a)

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

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


    from 24c54e5  OAK-9720: Update Oak trunk and Oak 1.22 to Jackrabbit 2.20.5
     new b223d5b  OAK-9717 - Ensuring custom index definitions do not remove nodes from product indexes in the IndexDefMergerUtils
     new f89f233  OAK-9717 - adding missing test files
     new 6ae6017  Merge branch 'trunk' into OAK-9717
     new 05509c9  Addressing PR feedback
     new 8a44639  Re-adding tests and restoring behavior where if a property is not found in the ancestor the custom and product must equal or it will be a conflict
     new f220ce4  Adding missing files
     new ae5ef0a  Merge pull request #513 from klcodanr/OAK-9717

The 17559 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/index/merge/IndexDefMergerUtils.java       |   4 +-
 .../index/merge/IndexDefMergerConflictsTest.java   |  67 +++++
 .../index/merge/IndexDefMergerScenariosTest.java   |  59 +++--
 .../oak/index/merge/IndexDefMergerTest.java        |  19 --
 .../index/merge/ParameterizedMergingTestBase.java  |  54 ++++
 .../apache/jackrabbit/oak/index/merge/basic.json   |  19 ++
 .../oak/index/merge/conflict-new-properties.json   | 168 +++++++++++++
 .../apache/jackrabbit/oak/index/merge/merge.txt    |   2 +-
 .../jackrabbit/oak/index/merge/mergeIndexes.txt    |  17 --
 .../jackrabbit/oak/index/merge/merges-base.json    | 273 ++++++++++++++++++++
 .../oak/index/merge/merges-base_build.json         |  55 ----
 .../oak/index/merge/merges-base_expected.json      | 111 ---------
 .../oak/index/merge/merges-base_run.json           | 103 --------
 .../oak/index/merge/merges-multi-version.json      | 273 ++++++++++++++++++++
 .../index/merge/merges-multi-version_build.json    |  55 ----
 .../index/merge/merges-multi-version_expected.json | 111 ---------
 .../oak/index/merge/merges-multi-version_run.json  | 103 --------
 .../jackrabbit/oak/index/merge/missing-child.json  | 268 ++++++++++++++++++++
 .../oak/index/merge/removed-property.json          | 277 +++++++++++++++++++++
 19 files changed, 1439 insertions(+), 599 deletions(-)
 create mode 100644 oak-run/src/test/java/org/apache/jackrabbit/oak/index/merge/IndexDefMergerConflictsTest.java
 create mode 100644 oak-run/src/test/java/org/apache/jackrabbit/oak/index/merge/ParameterizedMergingTestBase.java
 create mode 100644 oak-run/src/test/resources/org/apache/jackrabbit/oak/index/merge/basic.json
 create mode 100644 oak-run/src/test/resources/org/apache/jackrabbit/oak/index/merge/conflict-new-properties.json
 delete mode 100644 oak-run/src/test/resources/org/apache/jackrabbit/oak/index/merge/mergeIndexes.txt
 create mode 100644 oak-run/src/test/resources/org/apache/jackrabbit/oak/index/merge/merges-base.json
 delete mode 100644 oak-run/src/test/resources/org/apache/jackrabbit/oak/index/merge/merges-base_build.json
 delete mode 100644 oak-run/src/test/resources/org/apache/jackrabbit/oak/index/merge/merges-base_expected.json
 delete mode 100644 oak-run/src/test/resources/org/apache/jackrabbit/oak/index/merge/merges-base_run.json
 create mode 100644 oak-run/src/test/resources/org/apache/jackrabbit/oak/index/merge/merges-multi-version.json
 delete mode 100644 oak-run/src/test/resources/org/apache/jackrabbit/oak/index/merge/merges-multi-version_build.json
 delete mode 100644 oak-run/src/test/resources/org/apache/jackrabbit/oak/index/merge/merges-multi-version_expected.json
 delete mode 100644 oak-run/src/test/resources/org/apache/jackrabbit/oak/index/merge/merges-multi-version_run.json
 create mode 100644 oak-run/src/test/resources/org/apache/jackrabbit/oak/index/merge/missing-child.json
 create mode 100644 oak-run/src/test/resources/org/apache/jackrabbit/oak/index/merge/removed-property.json