From d36d80588a019d0be14e44b3697f15f5cc0d81d5 Mon Sep 17 00:00:00 2001
From: PJ Fanning <pjfanning@users.noreply.github.com>
Date: Wed, 31 Jan 2024 21:44:36 +0100
Subject: [PATCH] use thirdparty avro staging jar

---
 .../hadoop-client-minicluster/pom.xml            |  4 ++--
 hadoop-client-modules/hadoop-client/pom.xml      | 16 ++++++++--------
 hadoop-common-project/hadoop-common/pom.xml      |  4 ++--
 .../hadoop-mapreduce-client-nativetask/pom.xml   |  4 ++--
 .../hadoop-mapreduce-client/pom.xml              |  4 ++--
 hadoop-mapreduce-project/pom.xml                 |  5 +++--
 hadoop-project/pom.xml                           | 10 +++++-----
 pom.xml                                          |  5 +++++
 8 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/hadoop-client-modules/hadoop-client-minicluster/pom.xml b/hadoop-client-modules/hadoop-client-minicluster/pom.xml
index 6f4cba77128c6b..8dc1ec48d2c8b3 100644
--- a/hadoop-client-modules/hadoop-client-minicluster/pom.xml
+++ b/hadoop-client-modules/hadoop-client-minicluster/pom.xml
@@ -137,8 +137,8 @@
           <artifactId>avro</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>com.github.pjfanning.hadoop.thirdparty</groupId>
-          <artifactId>hadoop-shaded-avro</artifactId>
+          <groupId>org.apache.hadoop.thirdparty</groupId>
+          <artifactId>hadoop-shaded-avro_1_11</artifactId>
         </exclusion>
         <exclusion>
           <groupId>org.apache.curator</groupId>
diff --git a/hadoop-client-modules/hadoop-client/pom.xml b/hadoop-client-modules/hadoop-client/pom.xml
index cfebfd36d69cf9..8dcfb9ba151a53 100644
--- a/hadoop-client-modules/hadoop-client/pom.xml
+++ b/hadoop-client-modules/hadoop-client/pom.xml
@@ -115,8 +115,8 @@
           <artifactId>avro</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>com.github.pjfanning.hadoop.thirdparty</groupId>
-          <artifactId>hadoop-shaded-avro</artifactId>
+          <groupId>org.apache.hadoop.thirdparty</groupId>
+          <artifactId>hadoop-shaded-avro_1_11</artifactId>
         </exclusion>
         <exclusion>
           <groupId>org.eclipse.jetty</groupId>
@@ -171,8 +171,8 @@
           <artifactId>avro</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>com.github.pjfanning.hadoop.thirdparty</groupId>
-          <artifactId>hadoop-shaded-avro</artifactId>
+          <groupId>org.apache.hadoop.thirdparty</groupId>
+          <artifactId>hadoop-shaded-avro_1_11</artifactId>
         </exclusion>
         <exclusion>
           <groupId>com.sun.jersey</groupId>
@@ -287,8 +287,8 @@
           <artifactId>avro</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>com.github.pjfanning.hadoop.thirdparty</groupId>
-          <artifactId>hadoop-shaded-avro</artifactId>
+          <groupId>org.apache.hadoop.thirdparty</groupId>
+          <artifactId>hadoop-shaded-avro_1_11</artifactId>
         </exclusion>
         <exclusion>
           <groupId>org.apache.hadoop</groupId>
@@ -332,8 +332,8 @@
           <artifactId>avro</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>com.github.pjfanning.hadoop.thirdparty</groupId>
-          <artifactId>hadoop-shaded-avro</artifactId>
+          <groupId>org.apache.hadoop.thirdparty</groupId>
+          <artifactId>hadoop-shaded-avro_1_11</artifactId>
         </exclusion>
         <exclusion>
           <groupId>org.apache.hadoop</groupId>
diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml
index 03803d526d8105..77d146ba84641b 100644
--- a/hadoop-common-project/hadoop-common/pom.xml
+++ b/hadoop-common-project/hadoop-common/pom.xml
@@ -249,8 +249,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.github.pjfanning.hadoop.thirdparty</groupId>
-      <artifactId>hadoop-shaded-avro</artifactId>
+      <groupId>org.apache.hadoop.thirdparty</groupId>
+      <artifactId>hadoop-shaded-avro_1_11</artifactId>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/pom.xml
index 797fec2c643afe..4456d047a67919 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/pom.xml
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/pom.xml
@@ -41,8 +41,8 @@
       <artifactId>hadoop-mapreduce-client-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.github.pjfanning.hadoop.thirdparty</groupId>
