[bookkeeper] branch master updated: Support build on JDK10

[eo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

eolivelli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git


The following commit(s) were added to refs/heads/master by this push:
     new 4582050  Support build on JDK10
4582050 is described below

commit 4582050a8d51139dc4302a010a7bbd837d849cf8
Author: Enrico Olivelli <eo...@apache.org>
AuthorDate: Mon Jun 4 15:46:33 2018 +0200

    Support build on JDK10
    
    - switch to "javac -h" in circe-checksum instead of 'javah' because in JDK10 javah has been dropped (see http://openjdk.java.net/jeps/313)
    - add openjdk10 to Travis-CI
    
    Author: Enrico Olivelli <eo...@apache.org>
    
    Reviewers: Jia Zhai <None>, Sijie Guo <si...@apache.org>
    
    This closes #1470 from eolivelli/nar-jdk10
---
 .travis.yml            |  2 ++
 circe-checksum/pom.xml | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index d218239..5cda919 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,6 +35,8 @@ matrix:
     - os: linux
       env: CUSTOM_JDK="oraclejdk9"
     - os: linux
+      env: CUSTOM_JDK="oraclejdk10"
+    - os: linux
       dist: trusty
       env: CUSTOM_JDK="openjdk8"
 
diff --git a/circe-checksum/pom.xml b/circe-checksum/pom.xml
index 78733f5..1b70f80 100644
--- a/circe-checksum/pom.xml
+++ b/circe-checksum/pom.xml
@@ -114,6 +114,53 @@
 
   <profiles>
     <profile>
+      <!-- from JDK10 javah command is not available
+           see http://openjdk.java.net/jeps/313
+      -->
+      <id>jdk-without-javah</id>
+      <activation>
+         <jdk>[10,)</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>com.github.maven-nar</groupId>
+            <artifactId>nar-maven-plugin</artifactId>
+            <version>${nar-maven-plugin.version}</version>
+            <extensions>true</extensions>
+            <executions>
+               <execution>
+               <!-- javah is not present in JDK10 onwards,
+                    you have to to use javac -h -->
+                  <id>default-nar-javah</id>
+                  <phase>none</phase>
+               </execution>
+             </executions>
+          </plugin>
+          <plugin>
+             <groupId>org.apache.maven.plugins</groupId>
+             <artifactId>maven-compiler-plugin</artifactId>
+             <version>${maven-compiler-plugin.version}</version>
+             <configuration>
+                <source>1.8</source>
+                <target>1.8</target>
+                <compilerArgs>
+                  <!-- Object.finalize() is deprecated at java 9 -->
+                  <!-- <compilerArg>-Werror</compilerArg> -->
+                  <compilerArg>-Xlint:deprecation</compilerArg>
+                  <compilerArg>-Xlint:unchecked</compilerArg>
+                   <!-- https://issues.apache.org/jira/browse/MCOMPILER-205 -->
+                  <compilerArg>-Xpkginfo:always</compilerArg>
+                  <!-- add -h flag to javac -->
+                  <compilerArg>-h</compilerArg>
+                  <compilerArg>${project.build.directory}/nar/javah-include</compilerArg>
+                </compilerArgs>
+             </configuration>
+          </plugin>
+            </plugins>
+        </build>
+    </profile>
+    <profile>
       <id>mac</id>
       <activation>
         <os>

-- 
To stop receiving notification emails like this one, please contact
eolivelli@apache.org.