diff --git a/openam-clientsdk/pom.xml b/openam-clientsdk/pom.xml
index 09c1c03146..293a849783 100755
--- a/openam-clientsdk/pom.xml
+++ b/openam-clientsdk/pom.xml
@@ -13,7 +13,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2011-2016 ForgeRock AS.
- * Portions copyright 2023 3A Systems LLC
+ * Portions copyright 2017-2023 3A Systems LLC
  *
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@@ -135,7 +135,7 @@
                             <include>org.openidentityplatform.commons.i18n-framework:core</include>
                             <include>org.openidentityplatform.commons.i18n-framework:slf4j</include>
                             <include>org.openidentityplatform.commons:util</include>
-                            <include>com.google.guava:guava:jar:</include>
+                            <include>com.google.guava:*</include>
                             <include>org.openidentityplatform.commons.http-framework:core</include>
                             <include>com.fasterxml.jackson.core:jackson-databind</include>
                             <include>com.fasterxml.jackson.core:jackson-core</include>
diff --git a/openam-core/src/main/java/com/iplanet/am/util/SystemProperties.java b/openam-core/src/main/java/com/iplanet/am/util/SystemProperties.java
index b28c2e116c..c17780d002 100644
--- a/openam-core/src/main/java/com/iplanet/am/util/SystemProperties.java
+++ b/openam-core/src/main/java/com/iplanet/am/util/SystemProperties.java
@@ -23,6 +23,7 @@
  * "Portions Copyrighted [year] [name of copyright owner]"
  *
  * Portions Copyrighted 2010-2016 ForgeRock AS.
+ * Portions Copyrighted 2017-2025 3A Systems, LLC
  */
 package com.iplanet.am.util;
 
@@ -48,7 +49,6 @@
 import java.util.concurrent.atomic.AtomicReference;
 
 import javax.annotation.Nullable;
-import javax.xml.rpc.holders.StringHolder;
 
 import com.google.common.base.Predicate;
 import com.google.common.cache.Cache;
@@ -794,4 +794,11 @@ PropertiesHolder putAll(Properties newProperties) {
             return new PropertiesHolder(Maps.fromProperties(newProperties));
         }
     }
+
+    private static class StringHolder {
+        public String value=null;
+        public StringHolder(String property) {
+            this.value=property;
+        }
+    }
 }