svn commit: r1888582 - /poi/trunk/build.gradle

[ki...@apache.org]

Author: kiwiwings
Date: Sat Apr 10 12:01:15 2021
New Revision: 1888582

URL: http://svn.apache.org/viewvc?rev=1888582&view=rev
Log:
move jdk check into doFirst

Modified:
    poi/trunk/build.gradle

Modified: poi/trunk/build.gradle
URL: http://svn.apache.org/viewvc/poi/trunk/build.gradle?rev=1888582&r1=1888581&r2=1888582&view=diff
==============================================================================
--- poi/trunk/build.gradle (original)
+++ poi/trunk/build.gradle Sat Apr 10 12:01:15 2021
@@ -384,16 +384,18 @@ rat {
 //compileJava.dependsOn 'downloadJarsToLibs'
 
 task site(type:Exec) {
-    if (System.env.FORREST_HOME == null) {
-        throw new InvalidUserDataException(
-            'Apache Forrest is not installed.\n' +
-            'Please install Apache Forrest (see https://forrest.apache.org/index.html) and set the\n' +
-            'FORREST_HOME environment variable!')
-    }
+    doFirst {
+        if (System.env.FORREST_HOME == null) {
+            throw new InvalidUserDataException(
+                'Apache Forrest is not installed.\n' +
+                    'Please install Apache Forrest (see https://forrest.apache.org/index.html) and set the\n' +
+                    'FORREST_HOME environment variable!')
+        }
 
-    if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
-        // maybe Java 9-11 works too?
-        throw new GradleScriptException("Apache Forrest must be executed with Java 8!")
+        if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
+            // maybe Java 9-11 works too?
+            throw new GradleException("Apache Forrest must be executed with Java 8!")
+        }
     }
 
     if (System.getProperty('os.name').toLowerCase(Locale.ROOT).contains('windows')) {



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org