From: Shengjing Zhu <zhsj@umcloud.com>
Date: Wed, 28 Mar 2018 04:54:31 +0000 (+0800)
Subject: cmake: bump target jdk to 1.7
X-Git-Tag: v12.2.6~137^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=83d310c320a0987465a0b83247c1085590f443bf;p=ceph.git

cmake: bump target jdk to 1.7

jdk 1.7 was released on 2011. For CentOS 6/7, both have openjdk
1.8. For Debian 8(jessie), Ubuntu 14.04(trusty) have openjdk 1.7.
These are the oldest distributions officially built for during
luminous release.

Since jdk 1.9/9, the minimal supported version is 1.6/6.
jdk 1.0/10(recently released) only supports 1.7/7.
http://openjdk.java.net/jeps/182

Fixes: http://tracker.ceph.com/issues/23458
Signed-off-by: Shengjing Zhu <zhsj@umcloud.com>
(cherry picked from commit 7c511d79240ac2ab20a3f9360d90a766ee1b9682)
---

diff --git a/src/java/CMakeLists.txt b/src/java/CMakeLists.txt
index 5276bc2c1ddb..fe365501de9e 100644
--- a/src/java/CMakeLists.txt
+++ b/src/java/CMakeLists.txt
@@ -15,13 +15,13 @@ set(java_srcs
   java/com/ceph/fs/CephStat.java
   java/com/ceph/fs/CephStatVFS.java)
 
-# note: for the -source 1.5 builds, we add
+# note: for the -source 1.7 builds, we add
 #   -Xlint:-options
 # to get rid of the warning
-#   warning: [options] bootstrap class path not set in conjunction with -source 1.5
+#   warning: [options] bootstrap class path not set in conjunction with -source 1.7
 # as per
 #   https://blogs.oracle.com/darcy/entry/bootclasspath_older_source
-set(CMAKE_JAVA_COMPILE_FLAGS "-source" "1.5" "-target" "1.5" "-Xlint:-options")
+set(CMAKE_JAVA_COMPILE_FLAGS "-source" "1.7" "-target" "1.7" "-Xlint:-options")
 add_jar(libcephfs ${java_srcs})
 install_jar(libcephfs share/java)
 get_property(libcephfs_jar TARGET libcephfs PROPERTY JAR_FILE)