Hardcode ufs.hadoop.version to 3.3.1

Alluxio · Sep 11, 2023 · dfa74af · dfa74af
1 parent 5fb603d
commit dfa74af
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 17 deletions.
diff --git a/dora/integration/tools/pom.xml b/dora/integration/tools/pom.xml
@@ -54,7 +54,7 @@
         <dependency>
           <groupId>org.alluxio</groupId>
           <artifactId>alluxio-shaded-hadoop</artifactId>
-          <version>${ufs.hadoop.version}</version>
+          <version>3.3.1</version>
         </dependency>
       </dependencies>
     </profile>
@@ -69,7 +69,7 @@
         <dependency>
           <groupId>org.alluxio</groupId>
           <artifactId>alluxio-shaded-hadoop</artifactId>
-          <version>${ufs.hadoop.version}</version>
+          <version>3.3.1</version>
         </dependency>
       </dependencies>
     </profile>

diff --git a/dora/shaded/hadoop/pom.xml b/dora/shaded/hadoop/pom.xml
@@ -19,7 +19,7 @@
     <version>304-SNAPSHOT</version>
   </parent>
   <artifactId>alluxio-shaded-hadoop</artifactId>
-  <version>${ufs.hadoop.version}</version>
+  <version>3.3.1</version>
   <packaging>jar</packaging>
   <name>Alluxio Shaded Libraries - Hadoop</name>
   <description>Shaded Hadoop Module</description>
@@ -29,7 +29,7 @@
     <!-- run properly from sub-project directories -->
     <build.path>${project.parent.parent.parent.basedir}/build</build.path>
     <!-- Composite jar name with both hadoop version and project version included -->
-    <lib.jar.name>${project.artifactId}-${ufs.hadoop.version}-${project.version}.jar</lib.jar.name>
+    <lib.jar.name>${project.artifactId}-3.3.1-${project.version}.jar</lib.jar.name>
     <shading.prefix>alluxio.shaded.hdfs</shading.prefix>
     <ufs.hadoop.version>3.3.1</ufs.hadoop.version>
   </properties>
@@ -179,7 +179,7 @@
         <dependency>
           <groupId>org.apache.hadoop</groupId>
           <artifactId>hadoop-core</artifactId>
-          <version>${ufs.hadoop.version}</version>
+          <version>3.3.1</version>
         </dependency>
       </dependencies>
     </profile>
@@ -198,12 +198,12 @@
         <dependency>
           <groupId>org.apache.hadoop</groupId>
           <artifactId>hadoop-common</artifactId>
-          <version>${ufs.hadoop.version}</version>
+          <version>3.3.1</version>
         </dependency>
         <dependency>
           <groupId>org.apache.hadoop</groupId>
           <artifactId>hadoop-hdfs</artifactId>
-          <version>${ufs.hadoop.version}</version>
+          <version>3.3.1</version>
         </dependency>
       </dependencies>
     </profile>
@@ -218,12 +218,12 @@
         <dependency>
           <groupId>org.apache.hadoop</groupId>
           <artifactId>hadoop-common</artifactId>
-          <version>${ufs.hadoop.version}</version>
+          <version>3.3.1</version>
         </dependency>
         <dependency>
           <groupId>org.apache.hadoop</groupId>
           <artifactId>hadoop-hdfs-client</artifactId>
-          <version>${ufs.hadoop.version}</version>
+          <version>3.3.1</version>
         </dependency>
       </dependencies>
     </profile>

diff --git a/dora/underfs/abfs/pom.xml b/dora/underfs/abfs/pom.xml
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-azure</artifactId>
-      <version>${ufs.hadoop.version}</version>
+      <version>3.3.1</version>
     </dependency>
     <dependency>
       <groupId>org.alluxio</groupId>

diff --git a/dora/underfs/adl/pom.xml b/dora/underfs/adl/pom.xml
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-azure-datalake</artifactId>
-      <version>${ufs.hadoop.version}</version>
+      <version>3.3.1</version>
     </dependency>
     <dependency>
       <groupId>org.alluxio</groupId>

diff --git a/dora/underfs/hdfs/pom.xml b/dora/underfs/hdfs/pom.xml
@@ -90,7 +90,7 @@
               <arguments>
                 <argument>${project.artifactId}</argument>
                 <argument>${basedir}/target/${project.artifactId}-${project.version}-jar-with-dependencies.jar</argument>
-                <argument>${build.path}/../lib/${project.artifactId}-${ufs.hadoop.version}-${project.version}.jar</argument>
+                <argument>${build.path}/../lib/${project.artifactId}-3.3.1-${project.version}.jar</argument>
               </arguments>
             </configuration>
           </execution>
@@ -148,7 +148,7 @@
         <dependency>
           <groupId>org.alluxio</groupId>
           <artifactId>alluxio-shaded-hadoop</artifactId>
-          <version>${ufs.hadoop.version}</version>
+          <version>3.3.1</version>
         </dependency>
       </dependencies>
       <build>
@@ -186,12 +186,12 @@
         <dependency>
           <groupId>org.alluxio</groupId>
           <artifactId>alluxio-shaded-hadoop</artifactId>
-          <version>${ufs.hadoop.version}</version>
+          <version>3.3.1</version>
         </dependency>
         <dependency>
           <groupId>org.apache.hadoop</groupId>
           <artifactId>hadoop-minicluster</artifactId>
-          <version>${ufs.hadoop.version}</version>
+          <version>3.3.1</version>
           <scope>test</scope>
         </dependency>
       </dependencies>

diff --git a/dora/underfs/hdfs/src/main/java-templates/alluxio/UfsConstants.java b/dora/underfs/hdfs/src/main/java-templates/alluxio/UfsConstants.java
@@ -16,7 +16,7 @@
  */
 public final class UfsConstants {
   /* Hadoop version, specified in maven property. **/
-  public static final String UFS_HADOOP_VERSION = "${ufs.hadoop.version}";
+  public static final String UFS_HADOOP_VERSION = "3.3.1";
 
   private UfsConstants() {} // prevent instantiation
 }
diff --git a/dora/underfs/wasb/pom.xml b/dora/underfs/wasb/pom.xml
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-azure</artifactId>
-      <version>${ufs.hadoop.version}</version>
+      <version>3.3.1</version>
     </dependency>
 
     <dependency>