From: Martin Quinson <martin.quinson@loria.fr>
Date: Sat, 3 Oct 2015 15:05:05 +0000 (+0200)
Subject: [Java] bump dependency to Java 7
X-Git-Tag: v3_12~47
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/d2cfdb071826e6a57a2601a401444531689de1ad

[Java] bump dependency to Java 7
---

diff --git a/ChangeLog b/ChangeLog
index cf0edc9df6..0de63f54c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@ SimGrid (3.12) NOT RELEASED; urgency=low
  Build System
   * Require g++ v4.7 at least to not speak prehistorical C++.
   * Require Boost 1.48 (for signal2 component).
+  * Java must be version 7 at least when activated.
   * Tracing is now always enabled (no way to turn it out)
   * Remove GTNetS. It was not working anyway.
   * Move headers around to sort them out on installed systems:
diff --git a/NEWS b/NEWS
index d5075f96eb..1ad318f361 100644
--- a/NEWS
+++ b/NEWS
@@ -7,7 +7,7 @@ __   _____ _ __ ___(_) ___  _ __   |___ / / |___ \
 The Facelift Release. Major changes:
 
  * Many interface glitches addressed, everywhere.
-   - Require g++-4.7 and boost 1.48
+   - Require g++-4.7, Java 7 and boost 1.48
    - See ChangeLog for renamed functions and options.
 
  * Energy plugin: major cleanups/rewrites.
diff --git a/tools/cmake/Java.cmake b/tools/cmake/Java.cmake
index fdf7ad46ad..fd5cd544c1 100644
--- a/tools/cmake/Java.cmake
+++ b/tools/cmake/Java.cmake
@@ -1,5 +1,11 @@
+##
+## The Cmake definitions for the use of Java (and Scala)
+##   This file is loaded only if the Java option is activated
+##
+
 cmake_minimum_required(VERSION 2.8.6)
 
+find_package(Java 1.7)
 include(UseJava)
 
 # Rules to build libsimgrid-java