From 97a37f565e5fc02e2256fb488b0135efb8d9629b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=A1clav=20Muzik=C3=A1=C5=99?= <vmuzikar@redhat.com>
Date: Mon, 10 Jul 2023 16:13:13 +0200
Subject: [PATCH] Align guava dependency with the Quarkus Platform BOM (#21544)

Closes #21364
---
 pom.xml                                                    | 7 -------
 .../org/keycloak/vault/FilesKeystoreVaultProvider.java     | 2 +-
 .../org/keycloak/vault/FilesPlainTextVaultProvider.java    | 2 +-
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2c0c36cdc8..f364d8c9d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -116,7 +116,6 @@
         <nashorn.version>15.4</nashorn.version>
         <ua-parser.version>1.5.4</ua-parser.version>
         <picketbox.version>5.0.3.Final</picketbox.version>
-        <google.guava.version>32.0.1-jre</google.guava.version>
         <xstream.version>1.4.20</xstream.version>
         <org.snakeyaml.snakeyaml-engine.version>2.6</org.snakeyaml.snakeyaml-engine.version>
 
@@ -575,12 +574,6 @@
                 </exclusions>
             </dependency>
 
-            <dependency>
-                <groupId>com.google.guava</groupId>
-                <artifactId>guava</artifactId>
-                <version>${google.guava.version}</version>
-            </dependency>
-
             <!-- Email Test Servers -->
             <dependency>
                 <groupId>com.icegreen</groupId>
diff --git a/services/src/main/java/org/keycloak/vault/FilesKeystoreVaultProvider.java b/services/src/main/java/org/keycloak/vault/FilesKeystoreVaultProvider.java
index 3c9fc9fa81..f182b6b1d8 100644
--- a/services/src/main/java/org/keycloak/vault/FilesKeystoreVaultProvider.java
+++ b/services/src/main/java/org/keycloak/vault/FilesKeystoreVaultProvider.java
@@ -4,7 +4,7 @@ import java.nio.ByteBuffer;
 
 import org.jboss.logging.Logger;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import java.io.IOException;
 import java.lang.invoke.MethodHandles;
 import java.nio.file.Files;
diff --git a/services/src/main/java/org/keycloak/vault/FilesPlainTextVaultProvider.java b/services/src/main/java/org/keycloak/vault/FilesPlainTextVaultProvider.java
index 33fdea5715..4339c0f014 100644
--- a/services/src/main/java/org/keycloak/vault/FilesPlainTextVaultProvider.java
+++ b/services/src/main/java/org/keycloak/vault/FilesPlainTextVaultProvider.java
@@ -2,7 +2,7 @@ package org.keycloak.vault;
 
 import org.jboss.logging.Logger;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import java.io.IOException;
 import java.lang.invoke.MethodHandles;
 import java.nio.ByteBuffer;