build(deps): bump google-http-client group

TechnicPack · Sep 2, 2024 · bfef261 · bfef261
1 parent c6ae655
commit bfef261
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 11 deletions.
diff --git a/pom.xml b/pom.xml
@@ -119,26 +119,34 @@
             <artifactId>google-oauth-client-java6</artifactId>
             <version>1.36.0</version>
         </dependency>
+
         <dependency>
             <groupId>com.google.http-client</groupId>
             <artifactId>google-http-client</artifactId>
-            <version>1.44.2</version>
+            <version>1.45.0</version>
         </dependency>
         <!-- For the current Apache HTTP client -->
         <dependency>
             <groupId>com.google.http-client</groupId>
-            <artifactId>google-http-client-apache-v2</artifactId>
-            <version>1.44.2</version>
+            <artifactId>google-http-client-apache-v5</artifactId>
+            <version>1.45.0</version>
         </dependency>
         <dependency>
             <groupId>com.google.http-client</groupId>
             <artifactId>google-http-client-gson</artifactId>
-            <version>1.44.2</version>
+            <version>1.45.0</version>
+        </dependency>
+        <!-- Required to silence logging error from Apache HttpClient v5 -->
+        <!-- https://www.slf4j.org/codes.html#StaticLoggerBinder -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>2.0.16</version>
         </dependency>
         <dependency>
-            <groupId>org.jboss.logging</groupId>
-            <artifactId>commons-logging-jboss-logging</artifactId>
-            <version>1.0.0.Final</version>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-nop</artifactId>
+            <version>2.0.16</version>
         </dependency>
     </dependencies>
 

diff --git a/src/main/java/net/technicpack/minecraftcore/MojangUtils.java b/src/main/java/net/technicpack/minecraftcore/MojangUtils.java
@@ -20,7 +20,7 @@
 package net.technicpack.minecraftcore;
 
 import com.google.api.client.http.*;
-import com.google.api.client.http.apache.v2.ApacheHttpTransport;
+import com.google.api.client.http.apache.v5.Apache5HttpTransport;
 import com.google.api.client.json.JsonFactory;
 import com.google.api.client.json.JsonObjectParser;
 import com.google.api.client.json.gson.GsonFactory;
@@ -54,7 +54,7 @@
 import java.util.regex.Pattern;
 
 public class MojangUtils {
-    private static final HttpTransport HTTP_TRANSPORT = new ApacheHttpTransport();
+    private static final HttpTransport HTTP_TRANSPORT = new Apache5HttpTransport();
     private static final JsonFactory JSON_FACTORY = new GsonFactory();
     private static final HttpRequestFactory REQUEST_FACTORY;
 

diff --git a/src/main/java/net/technicpack/minecraftcore/microsoft/auth/MicrosoftAuthenticator.java b/src/main/java/net/technicpack/minecraftcore/microsoft/auth/MicrosoftAuthenticator.java
@@ -3,8 +3,10 @@
 import com.google.api.client.auth.oauth2.*;
 import com.google.api.client.extensions.java6.auth.oauth2.AuthorizationCodeInstalledApp;
 import com.google.api.client.extensions.jetty.auth.oauth2.LocalServerReceiver;
+
+
 import com.google.api.client.http.*;
-import com.google.api.client.http.apache.v2.ApacheHttpTransport;
+import com.google.api.client.http.apache.v5.Apache5HttpTransport;
 import com.google.api.client.http.json.JsonHttpContent;
 import com.google.api.client.json.JsonFactory;
 import com.google.api.client.json.JsonObjectParser;
@@ -29,7 +31,7 @@
 import static net.technicpack.launchercore.exception.MicrosoftAuthException.ExceptionType.*;
 
 public class MicrosoftAuthenticator {
-    private static final HttpTransport HTTP_TRANSPORT = new ApacheHttpTransport();
+    private static final HttpTransport HTTP_TRANSPORT = new Apache5HttpTransport();
     private static final JsonFactory JSON_FACTORY = new GsonFactory();
     private final HttpRequestFactory REQUEST_FACTORY;