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/04/03 18:01:42 UTC

[jackrabbit-oak] branch OAK-10177 updated (f09c2d2aa8 -> 9e189e442b)

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

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


    from f09c2d2aa8 OAK-10176: oak-shaded-guava: switch to latest Guava version
     new 4d84d24129 OAK-9989: adjust store-composite IT
     new 9e189e442b OAK-9989: adjust oak-it-osgi

The 2 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-it-osgi/test-bundles.xml                                             | 1 +
 .../org/apache/jackrabbit/oak/composite/it/CompositeTestSupport.java     | 1 +
 2 files changed, 2 insertions(+)


[jackrabbit-oak] 02/02: OAK-9989: adjust oak-it-osgi

Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 9e189e442bb3fb495e98e48263b379e8b72a1e1b
Author: Julian Reschke <ju...@gmx.de>
AuthorDate: Mon Apr 3 18:28:27 2023 +0100

    OAK-9989: adjust oak-it-osgi
---
 oak-it-osgi/test-bundles.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/oak-it-osgi/test-bundles.xml b/oak-it-osgi/test-bundles.xml
index 97fb09b42e..130c90c98f 100644
--- a/oak-it-osgi/test-bundles.xml
+++ b/oak-it-osgi/test-bundles.xml
@@ -45,6 +45,7 @@
         <include>org.apache.jackrabbit:jackrabbit-data</include>
         <include>org.apache.jackrabbit:oak-api</include>
         <include>org.apache.jackrabbit:oak-jackrabbit-api</include>
+        <include>org.apache.jackrabbit:oak-shaded-guava</include>
         <include>org.apache.jackrabbit:oak-commons</include>
         <include>org.apache.jackrabbit:oak-core</include>
         <include>org.apache.jackrabbit:oak-store-composite</include>


[jackrabbit-oak] 01/02: OAK-9989: adjust store-composite IT

Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 4d84d24129b2754b956b38c5ed888adbff0ee06a
Author: Julian Reschke <re...@apache.org>
AuthorDate: Mon Apr 3 16:40:58 2023 +0100

    OAK-9989: adjust store-composite IT
---
 .../org/apache/jackrabbit/oak/composite/it/CompositeTestSupport.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/oak-store-composite/src/test/java/org/apache/jackrabbit/oak/composite/it/CompositeTestSupport.java b/oak-store-composite/src/test/java/org/apache/jackrabbit/oak/composite/it/CompositeTestSupport.java
index b66288a3f5..f25d5f7fe0 100644
--- a/oak-store-composite/src/test/java/org/apache/jackrabbit/oak/composite/it/CompositeTestSupport.java
+++ b/oak-store-composite/src/test/java/org/apache/jackrabbit/oak/composite/it/CompositeTestSupport.java
@@ -74,6 +74,7 @@ public abstract class CompositeTestSupport extends TestSupport {
             scr(),
             slingCommonsMetrics(),
             jackrabbit(),
+            mavenBundle().groupId(JACKRABBIT_GROUP_ID).artifactId("oak-shaded-guava").versionAsInProject(),
             mavenBundle().groupId(JACKRABBIT_GROUP_ID).artifactId("oak-commons").versionAsInProject(),
             mavenBundle().groupId(JACKRABBIT_GROUP_ID).artifactId("oak-api").versionAsInProject(),
             mavenBundle().groupId(JACKRABBIT_GROUP_ID).artifactId("oak-blob").versionAsInProject(),