From 0ca50648c2b1a05356ce4b0d5c3a3da5ab3a7d02 Mon Sep 17 00:00:00 2001
From: Vinayakumar B <vinayakumarb@apache.org>
Date: Wed, 24 Oct 2018 11:32:53 +0530
Subject: [PATCH] HADOOP-15856. Trunk build fails to compile native on Windows.
 Contributed by Vinayakumar B.

---
 hadoop-project/pom.xml | 26 +++++---------------------
 1 file changed, 5 insertions(+), 21 deletions(-)

diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 3a44e8c189..d5aee4b598 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -1654,6 +1654,11 @@
             <source>${javac.version}</source>
             <target>${javac.version}</target>
             <useIncrementalCompilation>false</useIncrementalCompilation>
+            <!-- add flags to generate native headers -->
+            <compilerArgs combine.children="append">
+              <arg>-h</arg>
+              <arg>${project.build.directory}/native/javah/</arg>
+            </compilerArgs>
           </configuration>
         </plugin>
         <plugin>
@@ -2120,27 +2125,6 @@
         </dependencies>
       </dependencyManagement>
     </profile>
-    <profile>
-      <id>native</id>
-      <activation>
-        <activeByDefault>false</activeByDefault>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-compiler-plugin</artifactId>
-            <configuration>
-              <!-- add flags to generate native headers -->
-              <compilerArgs combine.children="append">
-                <arg>-h</arg>
-                <arg>${project.build.directory}/native/javah/</arg>
-              </compilerArgs>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
   </profiles>
 
   <repositories>