Patch for Avro master to use shaded client from HADOOP-11804

avro.patch

diff --git a/lang/java/mapred/pom.xml b/lang/java/mapred/pom.xml
index 4e2f417..ae30871 100644
--- a/lang/java/mapred/pom.xml
+++ b/lang/java/mapred/pom.xml
@@ -220,7 +220,14 @@
       <dependencies>
         <dependency>
           <groupId>org.apache.hadoop</groupId>
-          <artifactId>hadoop-client</artifactId>
+          <artifactId>hadoop-client-api</artifactId>
+          <!-- hadoop's execution environment provides its own jars, usurping any others.
+            So we should not include it here -->
+          <scope>compile</scope>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-client-runtime</artifactId>
           <!-- hadoop's execution environment provides its own jars, usurping any others.
             So we should not include it here -->
           <scope>provided</scope>
diff --git a/lang/java/pom.xml b/lang/java/pom.xml
index 8afcefd..5ce346d 100644
--- a/lang/java/pom.xml
+++ b/lang/java/pom.xml
@@ -43,7 +43,7 @@
       -Dhadoop.version=1 or leave unspecified to build against Hadoop 2
     -->
     <hadoop1.version>1.2.1</hadoop1.version>
-    <hadoop2.version>2.5.1</hadoop2.version>
+    <hadoop2.version>3.0.0-alpha2-SNAPSHOT</hadoop2.version>
     <jackson.version>1.9.13</jackson.version>
     <jetty.version>6.1.26</jetty.version>
     <jetty-servlet-api.version>2.5-20081211</jetty-servlet-api.version>
@@ -467,8 +467,15 @@
       </dependency>
       <dependency>
         <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-client</artifactId>
+        <artifactId>hadoop-client-api</artifactId>
         <version>${hadoop2.version}</version>
+        <scope>compile</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.hadoop</groupId>
+        <artifactId>hadoop-client-runtime</artifactId>
+        <version>${hadoop2.version}</version>
+        <scope>runtime</scope>
       </dependency>
       <dependency>
         <groupId>org.easymock</groupId>
diff --git a/lang/java/tools/pom.xml b/lang/java/tools/pom.xml
index 18e0155..ded370b 100644
--- a/lang/java/tools/pom.xml
+++ b/lang/java/tools/pom.xml
@@ -254,7 +254,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-client</artifactId>
+      <artifactId>hadoop-client-runtime</artifactId>
       <optional>true</optional>
       <exclusions>
         <exclusion> <!-- GPL -->
@@ -262,6 +262,19 @@
           <artifactId>jsr305</artifactId>
         </exclusion>
       </exclusions>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-client-api</artifactId>
+      <optional>true</optional>
+      <exclusions>
+        <exclusion> <!-- GPL -->
+          <groupId>com.google.code.findbugs</groupId>
+          <artifactId>jsr305</artifactId>
+        </exclusion>
+      </exclusions>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>net.sf.jopt-simple</groupId>
diff --git a/lang/java/trevni/avro/pom.xml b/lang/java/trevni/avro/pom.xml
index f2380fe..bf2f47b 100644
--- a/lang/java/trevni/avro/pom.xml
+++ b/lang/java/trevni/avro/pom.xml
@@ -113,7 +113,7 @@
       <dependencies>
         <dependency>
           <groupId>org.apache.hadoop</groupId>
-          <artifactId>hadoop-client</artifactId>
+          <artifactId>hadoop-client-runtime</artifactId>
           <version>${hadoop2.version}</version>
           <!-- hadoop's execution environment provides its own jars, usurping any others.
             So we should not include it here -->