HADOOP-15767. [JDK10] Building native package on JDK10 fails due to missing javah. Contributed by Takanobu Asanuma.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/31fa9bb7 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/31fa9bb7 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/31fa9bb7 Branch: refs/heads/HEAD Commit: 31fa9bb799d299186bb90dd2200e3971995f398c Parents: 96ae4ac Author: Akira Ajisaka <aajis...@apache.org> Authored: Wed Oct 3 11:29:18 2018 +0900 Committer: Akira Ajisaka <aajis...@apache.org> Committed: Wed Oct 3 11:29:18 2018 +0900 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/pom.xml | 79 -------------------- .../hadoop-mapreduce-client-nativetask/pom.xml | 20 ----- hadoop-project/pom.xml | 27 +++++-- 3 files changed, 21 insertions(+), 105 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/31fa9bb7/hadoop-common-project/hadoop-common/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml index 6d9e296..6a7433a 100644 --- a/hadoop-common-project/hadoop-common/pom.xml +++ b/hadoop-common-project/hadoop-common/pom.xml @@ -647,48 +647,6 @@ </executions> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>native-maven-plugin</artifactId> - <executions> - <execution> - <phase>compile</phase> - <goals> - <goal>javah</goal> - </goals> - <configuration> - <javahPath>${env.JAVA_HOME}/bin/javah</javahPath> - <javahClassNames> - <javahClassName>org.apache.hadoop.io.compress.zlib.ZlibCompressor</javahClassName> - <javahClassName>org.apache.hadoop.io.compress.zlib.ZlibDecompressor</javahClassName> - <javahClassName>org.apache.hadoop.io.compress.bzip2.Bzip2Compressor</javahClassName> - <javahClassName>org.apache.hadoop.io.compress.bzip2.Bzip2Decompressor</javahClassName> - <javahClassName>org.apache.hadoop.security.JniBasedUnixGroupsMapping</javahClassName> - <javahClassName>org.apache.hadoop.io.nativeio.NativeIO</javahClassName> - <javahClassName>org.apache.hadoop.io.nativeio.SharedFileDescriptorFactory</javahClassName> - <javahClassName>org.apache.hadoop.security.JniBasedUnixGroupsNetgroupMapping</javahClassName> - <javahClassName>org.apache.hadoop.io.compress.snappy.SnappyCompressor</javahClassName> - <javahClassName>org.apache.hadoop.io.compress.snappy.SnappyDecompressor</javahClassName> - <javahClassName>org.apache.hadoop.io.compress.zstd.ZStandardCompressor</javahClassName> - <javahClassName>org.apache.hadoop.io.compress.zstd.ZStandardDecompressor</javahClassName> - <javahClassName>org.apache.hadoop.io.compress.lz4.Lz4Compressor</javahClassName> - <javahClassName>org.apache.hadoop.io.compress.lz4.Lz4Decompressor</javahClassName> - <javahClassName>org.apache.hadoop.io.erasurecode.ErasureCodeNative</javahClassName> - <javahClassName>org.apache.hadoop.io.erasurecode.rawcoder.NativeRSRawEncoder</javahClassName> - <javahClassName>org.apache.hadoop.io.erasurecode.rawcoder.NativeRSRawDecoder</javahClassName> - <javahClassName>org.apache.hadoop.io.erasurecode.rawcoder.NativeXORRawEncoder</javahClassName> - <javahClassName>org.apache.hadoop.io.erasurecode.rawcoder.NativeXORRawDecoder</javahClassName> - <javahClassName>org.apache.hadoop.crypto.OpensslCipher</javahClassName> - <javahClassName>org.apache.hadoop.crypto.random.OpensslSecureRandom</javahClassName> - <javahClassName>org.apache.hadoop.util.NativeCrc32</javahClassName> - <javahClassName>org.apache.hadoop.net.unix.DomainSocket</javahClassName> - <javahClassName>org.apache.hadoop.net.unix.DomainSocketWatcher</javahClassName> - </javahClassNames> - <javahOutputDirectory>${project.build.directory}/native/javah</javahOutputDirectory> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-maven-plugins</artifactId> <executions> @@ -804,43 +762,6 @@ </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> - <artifactId>native-maven-plugin</artifactId> - <executions> - <execution> - <phase>compile</phase> - <goals> - <goal>javah</goal> - </goals> - <configuration> - <javahPath>${env.JAVA_HOME}/bin/javah</javahPath> - <javahClassNames> - <javahClassName>org.apache.hadoop.io.compress.zlib.ZlibCompressor</javahClassName> - <javahClassName>org.apache.hadoop.io.compress.zlib.ZlibDecompressor</javahClassName> - <javahClassName>org.apache.hadoop.security.JniBasedUnixGroupsMapping</javahClassName> - <javahClassName>org.apache.hadoop.io.nativeio.NativeIO</javahClassName> - <javahClassName>org.apache.hadoop.security.JniBasedUnixGroupsNetgroupMapping</javahClassName> - <javahClassName>org.apache.hadoop.io.compress.snappy.SnappyCompressor</javahClassName> - <javahClassName>org.apache.hadoop.io.compress.snappy.SnappyDecompressor</javahClassName> - <javahClassName>org.apache.hadoop.io.compress.zstd.ZStandardCompressor</javahClassName> - <javahClassName>org.apache.hadoop.io.compress.zstd.ZStandardDecompressor</javahClassName> - <javahClassName>org.apache.hadoop.io.compress.lz4.Lz4Compressor</javahClassName> - <javahClassName>org.apache.hadoop.io.compress.lz4.Lz4Decompressor</javahClassName> - <javahClassName>org.apache.hadoop.io.erasurecode.ErasureCodeNative</javahClassName> - <javahClassName>org.apache.hadoop.io.erasurecode.rawcoder.NativeRSRawEncoder</javahClassName> - <javahClassName>org.apache.hadoop.io.erasurecode.rawcoder.NativeRSRawDecoder</javahClassName> - <javahClassName>org.apache.hadoop.io.erasurecode.rawcoder.NativeXORRawEncoder</javahClassName> - <javahClassName>org.apache.hadoop.io.erasurecode.rawcoder.NativeXORRawDecoder</javahClassName> - <javahClassName>org.apache.hadoop.crypto.OpensslCipher</javahClassName> - <javahClassName>org.apache.hadoop.crypto.random.OpensslSecureRandom</javahClassName> - <javahClassName>org.apache.hadoop.util.NativeCrc32</javahClassName> - </javahClassNames> - <javahOutputDirectory>${project.build.directory}/native/javah</javahOutputDirectory> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> <executions> <execution> http://git-wip-us.apache.org/repos/asf/hadoop/blob/31fa9bb7/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/pom.xml index 20acbc4..ca08b1f 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/pom.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/pom.xml @@ -140,26 +140,6 @@ </executions> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>native-maven-plugin</artifactId> - <executions> - <execution> - <phase>compile</phase> - <goals> - <goal>javah</goal> - </goals> - <configuration> - <javahPath>${env.JAVA_HOME}/bin/javah</javahPath> - <javahClassNames> - <javaClassName>org.apache.hadoop.mapred.nativetask.NativeBatchProcessor</javaClassName> - <javaClassName>org.apache.hadoop.mapred.nativetask.NativeRuntime</javaClassName> - </javahClassNames> - <javahOutputDirectory>${project.build.directory}/native/javah</javahOutputDirectory> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> <executions> http://git-wip-us.apache.org/repos/asf/hadoop/blob/31fa9bb7/hadoop-project/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 49551a6..f8442b9 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -144,7 +144,6 @@ <build-helper-maven-plugin.version>1.9</build-helper-maven-plugin.version> <exec-maven-plugin.version>1.3.1</exec-maven-plugin.version> <make-maven-plugin.version>1.0-beta-1</make-maven-plugin.version> - <native-maven-plugin.version>1.0-alpha-8</native-maven-plugin.version> <surefire.fork.timeout>900</surefire.fork.timeout> <aws-java-sdk.version>1.11.375</aws-java-sdk.version> <hsqldb.version>2.3.4</hsqldb.version> @@ -1678,11 +1677,6 @@ </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> - <artifactId>native-maven-plugin</artifactId> - <version>${native-maven-plugin.version}</version> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> <artifactId>make-maven-plugin</artifactId> <version>${make-maven-plugin.version}</version> </plugin> @@ -2093,6 +2087,27 @@ </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> --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org