From 6044117969de286120620e154d2eafcdaded8e9f Mon Sep 17 00:00:00 2001
From: Hannes Wellmann <wellmann.hannes1@gmx.net>
Date: Fri, 27 Sep 2024 18:31:18 +0200
Subject: [PATCH] Avoid reference to Guava in GitLabSupport

---
 core/pom.xml                                                | 6 ++++++
 .../org/eclipse/dash/licenses/review/GitLabSupport.java     | 5 ++---
 maven-plugin/pom.xml                                        | 4 ++++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index bfb4eb4e..6e02b964 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -68,6 +68,12 @@
 			<groupId>com.google.inject</groupId>
 			<artifactId>guice</artifactId>
 			<version>7.0.0</version>
+			<exclusions>
+				<exclusion>
+					<groupId>com.google.guava</groupId>
+					<artifactId>guava</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>com.google.inject.extensions</groupId>
diff --git a/core/src/main/java/org/eclipse/dash/licenses/review/GitLabSupport.java b/core/src/main/java/org/eclipse/dash/licenses/review/GitLabSupport.java
index 5323cfaa..61289c39 100644
--- a/core/src/main/java/org/eclipse/dash/licenses/review/GitLabSupport.java
+++ b/core/src/main/java/org/eclipse/dash/licenses/review/GitLabSupport.java
@@ -9,6 +9,7 @@
  *************************************************************************/
 package org.eclipse.dash.licenses.review;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.function.BiConsumer;
@@ -28,8 +29,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.collect.Maps;
-
 public class GitLabSupport {
 
 	final Logger logger = LoggerFactory.getLogger(GitLabSupport.class);
@@ -111,7 +110,7 @@ public void execute(Consumer<GitLabConnection> callable) {
 		IProxySettings proxySettings = this.proxySettings.get();
 		if (proxySettings != null) {
 			// Configure GitLab API for the proxy server
-			clientConfig = Maps.newHashMap();
+			clientConfig = new HashMap<>();
 			proxySettings.configureJerseyClient(clientConfig);
 		}
 
diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
index 648cc015..ac51f5b2 100644
--- a/maven-plugin/pom.xml
+++ b/maven-plugin/pom.xml
@@ -69,6 +69,10 @@
 					<groupId>org.slf4j</groupId>
 					<artifactId>slf4j-api</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>com.google.guava</groupId>
+					<artifactId>guava</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>