From 2dead43d035ddd8f41346b46d6b517a6f0733763 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Wed, 8 Jan 2020 13:12:21 +0100 Subject: [PATCH] Java 8 is required. --- ChangeLog | 3 +++ sonar-project.properties | 2 +- tools/cmake/Java.cmake | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index d939491c15..2b319b3969 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,9 @@ SimGrid (3.24.1) NOT RELEASED YET (v3.25 expected December 22. 2029, 04:19 UTC) +General: +- Upgrade documented Java dependency to Java 8 (earlier versions don't work). + S4U: - Actor: Merge signals on_migration_start/end into on_host_change - Actor: Rename migrate() into set_host() diff --git a/sonar-project.properties b/sonar-project.properties index 1cd020ffdf..30b086fbfb 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -175,7 +175,7 @@ sonar.coverage.exclusions=teshsuite/smpi/isp/**,teshsuite/smpi/mpich3-test/**,** sonar.sourceEncoding=UTF-8 # Version of the used prog languages -sonar.java.source=7 +sonar.java.source=8 sonar.java.binaries=CMakeFiles/simgrid-java_jar.dir,examples/deprecated/java # Don't talk to me: travis don't like your verbosity diff --git a/tools/cmake/Java.cmake b/tools/cmake/Java.cmake index bb6ecba1e7..7803938d4d 100644 --- a/tools/cmake/Java.cmake +++ b/tools/cmake/Java.cmake @@ -3,9 +3,9 @@ ## This file is loaded only if the Java option is activated ## -find_package(Java 1.7 COMPONENTS Runtime Development) +find_package(Java 1.8 COMPONENTS Runtime Development) if (NOT ${Java_FOUND}) - message(FATAL_ERROR "Java not found (need at least Java7). Please install the JDK or disable that option") + message(FATAL_ERROR "Java not found (need at least Java8). Please install the JDK or disable that option") endif() set(Java_FOUND 1) include(UseJava) -- 2.20.1