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/06/20 15:42:22 UTC

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

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

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

commit 100e85a59df1c56cc0ec6af7d298dd306d6d602a
Merge: 0152730f8d 7a0b459dc4
Author: Julian Reschke <ju...@gmx.de>
AuthorDate: Tue Jun 20 16:01:40 2023 +0100

    Merge branch 'trunk' into OAK-10304

 .gitignore                                                  |  1 +
 oak-commons/pom.xml                                         |  3 +--
 .../java/org/apache/jackrabbit/oak/commons/FileIOUtils.java | 10 ----------
 .../java/org/apache/jackrabbit/oak/commons/Profiler.java    |  1 +
 .../jackrabbit/oak/commons/io/BurnOnCloseFileIterator.java  |  3 ++-
 .../apache/jackrabbit/oak/commons/io/LazyInputStream.java   |  3 ++-
 .../org/apache/jackrabbit/oak/commons/FileIOUtilsTest.java  | 11 ++++++-----
 oak-core/pom.xml                                            |  2 ++
 oak-parent/pom.xml                                          |  2 +-
 oak-search-elastic/pom.xml                                  | 10 ++++++++++
 oak-shaded-guava/pom.xml                                    | 13 +++++++++++--
 .../apache/jackrabbit/oak/plugins/document/MongoUtils.java  |  5 ++++-
 .../oak/plugins/document/mongo/MongoDockerRule.java         |  4 ++++
 13 files changed, 45 insertions(+), 23 deletions(-)