[jackrabbit-oak] branch OAK-10371 updated: OAK-10371: remove provided Guava from OSGi tests

[re...@apache.org]

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

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


The following commit(s) were added to refs/heads/OAK-10371 by this push:
     new 9440a18262 OAK-10371: remove provided Guava from OSGi tests
9440a18262 is described below

commit 9440a182622f2227054d9353ff3e6bc22088d6a4
Author: Julian Reschke <ju...@gmx.de>
AuthorDate: Wed Sep 6 10:30:52 2023 +0100

    OAK-10371: remove provided Guava from OSGi tests
---
 oak-it-osgi/pom.xml          | 7 -------
 oak-it-osgi/test-bundles.xml | 2 --
 2 files changed, 9 deletions(-)

diff --git a/oak-it-osgi/pom.xml b/oak-it-osgi/pom.xml
index 9eb298afcc..3b5a7f879b 100644
--- a/oak-it-osgi/pom.xml
+++ b/oak-it-osgi/pom.xml
@@ -217,13 +217,6 @@
       <artifactId>commons-lang3</artifactId>
       <scope>test</scope>
     </dependency>
-    <!-- to be removed when OAK-10371 is resolved -->
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>15.0</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>commons-fileupload</groupId>
       <artifactId>commons-fileupload</artifactId>
diff --git a/oak-it-osgi/test-bundles.xml b/oak-it-osgi/test-bundles.xml
index 3f644c68b4..6b8906f385 100644
--- a/oak-it-osgi/test-bundles.xml
+++ b/oak-it-osgi/test-bundles.xml
@@ -30,8 +30,6 @@
       <includes>
         <include>javax.jcr:jcr</include>
         <include>javax.servlet:javax.servlet-api</include>
-        <!-- to be removed when OAK-10371 is resolved -->
-        <include>com.google.guava:guava</include>
         <include>org.slf4j:slf4j-api</include>
         <include>ch.qos.logback:logback-core</include>
         <include>ch.qos.logback:logback-classic</include>