[avro] branch master updated: AVRO-2331: Use JDK Base64

[dkulp]

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

dkulp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/avro.git


The following commit(s) were added to refs/heads/master by this push:
     new e16f30a  AVRO-2331: Use JDK Base64
e16f30a is described below

commit e16f30abf6d1b7befcc36f49a5bc39166a75f814
Author: Beluga Behr <dam6...@gmail.com>
AuthorDate: Tue Mar 5 10:44:00 2019 -0500

    AVRO-2331: Use JDK Base64
---
 lang/java/mapred/pom.xml                                    |  5 -----
 .../java/org/apache/avro/mapred/AvroMultipleInputs.java     | 13 ++++++++-----
 lang/java/pom.xml                                           |  1 -
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/lang/java/mapred/pom.xml b/lang/java/mapred/pom.xml
index e0fee81..9d454fa 100644
--- a/lang/java/mapred/pom.xml
+++ b/lang/java/mapred/pom.xml
@@ -156,11 +156,6 @@
       <artifactId>jackson-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
-      <version>${commons-codec.version}</version>
-    </dependency>
-    <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-client</artifactId>
       <!-- hadoop's execution environment provides its own jars, usurping any 
others.
diff --git 
a/lang/java/mapred/src/main/java/org/apache/avro/mapred/AvroMultipleInputs.java 
b/lang/java/mapred/src/main/java/org/apache/avro/mapred/AvroMultipleInputs.java
index 4245c8a..3e0c761 100644
--- 
a/lang/java/mapred/src/main/java/org/apache/avro/mapred/AvroMultipleInputs.java
+++ 
b/lang/java/mapred/src/main/java/org/apache/avro/mapred/AvroMultipleInputs.java
@@ -17,13 +17,14 @@
  */
 package org.apache.avro.mapred;
 
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.avro.Schema;
 import org.apache.avro.SchemaParseException;
-import org.apache.commons.codec.binary.Base64;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.mapred.JobConf;
 
@@ -206,13 +207,15 @@ public class AvroMultipleInputs {
   }
 
   private static String toBase64(String rawString) {
-    Base64 base64decoder = new Base64();
-    return new String(base64decoder.encode(rawString.getBytes()));
+    final byte[] buf = rawString.getBytes(StandardCharsets.UTF_8);
+    return new String(Base64.getMimeEncoder().encode(buf),
+        StandardCharsets.UTF_8);
   }
 
   private static String fromBase64(String base64String) {
-    Base64 base64decoder = new Base64();
-    return new String(base64decoder.decode(base64String.getBytes()));
+    final byte[] buf = base64String.getBytes(StandardCharsets.UTF_8);
+    return new String(Base64.getMimeDecoder().decode(buf),
+        StandardCharsets.UTF_8);
   }
 
 }
diff --git a/lang/java/pom.xml b/lang/java/pom.xml
index d8b8b13..ae4eec0 100644
--- a/lang/java/pom.xml
+++ b/lang/java/pom.xml
@@ -53,7 +53,6 @@
     <maven.version>2.0.11</maven.version>
     <ant.version>1.10.5</ant.version>
     <commons-cli.version>1.4</commons-cli.version>
-    <commons-codec.version>1.12</commons-codec.version>
     <commons-compress.version>1.18</commons-compress.version>
     <commons-lang.version>3.8.1</commons-lang.version>
     <tukaani.version>1.8</tukaani.version>