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:21 UTC

[jackrabbit-oak] branch OAK-10304 updated (0152730f8d -> 100e85a59d)

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

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


    from 0152730f8d OAK-10304: work in progress
     add ff0bf210fc OAK-10305: make annotation dependencies have scope "provided" (#984)
     add b8b7c35df8 OAK-10247: oak-commons: remove Guava from public API - remove remaining uses and add to shaded version to Profiler ignore list (#986)
     add afddcd7251 OAK-10306: Incorrect dependency scope for commons-math3
     add f3f8059087 Merge pull request #985 from mreutegg/OAK-10306
     add 1d6581bb10 OAK-10307: oak-shaded-guava leaks original guava as transitive dependency (#989)
     add a02cbb9d0b OAK-10307: exclude oak-shaded-guava/dependency-reduced-pom.xml from rat plugin check
     add 8dc7950337 Revert "OAK-10307: exclude oak-shaded-guava/dependency-reduced-pom.xml from rat plugin check"
     add 91d10c9f71 Revert "OAK-10307: oak-shaded-guava leaks original guava as transitive dependency (#989)"
     add 2283639e03 OAK-10308: Tests using MongoUtils may skip even if Docker is available
     add 755416d158 Merge pull request #990 from mreutegg/OAK-10308
     add 5b1f46ebf8 OAK-10310: bump testcontainers to v 1.18.3 (#992)
     add 7a0b459dc4 OAK-10307: oak-shaded-guava leaks original guava as transitive dependency (#994)
     new 100e85a59d Merge branch 'trunk' into OAK-10304

The 1 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:
 .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(-)


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

Posted by re...@apache.org.
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(-)