Bump Java compatibility from 1.5 to 1.6 (#1263)

diff --git a/src/bin/jpip/CMakeLists.txt b/src/bin/jpip/CMakeLists.txt
index 301d885bace0a74916080ffece561aa84ea429ed..8dbf577534f022b187180e3898027bbdbb7fc1a4 100644 (file)
--- a/src/bin/jpip/CMakeLists.txt
+++ b/src/bin/jpip/CMakeLists.txt
@@ -57,14 +57,14 @@ add_executable(${exe} ${exe}.c)
 endforeach()
 
 # Build the two java clients:
-find_package(Java 1.5 COMPONENTS Development) # javac, jar
+find_package(Java 1.6 COMPONENTS Development) # javac, jar
 
 # User can override this:
 if(NOT DEFINED JAVA_SOURCE_VERSION)
-  set(JAVA_SOURCE_VERSION 1.5)
+  set(JAVA_SOURCE_VERSION 1.6)
 endif()
 if(NOT DEFINED JAVA_TARGET_VERSION)
-  set(JAVA_TARGET_VERSION 1.5)
+  set(JAVA_TARGET_VERSION 1.6)
 endif()
 
 # Only build the java viewer if dev is found:

diff --git a/wrapping/java/openjp2/CMakeLists.txt b/wrapping/java/openjp2/CMakeLists.txt
index eb3da0edbc69cb84e44fdf1b12ebaad781a163e3..e4639385f09600c9455d49bb5a92ca86dd436efa 100644 (file)
--- a/wrapping/java/openjp2/CMakeLists.txt
+++ b/wrapping/java/openjp2/CMakeLists.txt
@@ -44,7 +44,7 @@ install(TARGETS openjpegjni
 )
 
 # build jar:
-find_package(Java 1.5 REQUIRED) # javac, jar
+find_package(Java 1.6 REQUIRED) # javac, jar
 
 # build dep list:
 file(GLOB java_srcs "java-sources/org/openJpeg/*.java")