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 2023/01/27 17:47:03 UTC

[jackrabbit-oak] 01/01: Merge branch 'trunk' into OAK-10007

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

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

commit 19d7bbf503269645addfb2aea22c0636f89fda4a
Merge: 53d0fb8784 5423ab52ef
Author: Julian Reschke <ju...@gmx.de>
AuthorDate: Fri Jan 27 18:46:47 2023 +0100

    Merge branch 'trunk' into OAK-10007

 .../external/impl/DynamicSyncTest.java             |  38 +++++-
 .../jackrabbit/oak/commons/GuavaDeprecation.java   |   2 +-
 .../jackrabbit/oak/spi/GuavaDeprecation.java       |   2 +-
 .../jackrabbit/oak/core/GuavaDeprecation.java      |   2 +-
 .../oak/plugins/nodetype/TypeEditor.java           |  15 +--
 .../jackrabbit/oak/security/user/GroupImpl.java    |   6 +-
 .../security/user/InheritedMembersIterator.java    |  92 +++++++++++++
 .../user/InheritedMembersIteratorTest.java         | 142 +++++++++++++++++++++
 oak-doc-railroad-macro/pom.xml                     |   2 +-
 oak-doc/pom.xml                                    |   2 +-
 oak-doc/src/site/markdown/differences.md           |   6 +-
 pom.xml                                            |   6 +-
 12 files changed, 293 insertions(+), 22 deletions(-)