Bump com.google.guava:guava from 33.3.0-jre to 33.4.8-jre (#785)

* Bump com.google.guava:guava from 33.3.0-jre to 33.4.8-jre

Bumps [com.google.guava:guava](https://github.com/google/guava) from 33.3.0-jre to 33.4.8-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

---
updated-dependencies:
- dependency-name: com.google.guava:guava
  dependency-version: 33.4.8-jre
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* fix Charsets deprecation

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Brandon Arp <[email protected]>

Author: dependabot[bot]

app/models/view/VersionInfo.java

@@ -19,12 +19,12 @@
 import com.arpnetworking.commons.jackson.databind.ObjectMapperFactory;
 import com.arpnetworking.steno.Logger;
 import com.arpnetworking.steno.LoggerFactory;
-import com.google.common.base.Charsets;
 import com.google.common.io.Resources;
 import net.sf.oval.constraint.NotEmpty;
 import net.sf.oval.constraint.NotNull;
 
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 
 /**
  * Represents the model for the version of the service currently running.
@@ -67,7 +67,7 @@ private VersionInfo(final Builder builder) {
         try {
             versionInfo =
                     ObjectMapperFactory.getInstance().readValue(
-                            Resources.toString(Resources.getResource("version.json"), Charsets.UTF_8),
+                            Resources.toString(Resources.getResource("version.json"), StandardCharsets.UTF_8),
                             VersionInfo.class);
         } catch (final IOException e) {
             LOGGER.error()

pom.xml

@@ -87,7 +87,7 @@
     <ebean.version>14.0.2</ebean.version>
     <flyway.core.version>10.18.0</flyway.core.version>
     <flyway.play.version>9.1.0</flyway.play.version>
-    <guava.version>33.3.0-jre</guava.version>
+    <guava.version>33.4.8-jre</guava.version>
     <guice.version>6.0.0</guice.version>
     <guice.assisted.version>6.0.0</guice.assisted.version>
     <hikaricp.version>6.3.0</hikaricp.version>

test/java/com/arpnetworking/metrics/portal/hosts/impl/ConsulClientTest.java

@@ -15,7 +15,6 @@
  */
 package com.arpnetworking.metrics.portal.hosts.impl;
 
-import com.google.common.base.Charsets;
 import com.google.common.collect.ImmutableList;
 import com.google.common.io.Resources;
 import org.junit.Test;
@@ -26,6 +25,7 @@
 
 import java.io.IOException;
 import java.net.URI;
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
@@ -53,7 +53,7 @@ public void testCatalogNodes() throws IOException, ExecutionException, Interrupt
         Mockito.doReturn(
                 Resources.toString(
                         Resources.getResource(this.getClass(), "consul_v0.6_catalog_nodes.json"),
-                        Charsets.UTF_8))
+                        StandardCharsets.UTF_8))
                 .when(response)
                 .getBody();
 

test/java/com/arpnetworking/metrics/portal/hosts/impl/ForemanClientTest.java

@@ -15,7 +15,6 @@
  */
 package com.arpnetworking.metrics.portal.hosts.impl;
 
-import com.google.common.base.Charsets;
 import com.google.common.io.Resources;
 import org.junit.Test;
 import play.libs.ws.WSClient;
@@ -24,6 +23,7 @@
 
 import java.io.IOException;
 import java.net.URI;
+import java.nio.charset.StandardCharsets;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.ExecutionException;
@@ -52,7 +52,7 @@ public void testHostsResponseFromForeman1dot8() throws IOException, ExecutionExc
         doReturn(
                 Resources.toString(
                         Resources.getResource(this.getClass(), "foreman_v1.8_hosts_response.json"),
-                        Charsets.UTF_8))
+                        StandardCharsets.UTF_8))
                 .when(response)
                 .getBody();
 

test/java/com/arpnetworking/utility/test/ResourceHelper.java

@@ -16,11 +16,11 @@
 package com.arpnetworking.utility.test;
 
 import com.arpnetworking.commons.jackson.databind.ObjectMapperFactory;
-import com.google.common.base.Charsets;
 import com.google.common.io.Resources;
 
 import java.io.IOException;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 
 /**
  * Helper to load resources.
@@ -57,7 +57,7 @@ public static String loadResource(final Object object, final String suffix) thro
      */
     public static String loadResource(final Class<?> testClass, final String suffix) throws IOException {
         final URL resourceUrl = resourceURL(testClass, suffix);
-        return Resources.toString(resourceUrl, Charsets.UTF_8);
+        return Resources.toString(resourceUrl, StandardCharsets.UTF_8);
     }
 
     /**