From bc857b3df9eaf9b1b1f66d0969571ca2bb308198 Mon Sep 17 00:00:00 2001
From: Denes Bodo <dbodo@hortonworks.com>
Date: Fri, 11 Jan 2019 14:37:08 +0100
Subject: [PATCH] HADOOP-13386 Upgrade avro version in Hadoop

---
 hadoop-client-modules/hadoop-client-runtime/pom.xml | 1 +
 hadoop-project/pom.xml                              | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/hadoop-client-modules/hadoop-client-runtime/pom.xml b/hadoop-client-modules/hadoop-client-runtime/pom.xml
index 1e98a61a94c74..8d0a856fa03d9 100644
--- a/hadoop-client-modules/hadoop-client-runtime/pom.xml
+++ b/hadoop-client-modules/hadoop-client-runtime/pom.xml
@@ -157,6 +157,7 @@
                       <!-- Leave javax APIs that are stable -->
                       <!-- the jdk ships part of the javax.annotation namespace, so if we want to relocate this we'll have to care it out by class :( -->
                       <exclude>com.google.code.findbugs:jsr305</exclude>
+                      <exclude>org.apache.avro:avro</exclude>
                       <exclude>io.dropwizard.metrics:metrics-core</exclude>
                       <exclude>org.eclipse.jetty.websocket:*</exclude>
                       <exclude>org.eclipse.jetty:jetty-servlet</exclude>
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 865e03d863be2..77128eca704d5 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -62,7 +62,7 @@
     <java.security.egd>file:///dev/urandom</java.security.egd>
 
     <!-- avro version -->
-    <avro.version>1.7.7</avro.version>
+    <avro.version>1.8.1</avro.version>
 
     <!-- jersey version -->
     <jersey.version>1.19</jersey.version>
@@ -638,6 +638,12 @@
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-compress</artifactId>
         <version>1.18</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.tukaani</groupId>
+            <artifactId>xz</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.apache.commons</groupId>