From 979f1607f274ab1128322b8a31ebe5ba851a4125 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Lipt=C3=A1k?= <gliptak@gmail.com>
Date: Fri, 6 Nov 2015 19:22:07 -0500
Subject: [PATCH 1/3] SPARK-11565 Replace deprecated DigestUtils.shaHex call

---
 core/pom.xml                                                | 6 ++++++
 .../org/apache/spark/sql/catalyst/expressions/misc.scala    | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index be40d9936afd7..b8c42d79920d9 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -87,6 +87,12 @@
       <groupId>org.apache.curator</groupId>
       <artifactId>curator-recipes</artifactId>
     </dependency>
+    <dependency>
+      <!-- direct dependency on version 1.10 -->
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <version>1.10</version>
+    </dependency>
 
     <!-- Jetty dependencies promoted to compile here so they are shaded
          and inlined into spark-core jar -->
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/misc.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/misc.scala
index f4ccadd9c563e..f6f52aec4f29a 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/misc.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/misc.scala
@@ -143,11 +143,11 @@ case class Sha1(child: Expression) extends UnaryExpression with ImplicitCastInpu
   override def inputTypes: Seq[DataType] = Seq(BinaryType)
 
   protected override def nullSafeEval(input: Any): Any =
-    UTF8String.fromString(DigestUtils.shaHex(input.asInstanceOf[Array[Byte]]))
+    UTF8String.fromString(DigestUtils.sha1Hex(input.asInstanceOf[Array[Byte]]))
 
   override def genCode(ctx: CodegenContext, ev: ExprCode): String = {
     defineCodeGen(ctx, ev, c =>
-      s"UTF8String.fromString(org.apache.commons.codec.digest.DigestUtils.shaHex($c))"
+      s"UTF8String.fromString(org.apache.commons.codec.digest.DigestUtils.sha1Hex($c))"
     )
   }
 }

From 56f32b4099c4c14cd81456deb41b0eddd233262a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Lipt=C3=A1k?= <gliptak@gmail.com>
Date: Sat, 6 Feb 2016 14:09:40 -0500
Subject: [PATCH 2/3] Remove commons-codec dependency from core/pom.xml

---
 core/pom.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index b8c42d79920d9..be40d9936afd7 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -87,12 +87,6 @@
       <groupId>org.apache.curator</groupId>
       <artifactId>curator-recipes</artifactId>
     </dependency>
-    <dependency>
-      <!-- direct dependency on version 1.10 -->
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
-      <version>1.10</version>
-    </dependency>
 
     <!-- Jetty dependencies promoted to compile here so they are shaded
          and inlined into spark-core jar -->

From 80dcf1f3ec6883426918cf9aa24c3a3c8e9f788a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Lipt=C3=A1k?= <gliptak@gmail.com>
Date: Sun, 7 Feb 2016 09:00:14 -0500
Subject: [PATCH 3/3] SPARK-11565 Add commons-codec dependency to sql/catalyst

---
 sql/catalyst/pom.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sql/catalyst/pom.xml b/sql/catalyst/pom.xml
index c2ad9b99f3ac9..5d1d9edd251c6 100644
--- a/sql/catalyst/pom.xml
+++ b/sql/catalyst/pom.xml
@@ -75,6 +75,10 @@
       <groupId>org.antlr</groupId>
       <artifactId>antlr-runtime</artifactId>
     </dependency>
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+    </dependency>
   </dependencies>
   <build>
     <outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory>