From b264473f60336ce4ea28d71631ca9164bdaa3e94 Mon Sep 17 00:00:00 2001
From: amathur <amathur@cloudera.com>
Date: Thu, 2 Feb 2023 18:54:27 +0530
Subject: [PATCH] HIVE-26954: Upgrade avro to 1.11.1

---
 iceberg/pom.xml | 2 +-
 pom.xml         | 3 +--
 ql/pom.xml      | 1 -
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/iceberg/pom.xml b/iceberg/pom.xml
index 348bf5b64f4d..88247e60a70e 100644
--- a/iceberg/pom.xml
+++ b/iceberg/pom.xml
@@ -28,7 +28,7 @@
     <iceberg.version>1.0.0</iceberg.version>
     <kryo-shaded.version>4.0.2</kryo-shaded.version>
     <iceberg.mockito-core.version>3.4.4</iceberg.mockito-core.version>
-    <iceberg.avro.version>1.9.2</iceberg.avro.version>
+    <iceberg.avro.version>1.11.1</iceberg.avro.version>
     <iceberg.kryo.version>4.0.2</iceberg.kryo.version>
     <iceberg.checkstyle.plugin.version>3.1.2</iceberg.checkstyle.plugin.version>
     <spotless.maven.plugin.version>2.5.0</spotless.maven.plugin.version>
diff --git a/pom.xml b/pom.xml
index 45de65a3704b..22e8d53cc6f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,7 +107,7 @@
     <!-- Include arrow for LlapOutputFormatService -->
     <arrow.version>2.0.0</arrow.version>
     <avatica.version>1.12.0</avatica.version>
-    <avro.version>1.8.2</avro.version>
+    <avro.version>1.11.1</avro.version>
     <bcprov-jdk15on.version>1.64</bcprov-jdk15on.version>
     <calcite.version>1.25.0</calcite.version>
     <datanucleus-api-jdo.version>5.2.8</datanucleus-api-jdo.version>
@@ -559,7 +559,6 @@
       <dependency>
         <groupId>org.apache.avro</groupId>
         <artifactId>avro-mapred</artifactId>
-        <classifier>hadoop2</classifier>
         <version>${avro.version}</version>
         <exclusions>
           <exclusion>
diff --git a/ql/pom.xml b/ql/pom.xml
index d924ac5b5770..e65636058a5f 100644
--- a/ql/pom.xml
+++ b/ql/pom.xml
@@ -241,7 +241,6 @@
     <dependency>
       <groupId>org.apache.avro</groupId>
       <artifactId>avro-mapred</artifactId>
-      <classifier>hadoop2</classifier>
     </dependency>
     <dependency>
       <groupId>org.apache.ant</groupId>