svn commit: r1807336 - in /sling/trunk/testing/junit/teleporter: pom.xml src/main/java/org/apache/sling/testing/teleporter/client/TeleporterHttpClient.java

[bd...@apache.org]

Author: bdelacretaz
Date: Tue Sep  5 10:39:55 2017
New Revision: 1807336

URL: http://svn.apache.org/viewvc?rev=1807336&view=rev
Log:
SLING-7101 - use java.util.Base64 instead of javax.xml.bind.DatatypeConverter

Modified:
    sling/trunk/testing/junit/teleporter/pom.xml
    sling/trunk/testing/junit/teleporter/src/main/java/org/apache/sling/testing/teleporter/client/TeleporterHttpClient.java

Modified: sling/trunk/testing/junit/teleporter/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/testing/junit/teleporter/pom.xml?rev=1807336&r1=1807335&r2=1807336&view=diff
==============================================================================
--- sling/trunk/testing/junit/teleporter/pom.xml (original)
+++ sling/trunk/testing/junit/teleporter/pom.xml Tue Sep  5 10:39:55 2017
@@ -32,6 +32,10 @@
   <name>Apache Sling JUnit Tests Teleporter</name>
   <description>Client-side implementation of the Teleporter mechanism for server-side JUnit tests</description>
   
+  <properties>
+    <sling.java.version>8</sling.java.version>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

Modified: sling/trunk/testing/junit/teleporter/src/main/java/org/apache/sling/testing/teleporter/client/TeleporterHttpClient.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/junit/teleporter/src/main/java/org/apache/sling/testing/teleporter/client/TeleporterHttpClient.java?rev=1807336&r1=1807335&r2=1807336&view=diff
==============================================================================
--- sling/trunk/testing/junit/teleporter/src/main/java/org/apache/sling/testing/teleporter/client/TeleporterHttpClient.java (original)
+++ sling/trunk/testing/junit/teleporter/src/main/java/org/apache/sling/testing/teleporter/client/TeleporterHttpClient.java Tue Sep  5 10:39:55 2017
@@ -29,6 +29,7 @@ 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;
@@ -41,7 +42,6 @@ import javax.json.JsonReader;
 import javax.json.JsonString;
 import javax.json.JsonValue;
 import javax.json.JsonValue.ValueType;
-import javax.xml.bind.DatatypeConverter;
 
 import org.apache.commons.io.IOUtils;
 import org.junit.runner.Result;
@@ -89,7 +89,7 @@ class TeleporterHttpClient {
     
     public void setConnectionCredentials(URLConnection c) {
         if(credentials != null && !credentials.isEmpty()) {
-            final String basicAuth = "Basic " + new String(DatatypeConverter.printBase64Binary(credentials.getBytes()));
+            final String basicAuth = "Basic " + Base64.getEncoder().encodeToString(credentials.getBytes());
             c.setRequestProperty ("Authorization", basicAuth);
         }
     }