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/12 09:42:53 UTC
[jackrabbit-oak] branch OAK-10001 updated (717dae1507 -> ef4f980802)
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a change to branch OAK-10001
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
from 717dae1507 OAK-10001: merge master
add dc81d437de OAK-10062: consolidate and update groovy versions to 2.4.21 (#818)
add 109a22af7b OAK-10061 : WARN when for an external group a local group with the same name is already present (#819)
add bebc0d401a OAK-10063 | Fixing log message to print the complete log (#817)
new ef4f980802 merge trunk
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:
.../external/basic/DefaultSyncContext.java | 16 +++++++++++++++-
.../authentication/external/basic/package-info.java | 2 +-
.../authentication/external/impl/DynamicSyncContext.java | 3 ++-
.../jackrabbit/oak/plugins/index/AsyncIndexUpdate.java | 4 ++--
oak-parent/pom.xml | 2 ++
oak-pojosr/pom.xml | 4 ----
oak-run-elastic/pom.xml | 1 -
oak-run/pom.xml | 1 -
8 files changed, 22 insertions(+), 11 deletions(-)
[jackrabbit-oak] 01/01: merge trunk
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch OAK-10001
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit ef4f980802a3175077ef7c0095d7c12bc42d9934
Merge: 717dae1507 bebc0d401a
Author: Julian Reschke <ju...@gmx.de>
AuthorDate: Thu Jan 12 10:42:41 2023 +0100
merge trunk
.../external/basic/DefaultSyncContext.java | 16 +++++++++++++++-
.../authentication/external/basic/package-info.java | 2 +-
.../authentication/external/impl/DynamicSyncContext.java | 3 ++-
.../jackrabbit/oak/plugins/index/AsyncIndexUpdate.java | 4 ++--
oak-parent/pom.xml | 2 ++
oak-pojosr/pom.xml | 4 ----
oak-run-elastic/pom.xml | 1 -
oak-run/pom.xml | 1 -
8 files changed, 22 insertions(+), 11 deletions(-)
diff --cc oak-parent/pom.xml
index 9948f7a360,a29e87007c..4d49cacb5c
--- a/oak-parent/pom.xml
+++ b/oak-parent/pom.xml
@@@ -68,7 -68,9 +68,9 @@@
<jackson.version>2.13.4</jackson.version>
<testcontainers.version>1.17.5</testcontainers.version>
<pax-exam.version>4.13.1</pax-exam.version>
+ <groovy.version>2.4.21</groovy.version>
- <java.version>1.8</java.version>
- <java.version.signature>java18</java.version.signature>
+ <java.version>11</java.version>
++
<!-- specifies on which fixture to run the integration testing tests.
override in profiles or provide from command line to change behaviour. Provide