makefile: bump java source option from 5 to 6

this kills the errors like

error: Source option 5 is no longer supported. Use 6 or later.
error: Target option 1.5 is no longer supported. Use 1.6 or later.

Signed-off-by: Kefu Chai <kchai@redhat.com>
Conflicts:
    src/java/Makefile.am: this change is not cherry-picked from
master. as we've moved to java 8 in master. see df27ed3a .

diff --git a/src/java/Makefile.am b/src/java/Makefile.am
index fad77a45baa1359fdfe6f1c70a826d298570329a..3e5a191522ee177fd9538b998de9bb636944af31 100644 (file)
--- a/src/java/Makefile.am
+++ b/src/java/Makefile.am
@@ -38,17 +38,17 @@ JAVA_H = native/com_ceph_fs_CephMount.h
 # target to make automake happy
 CEPH_PROXY=java/com/ceph/fs/CephMount.class
 
-# note: for the -source 1.5 builds, we add
+# note: for the -source 1.6 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.6
 # as per
 #   https://blogs.oracle.com/darcy/entry/bootclasspath_older_source
 
 if HAVE_JAVAH
 $(CEPH_PROXY): $(JAVA_SRC)
        export CLASSPATH=java/ ; \
-       $(JAVAC) -classpath java -source 1.5 -target 1.5 -Xlint:-options java/com/ceph/fs/*.java
+       $(JAVAC) -classpath java -source 1.6 -target 1.6 -Xlint:-options java/com/ceph/fs/*.java
 
 $(JAVA_H): $(CEPH_PROXY)
        export CLASSPATH=java/ ; \
@@ -56,7 +56,7 @@ $(JAVA_H): $(CEPH_PROXY)
 else
 $(CEPH_PROXY): $(JAVA_SRC)
        export CLASSPATH=java/ ; \
-       $(JAVAC) -classpath java -source 1.5 -target 1.5 -Xlint:-options -h native java/com/ceph/fs/*.java
+       $(JAVAC) -classpath java -source 1.6 -target 1.6 -Xlint:-options -h native java/com/ceph/fs/*.java
 
 $(JAVA_H): $(CEPH_PROXY)
 endif # HAVE_JAVAH
@@ -81,7 +81,7 @@ CEPH_TEST_PROXY=test/com/ceph/fs/CephMountTest.class
 
 $(CEPH_TEST_PROXY): $(JAVA_TEST_SRC) $(CEPH_PROXY)
        export CLASSPATH=$(CLASSPATH):$(EXTRA_CLASSPATH_JAR):java/:test/ ; \
-       $(JAVAC) -source 1.5 -target 1.5 -Xlint:-options test/com/ceph/fs/*.java
+       $(JAVAC) -source 1.6 -target 1.6 -Xlint:-options test/com/ceph/fs/*.java
 
 libcephfs-test.jar: $(CEPH_TEST_PROXY)
        $(JAR) cf $@ $(JAVA_TEST_CLASSES:%=-C test %)