From c01032f20003ede4f2f74e052b250d415e95ebc2 Mon Sep 17 00:00:00 2001
From: Fokko Driesprong <fokko@apache.org>
Date: Thu, 20 Jun 2019 16:57:14 +0200
Subject: [PATCH 1/2] HBASE-22613: Bump Apache Avro to 1.9.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0a7f1f6370a9..3b04a037c821 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1439,7 +1439,7 @@
     <netty.hadoop.version>3.6.2.Final</netty.hadoop.version>
     <!-- end HBASE-15925 default hadoop compatibility values -->
     <audience-annotations.version>0.5.0</audience-annotations.version>
-    <avro.version>1.7.7</avro.version>
+    <avro.version>1.9.0</avro.version>
     <caffeine.version>2.6.2</caffeine.version>
     <commons-codec.version>1.10</commons-codec.version>
     <commons-validator.version>1.6</commons-validator.version>

From 56649101e6f44dab83f5b0e1bb2f8565d9608df4 Mon Sep 17 00:00:00 2001
From: Fokko Driesprong <fokko@apache.org>
Date: Mon, 24 Jun 2019 11:25:38 +0200
Subject: [PATCH 2/2] HBASE-22613: Remove Apache Avro as a dependency

---
 hbase-shaded/pom.xml | 4 ----
 pom.xml              | 7 -------
 2 files changed, 11 deletions(-)

diff --git a/hbase-shaded/pom.xml b/hbase-shaded/pom.xml
index 4b20de2b7c25..fbca9cccef4b 100644
--- a/hbase-shaded/pom.xml
+++ b/hbase-shaded/pom.xml
@@ -317,10 +317,6 @@
 
 
                                     <!-- org.apache relocations not in org.apache.hadoop or org.apache.commons -->
-                                    <relocation>
-                                        <pattern>org.apache.avro</pattern>
-                                        <shadedPattern>${shaded.prefix}.org.apache.avro</shadedPattern>
-                                    </relocation>
                                     <relocation>
                                         <pattern>org.apache.curator</pattern>
                                         <shadedPattern>${shaded.prefix}.org.apache.curator</shadedPattern>
diff --git a/pom.xml b/pom.xml
index 3b04a037c821..99f5b783d273 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1439,7 +1439,6 @@
     <netty.hadoop.version>3.6.2.Final</netty.hadoop.version>
     <!-- end HBASE-15925 default hadoop compatibility values -->
     <audience-annotations.version>0.5.0</audience-annotations.version>
-    <avro.version>1.9.0</avro.version>
     <caffeine.version>2.6.2</caffeine.version>
     <commons-codec.version>1.10</commons-codec.version>
     <commons-validator.version>1.6</commons-validator.version>
@@ -1840,12 +1839,6 @@
         <artifactId>log4j</artifactId>
         <version>${log4j.version}</version>
       </dependency>
-      <!-- Avro dependencies we mostly get transitively, manual version coallescing -->
-      <dependency>
-        <groupId>org.apache.avro</groupId>
-        <artifactId>avro</artifactId>
-        <version>${avro.version}</version>
-      </dependency>
       <!--This is not used by hbase directly.  Used by thrift,
           dropwizard and zk.-->
       <dependency>