(sling-org-apache-sling-junit-teleporter) branch master updated: SLING-9327 - Teleporter not working with jdk11 due to missing xml bind classes (#6)

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-junit-teleporter.git


The following commit(s) were added to refs/heads/master by this push:
     new 041e57c  SLING-9327 - Teleporter not working with jdk11 due to missing 
xml bind classes (#6)
041e57c is described below

commit 041e57c8249fb0e1c8d726c0a4452fc8bef45e97
Author: Robert Munteanu <romb...@apache.org>
AuthorDate: Tue Apr 16 17:46:00 2024 +0200

    SLING-9327 - Teleporter not working with jdk11 due to missing xml bind 
classes (#6)
    
    Remove unneeded commons-codec dependency.
---
 pom.xml                                                       |  6 ------
 .../sling/testing/teleporter/client/TeleporterHttpClient.java | 11 ++++-------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index e6ed6f2..c39b1cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -112,12 +112,6 @@
       <version>3.4</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
-      <version>1.14</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
diff --git 
a/src/main/java/org/apache/sling/testing/teleporter/client/TeleporterHttpClient.java
 
b/src/main/java/org/apache/sling/testing/teleporter/client/TeleporterHttpClient.java
index abad021..61a43b6 100644
--- 
a/src/main/java/org/apache/sling/testing/teleporter/client/TeleporterHttpClient.java
+++ 
b/src/main/java/org/apache/sling/testing/teleporter/client/TeleporterHttpClient.java
@@ -23,13 +23,13 @@ import java.io.InputStream;
 import java.io.ObjectInputStream;
 import java.io.StringReader;
 import java.io.StringWriter;
-import java.io.UnsupportedEncodingException;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
+import java.util.Base64;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -43,7 +43,6 @@ import javax.json.JsonString;
 import javax.json.JsonValue;
 import javax.json.JsonValue.ValueType;
 
-import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.io.IOUtils;
 import org.junit.runner.Result;
 import org.junit.runner.notification.Failure;
@@ -106,11 +105,9 @@ class TeleporterHttpClient {
     }
 
     static String encodeBase64(String data) {
-        try {
-            return Base64.encodeBase64String(data.getBytes("UTF-8"));
-        } catch(UnsupportedEncodingException uee) {
-            throw new RuntimeException(uee);
-        }
+        byte[] encoded = 
Base64.getEncoder().encode(data.getBytes(StandardCharsets.UTF_8));
+        return new String(encoded, StandardCharsets.UTF_8);
+        
     }
     
     public void setConnectionCredentials(URLConnection c) {