R

apache · Mar 19, 2024 · 7e72132 · 7e72132
1 parent 8adcc32
commit 7e72132
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 15 deletions.
diff --git a/pom.xml b/pom.xml
@@ -422,8 +422,6 @@
         <scope>${hadoop.deps.scope}</scope>
       </dependency>
 
-
-
       <dependency>
         <groupId>org.apache.hadoop</groupId>
         <artifactId>hadoop-yarn-server-tests</artifactId>

diff --git a/rlang/pom.xml b/rlang/pom.xml
@@ -38,7 +38,7 @@
 
         <spark.archive>spark-${spark.version}</spark.archive>
         <spark.bin.download.url>
-            https://archive.apache.org/dist/spark/${spark.archive}/${spark.archive}-bin-without-hadoop.tgz
+            https://archive.apache.org/dist/spark/${spark.archive}/${spark.archive}-bin-hadoop3.tgz
         </spark.bin.download.url>
         <interpreter.jar.name>zeppelin-interpreter-r</interpreter.jar.name>
     </properties>
@@ -105,12 +105,6 @@
             <groupId>org.apache.spark</groupId>
             <artifactId>spark-core_2.12</artifactId>
             <version>${spark.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.hadoop</groupId>
-                    <artifactId>hadoop-client-api</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>
@@ -119,19 +113,22 @@
             <version>${jsoup.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-client-api</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-client-runtime</artifactId>
-            <version>${hadoop.version}</version>
-            <scope>compile</scope>
         </dependency>
+
         <dependency>
             <groupId>com.mashape.unirest</groupId>
             <artifactId>unirest-java</artifactId>
             <version>1.4.9</version>
             <scope>test</scope>
         </dependency>
-
     </dependencies>
 
     <build>
@@ -176,7 +173,7 @@
                             <resources>
                                 <resource>
                                     <directory>
-                                        ${project.build.directory}/spark-${spark.version}-bin-without-hadoop/R/lib
+                                        ${project.build.directory}/spark-${spark.version}-bin-hadoop3/R/lib
                                     </directory>
                                 </resource>
                             </resources>

diff --git a/spark/spark-shims/pom.xml b/spark/spark-shims/pom.xml
@@ -38,8 +38,7 @@
     -->
     <dependency>
       <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-common</artifactId>
-      <version>${hadoop.version}</version>
+      <artifactId>hadoop-client-api</artifactId>
       <scope>provided</scope>
     </dependency>
   </dependencies>