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 20:11:18 UTC
[jackrabbit-oak] branch trunk updated: OAK-10177: adjust OSGi ITs and size limits for shaded guava inclusion (#887)
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new 4797545327 OAK-10177: adjust OSGi ITs and size limits for shaded guava inclusion (#887)
4797545327 is described below
commit 479754532747a4363165125d35262b55800ddea7
Author: Julian Reschke <re...@apache.org>
AuthorDate: Mon Apr 3 22:11:10 2023 +0200
OAK-10177: adjust OSGi ITs and size limits for shaded guava inclusion (#887)
* OAK-9989: adjust store-composite IT
* OAK-9989: adjust oak-it-osgi
---
oak-it-osgi/test-bundles.xml | 1 +
.../org/apache/jackrabbit/oak/composite/it/CompositeTestSupport.java | 1 +
2 files changed, 2 insertions(+)
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>
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(),