From 65c8f577d2f057e80040e98958eae80ca76c6b94 Mon Sep 17 00:00:00 2001 From: Pei JIA Date: Wed, 23 Sep 2020 02:34:31 -0700 Subject: [PATCH] Bump Java compatibility from 1.5 to 1.6 (#1263) --- src/bin/jpip/CMakeLists.txt | 6 +++--- wrapping/java/openjp2/CMakeLists.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/bin/jpip/CMakeLists.txt b/src/bin/jpip/CMakeLists.txt index 301d885b..8dbf5775 100644 --- 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 eb3da0ed..e4639385 100644 --- 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")