(jackrabbit-oak) branch 1.22 updated: OAK-10218: oak-it-osgi: avoid Guava dependency (#918)

[reschke]

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

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


The following commit(s) were added to refs/heads/1.22 by this push:
     new 7ec2f741bd OAK-10218: oak-it-osgi: avoid Guava dependency (#918)
7ec2f741bd is described below

commit 7ec2f741bd60471e0792451371fe2f1765906826
Author: Julian Reschke <resc...@apache.org>
AuthorDate: Tue May 2 17:11:00 2023 +0200

    OAK-10218: oak-it-osgi: avoid Guava dependency (#918)
---
 oak-it-osgi/pom.xml                                                  | 5 -----
 .../java/org/apache/jackrabbit/oak/osgi/TikaExtractionOsgiIT.java    | 4 ++--
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/oak-it-osgi/pom.xml b/oak-it-osgi/pom.xml
index e8713eca7d..5f964308f5 100644
--- a/oak-it-osgi/pom.xml
+++ b/oak-it-osgi/pom.xml
@@ -188,11 +188,6 @@
       <artifactId>commons-lang3</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>commons-fileupload</groupId>
       <artifactId>commons-fileupload</artifactId>
diff --git 
a/oak-it-osgi/src/test/java/org/apache/jackrabbit/oak/osgi/TikaExtractionOsgiIT.java
 
b/oak-it-osgi/src/test/java/org/apache/jackrabbit/oak/osgi/TikaExtractionOsgiIT.java
index ee2f92c4e5..bf4234d750 100644
--- 
a/oak-it-osgi/src/test/java/org/apache/jackrabbit/oak/osgi/TikaExtractionOsgiIT.java
+++ 
b/oak-it-osgi/src/test/java/org/apache/jackrabbit/oak/osgi/TikaExtractionOsgiIT.java
@@ -16,7 +16,6 @@
  */
 package org.apache.jackrabbit.oak.osgi;
 
-import com.google.common.collect.Maps;
 import org.apache.tika.metadata.Metadata;
 import org.apache.tika.parser.AutoDetectParser;
 import org.apache.tika.parser.Parser;
@@ -43,6 +42,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URI;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
@@ -152,7 +152,7 @@ public class TikaExtractionOsgiIT {
         assertEquals("Unexpected number of properties found in " + 
VERSION_PROP_RESOURCE_NAME,
                 VERSION_KEYS.length, props.size());
 
-        Map<String, String> versions = Maps.newHashMap();
+        Map<String, String> versions = new HashMap<>();
         for (String versionKey : VERSION_KEYS) {
             String version = props.getProperty(versionKey);