-      <artifactId>hadoop-shaded-avro</artifactId>
+      <groupId>org.apache.hadoop.thirdparty</groupId>
+      <artifactId>hadoop-shaded-avro_1_11</artifactId>
       <exclusions>
         <exclusion>
           <groupId>org.slf4j</groupId>
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml
index 34b081598d9f6b..3b2e615db0c0fe 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml
@@ -42,8 +42,8 @@
       <scope>${transient.protobuf2.scope}</scope>
     </dependency>
     <dependency>
-      <groupId>com.github.pjfanning.hadoop.thirdparty</groupId>
-      <artifactId>hadoop-shaded-avro</artifactId>
+      <groupId>org.apache.hadoop.thirdparty</groupId>
+      <artifactId>hadoop-shaded-avro_1_11</artifactId>
       <exclusions>
         <exclusion>
           <groupId>org.slf4j</groupId>
diff --git a/hadoop-mapreduce-project/pom.xml b/hadoop-mapreduce-project/pom.xml
index e1c5fc5cd3883e..fae53f04614c79 100644
--- a/hadoop-mapreduce-project/pom.xml
+++ b/hadoop-mapreduce-project/pom.xml
@@ -56,8 +56,9 @@
       <artifactId>protobuf-java</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.github.pjfanning.hadoop.thirdparty</groupId>
-      <artifactId>hadoop-shaded-avro</artifactId>
+      <groupId>org.apache.hadoop.thirdparty</groupId>
+      <artifactId>hadoop-shaded-avro_1.11</artifactId>
+      <version>${hadoop-thirdparty.avro.version}</version>
       <exclusions>
         <exclusion>
           <groupId>org.slf4j</groupId>
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 6788b2700f83ad..fae6c6b361c2b4 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -63,8 +63,7 @@
     <java.security.egd>file:///dev/urandom</java.security.egd>
 
     <!-- avro version: avro.version needs to match avro version used in hadoop-shaded-avro -->
-    <avro.version>1.11.1</avro.version>
-    <hadoop-shaded-avro.version>1.2.0-rc1</hadoop-shaded-avro.version>
+    <avro.version>1.11.3</avro.version>
 
     <!-- jersey version -->
     <jersey.version>1.19.4</jersey.version>
@@ -98,6 +97,7 @@
     <protoc.path>${env.HADOOP_PROTOC_PATH}</protoc.path>
 
     <hadoop-thirdparty.version>1.1.1</hadoop-thirdparty.version>
+    <hadoop-thirdparty.avro.version>1.2.0</hadoop-thirdparty.avro.version>
     <hadoop-thirdparty-protobuf.version>${hadoop-thirdparty.version}</hadoop-thirdparty-protobuf.version>
     <hadoop-thirdparty-guava.version>${hadoop-thirdparty.version}</hadoop-thirdparty-guava.version>
     <hadoop-thirdparty-shaded-prefix>org.apache.hadoop.thirdparty</hadoop-thirdparty-shaded-prefix>
@@ -1325,9 +1325,9 @@
         </exclusions>
       </dependency>
       <dependency>
-        <groupId>com.github.pjfanning.hadoop.thirdparty</groupId>
-        <artifactId>hadoop-shaded-avro</artifactId>
-        <version>${hadoop-shaded-avro.version}</version>
+        <groupId>org.apache.hadoop.thirdparty</groupId>
+        <artifactId>hadoop-shaded-avro_1_11</artifactId>
+        <version>${hadoop-thirdparty.avro.version}</version>
       </dependency>
       <dependency>
         <groupId>net.sf.kosmosfs</groupId>
diff --git a/pom.xml b/pom.xml
index 964c23c6cb56da..eb245405406047 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,6 +52,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/x
   </distributionManagement>
 
   <repositories>
+    <repository>
+      <id>apache-staging</id>
+      <name>Apache Development Staging Repository</name>
+      <url>https://repository.apache.org/content/groups/staging</url>
+    </repository>
     <repository>
       <id>${distMgmtSnapshotsId}</id>
       <name>${distMgmtSnapshotsName}</name>