From 2c47760df93541e8376b373f4bf6a84dde5a41e1 Mon Sep 17 00:00:00 2001
From: weiting-chen <weiting.chen@intel.com>
Date: Thu, 1 Jul 2021 15:40:35 +0800
Subject: [PATCH 1/3] Fix Hadoop version issue

---
 arrow-data-source/pom.xml      |   1 +
 native-sql-engine/core/pom.xml |   1 +
 pom.xml                        | 142 ++++++++++++++++++---------------
 3 files changed, 78 insertions(+), 66 deletions(-)

diff --git a/arrow-data-source/pom.xml b/arrow-data-source/pom.xml
index 285a85cb1..3f72871f2 100644
--- a/arrow-data-source/pom.xml
+++ b/arrow-data-source/pom.xml
@@ -50,6 +50,7 @@
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-client</artifactId>
+      <version>${hadoop.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/native-sql-engine/core/pom.xml b/native-sql-engine/core/pom.xml
index 1c8986677..e7263e99a 100644
--- a/native-sql-engine/core/pom.xml
+++ b/native-sql-engine/core/pom.xml
@@ -255,6 +255,7 @@
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-client</artifactId>
+      <version>${hadoop.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/pom.xml b/pom.xml
index 9f24f543a..1c8035e8f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,13 +29,88 @@
     </license>
   </licenses>
 
+  <modules>
+    <module>arrow-data-source</module>
+    <module>native-sql-engine/core</module>
+    <module>shims</module>
+  </modules>
+
+  <profiles>
+    <profile>
+      <id>spark</id>
+      <activation>
+          <activeByDefault>true</activeByDefault>
+      </activation>
+      <properties>
+          <spark.version>${spark311.version}</spark.version>
+      </properties>
+    </profile>
+    <profile>
+        <id>spark-3.1.1</id>
+        <properties>
+            <spark.version>${spark311.version}</spark.version>
+        </properties>
+    </profile>
+    <profile>
+      <id>hadoop-2.7.4</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <properties>
+        <hadoop.version>2.7.4</hadoop.version>
+      </properties>
+    </profile>
+    <profile>
+      <id>hadoop-3.2</id>
+      <properties>
+        <hadoop.version>3.2.0</hadoop.version>
+      </properties>
+    </profile>
+    <profile>
+      <id>incremental-scala-compiler</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <properties>
+        <scala.recompile.mode>incremental</scala.recompile.mode>
+      </properties>
+    </profile>
+    <profile>
+      <id>full-scala-compiler</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <properties>
+        <scala.recompile.mode>all</scala.recompile.mode>
+      </properties>
+    </profile>
+    <profile>
+      <id>arrow-netty</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <properties>
+        <arrow-memory.artifact>arrow-memory-netty</arrow-memory.artifact>
+      </properties>
+    </profile>
+    <profile>
+      <id>arrow-unsafe</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <properties>
+        <arrow-memory.artifact>arrow-memory-unsafe</arrow-memory.artifact>
+      </properties>
+    </profile>
+  </profiles>
+
   <properties>
     <scala.version>2.12.10</scala.version>
     <scala.binary.version>2.12</scala.binary.version>
     <spark.version>3.1.1</spark.version>
     <arrow.version>4.0.0</arrow.version>
     <arrow-memory.artifact>arrow-memory-netty</arrow-memory.artifact>
-    <hadoop.version>2.7.4</hadoop.version>
+    <hadoop.version>${hadoop.version}</hadoop.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <arrow.script.dir>${project.basedir}/script</arrow.script.dir>
@@ -50,12 +125,6 @@
     <spark311.version>3.1.1</spark311.version>
   </properties>
 
-  <modules>
-    <module>arrow-data-source</module>
-    <module>native-sql-engine/core</module>
-    <module>shims</module>
-  </modules>
-
   <dependencyManagement>
     <dependencies>
       <dependency>
@@ -189,63 +258,4 @@
     </dependencies>
   </dependencyManagement>
 
-  <profiles>
-    <profile>
-      <id>spark</id>
-      <activation>
-          <activeByDefault>true</activeByDefault>
-      </activation>  
-      <properties>
-          <spark.version>${spark311.version}</spark.version>
-      </properties>
-    </profile>
-    <profile>
-        <id>spark-3.1.1</id>
-        <properties>
-            <spark.version>${spark311.version}</spark.version>
-        </properties>
-    </profile>
-    <profile>
-      <id>hadoop-3.2</id>
-      <properties>
-        <hadoop.version>3.2.0</hadoop.version>
-      </properties>
-    </profile>
-    <profile>
-      <id>incremental-scala-compiler</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <properties>
-        <scala.recompile.mode>incremental</scala.recompile.mode>
-      </properties>
-    </profile>
-    <profile>
-      <id>full-scala-compiler</id>
-      <activation>
-        <activeByDefault>false</activeByDefault>
-      </activation>
-      <properties>
-        <scala.recompile.mode>all</scala.recompile.mode>
-      </properties>
-    </profile>
-    <profile>
-      <id>arrow-netty</id>
-      <activation>
-        <activeByDefault>false</activeByDefault>
-      </activation>
-      <properties>
-        <arrow-memory.artifact>arrow-memory-netty</arrow-memory.artifact>
-      </properties>
-    </profile>
-    <profile>
-      <id>arrow-unsafe</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <properties>
-        <arrow-memory.artifact>arrow-memory-unsafe</arrow-memory.artifact>
-      </properties>
-    </profile>
-  </profiles>
 </project>

From 21f54a96e6a29797fb9ea4f81114031351b025cb Mon Sep 17 00:00:00 2001
From: weiting-chen <weiting.chen@intel.com>
Date: Fri, 2 Jul 2021 13:53:29 +0800
Subject: [PATCH 2/3] Fix NullPointer Issue.

---
 pom.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 1c8035e8f..8ab01b467 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,7 +54,9 @@
     <profile>
       <id>hadoop-2.7.4</id>
       <activation>
-        <activeByDefault>true</activeByDefault>
+        <property>
+          <name>!hadoop.version</name>
+        </property>
       </activation>
       <properties>
         <hadoop.version>2.7.4</hadoop.version>

From 3dc9c889ea0e7d90423cb10c712d22a425f2fdf9 Mon Sep 17 00:00:00 2001
From: weiting-chen <weiting.chen@intel.com>
Date: Mon, 5 Jul 2021 09:36:40 +0800
Subject: [PATCH 3/3] Update mvn version check and enable arrow-memory unsafe
 by default

---
 pom.xml | 37 +++++++++++++++++++++++++++----------
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8ab01b467..9e5aa76e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,18 +92,10 @@
         <activeByDefault>false</activeByDefault>
       </activation>
       <properties>
+        <id>arrow-netty</id>
         <arrow-memory.artifact>arrow-memory-netty</arrow-memory.artifact>
       </properties>
     </profile>
-    <profile>
-      <id>arrow-unsafe</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <properties>
-        <arrow-memory.artifact>arrow-memory-unsafe</arrow-memory.artifact>
-      </properties>
-    </profile>
   </profiles>
 
   <properties>
@@ -111,7 +103,7 @@
     <scala.binary.version>2.12</scala.binary.version>
     <spark.version>3.1.1</spark.version>
     <arrow.version>4.0.0</arrow.version>
-    <arrow-memory.artifact>arrow-memory-netty</arrow-memory.artifact>
+    <arrow-memory.artifact>arrow-memory-unsafe</arrow-memory.artifact>
     <hadoop.version>${hadoop.version}</hadoop.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -260,4 +252,29 @@
     </dependencies>
   </dependencyManagement>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <version>1.0.1</version>
+        <executions>
+          <execution>
+            <id>enforce-versions</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <requireMavenVersion>
+                  <version>3.6.3</version>
+                </requireMavenVersion>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>