diff --git a/.github/workflows/build-fitnesse.yml b/.github/workflows/build-fitnesse.yml index 622e14b45c..2ef7b6f37b 100644 --- a/.github/workflows/build-fitnesse.yml +++ b/.github/workflows/build-fitnesse.yml @@ -13,7 +13,7 @@ jobs: uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: '8' + java-version: '11' - name: Validate Gradle wrapper uses: gradle/wrapper-validation-action@v1 - name: Build with Gradle diff --git a/FitNesseRoot/FitNesse/ReleaseNotes/content.txt b/FitNesseRoot/FitNesse/ReleaseNotes/content.txt index 788a4163d8..8d25be9c39 100644 --- a/FitNesseRoot/FitNesse/ReleaseNotes/content.txt +++ b/FitNesseRoot/FitNesse/ReleaseNotes/content.txt @@ -1,4 +1,5 @@ !2 Pending Changes + * Drop Java 8 compatibility and compile with Java 11, Use OpenJDK's nashorn dependency to evaluate JS expressions ([[1426][https://github.com/unclebob/fitnesse/pull/1426]]) !2 20230503 * Add date and page history link to XML responses. ([[1396][https://github.com/unclebob/fitnesse/issues/1396]]) diff --git a/build.gradle b/build.gradle index 6366a9ce0d..4def9ad907 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'info.solidsoft.gradle.pitest:gradle-pitest-plugin:1.6.0' + classpath 'info.solidsoft.gradle.pitest:gradle-pitest-plugin:1.9.0' } } @@ -62,7 +62,7 @@ sourceSets { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(8)) + languageVersion.set(JavaLanguageVersion.of(11)) } } @@ -79,6 +79,8 @@ dependencies { implementation "org.json:json:20230618" implementation "com.googlecode.java-diff-utils:diffutils:1.3.0" implementation "org.apache.commons:commons-text:1.10.0" + implementation "org.openjdk.nashorn:nashorn-core:15.4" + compileOnly gradleApi() compileOnly "org.apache.ant:ant:1.10.13" compileOnly "junit:junit:4.13.2" @@ -180,6 +182,7 @@ jar { } task standaloneJar(type: Jar) { + duplicatesStrategy = 'include' dependsOn jar archiveBaseName = 'fitnesse' archiveClassifier = 'standalone' @@ -296,7 +299,7 @@ nexusPublishing { } wrapper { - gradleVersion = '6.9.1' + gradleVersion = '7.6' } diff --git a/buildSrc/src/main/groovy/LessCompiler.groovy b/buildSrc/src/main/groovy/LessCompiler.groovy index db213f5cdf..01937ca4cf 100644 --- a/buildSrc/src/main/groovy/LessCompiler.groovy +++ b/buildSrc/src/main/groovy/LessCompiler.groovy @@ -1,4 +1,8 @@ -import org.gradle.api.tasks.* +import org.gradle.api.tasks.Input +import org.gradle.api.tasks.InputDirectory +import org.gradle.api.tasks.JavaExec +import org.gradle.api.tasks.OutputFile +import org.gradle.api.tasks.TaskAction class LessCompiler extends JavaExec { @InputDirectory diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c023..7454180f2a 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ae04661ee7..070cb702f0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 4f906e0c81..c53aefaa5f 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,101 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,95 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/src/fitnesse/slim/SlimExpressionEvaluator.java b/src/fitnesse/slim/SlimExpressionEvaluator.java index 23ad6a6123..d89dd3dc7b 100644 --- a/src/fitnesse/slim/SlimExpressionEvaluator.java +++ b/src/fitnesse/slim/SlimExpressionEvaluator.java @@ -2,9 +2,9 @@ import fitnesse.slim.converters.ConverterRegistry; import fitnesse.slim.converters.GenericCollectionConverter; +import org.openjdk.nashorn.api.scripting.NashornScriptEngineFactory; import javax.script.ScriptEngine; -import javax.script.ScriptEngineManager; import javax.script.ScriptException; import java.util.LinkedHashMap; import java.util.List; @@ -14,21 +14,13 @@ * Evaluates slim expressions. */ public class SlimExpressionEvaluator { - private static final ScriptEngineManager ENGINE_MANAGER = new ScriptEngineManager(); - private ScriptEngine engine; + private final ScriptEngine engine; public SlimExpressionEvaluator() { - this("JavaScript"); + this.engine = new NashornScriptEngineFactory().getScriptEngine(); } - public SlimExpressionEvaluator(String engineName) { - this(ENGINE_MANAGER.getEngineByName(engineName)); - } - - public SlimExpressionEvaluator(ScriptEngine engine) { - this.engine = engine; - } public void setContext(String expr, Map variables) { Converter mapCnv = ConverterRegistry.getConverterForClass(Map.class); @@ -80,8 +72,7 @@ protected Object convertWikiHash(Converter cnv, Object value) { } protected Object convertNestedWikiHashes(Converter cnv, Map value) { - Map newValue = new LinkedHashMap<>(); - newValue.putAll(value); + Map newValue = new LinkedHashMap<>(value); for (Map.Entry nestedEntry : newValue.entrySet()) { Object nestedValue = convertWikiHashes(cnv, nestedEntry.getValue()); newValue.put(nestedEntry.getKey(), nestedValue); diff --git a/src/fitnesse/slim/converters/GenericCollectionConverter.java b/src/fitnesse/slim/converters/GenericCollectionConverter.java index 47cbadb60b..fd9d7ea44c 100644 --- a/src/fitnesse/slim/converters/GenericCollectionConverter.java +++ b/src/fitnesse/slim/converters/GenericCollectionConverter.java @@ -20,7 +20,7 @@ public class GenericCollectionConverter> extends Conv @SuppressWarnings("unchecked") public GenericCollectionConverter(Class collectionClass, Converter componentConverter) { if (collectionClass.isInterface()) - collectionClass = (Class) DEFAULT_COLLECTION_IMPL.get(collectionClass); + collectionClass = DEFAULT_COLLECTION_IMPL.get(collectionClass); this.collectionClass = (Class) collectionClass; this.componentConverter = componentConverter; @@ -50,7 +50,7 @@ private String getElementString(T item) { public C getObject(String arg) { C collection; try { - collection = collectionClass.newInstance(); + collection = collectionClass.getDeclaredConstructor().newInstance(); } catch (Exception e) { throw new IllegalStateException("Collection should have a default constructor", e); } diff --git a/src/fitnesse/slim/converters/MapConverter.java b/src/fitnesse/slim/converters/MapConverter.java index e444291220..954bc8350e 100644 --- a/src/fitnesse/slim/converters/MapConverter.java +++ b/src/fitnesse/slim/converters/MapConverter.java @@ -9,7 +9,6 @@ import org.htmlparser.filters.TagNameFilter; import org.htmlparser.tags.CompositeTag; import org.htmlparser.util.NodeList; -import org.htmlparser.util.ParserException; import java.util.HashMap; import java.util.Map; diff --git a/src/fitnesse/slim/instructions/SystemExitSecurityManager.java b/src/fitnesse/slim/instructions/SystemExitSecurityManager.java index c7335276b1..eeb1506d41 100644 --- a/src/fitnesse/slim/instructions/SystemExitSecurityManager.java +++ b/src/fitnesse/slim/instructions/SystemExitSecurityManager.java @@ -11,7 +11,7 @@ public class SystemExitSecurityManager extends SecurityManager { * The {@link SystemExitSecurityManager} overrides the behavior of the wrapped * original {@link SecurityManager} to prevent {@link System#exit(int)} calls * from being executed. - * + * * @author Anis Ben Hamidene * */ @@ -48,7 +48,7 @@ public static void restoreOriginalSecurityManager() { private static boolean isPreventSystemExit() { String preventSystemExitString = System.getProperty(PREVENT_SYSTEM_EXIT); if (preventSystemExitString != null) { - return Boolean.parseBoolean(preventSystemExitString); + return Boolean.parseBoolean(preventSystemExitString); } else { return true; } @@ -199,15 +199,6 @@ public void checkPropertyAccess(String key) { } } - @Override - public boolean checkTopLevelWindow(Object window) { - if (delegate != null) { - return delegate.checkTopLevelWindow(window); - } else { - return false; - } - } - @Override public void checkPrintJobAccess() { @@ -216,22 +207,6 @@ public void checkPrintJobAccess() { } } - @Override - public void checkSystemClipboardAccess() { - - if (delegate != null) { - delegate.checkSystemClipboardAccess(); - } - } - - @Override - public void checkAwtEventQueueAccess() { - - if (delegate != null) { - delegate.checkAwtEventQueueAccess(); - } - } - @Override public void checkPackageAccess(String pkg) { @@ -255,14 +230,6 @@ public void checkSetFactory() { } } - @Override - public void checkMemberAccess(Class clazz, int which) { - - if (delegate != null) { - delegate.checkMemberAccess(clazz, which); - } - } - @Override public void checkSecurityAccess(String target) { diff --git a/src/fitnesse/util/ClassUtils.java b/src/fitnesse/util/ClassUtils.java index f30e9ff3d7..5bc60ca4dc 100644 --- a/src/fitnesse/util/ClassUtils.java +++ b/src/fitnesse/util/ClassUtils.java @@ -5,7 +5,7 @@ /** * ClassUtils allows for class resolution (Class.forName) on a specially defined * class loader. In practice this will be the class loader created when the plugins - * are loaded from plugins/. + * are loaded from plugins/. * * This class, however, exposes some a habit and I (Arjan) would love to get rid * of it again: the class loader value is kept in a mutable @@ -13,7 +13,7 @@ * unpredictable ways. * * Currently this class loader is set from {@link ContextConfigurator#makeFitNesseContext()} whenever a new FitNesseContext is - * created. getClassLoader + * created. getClassLoader * * Note that there are still direct invocations of Class.forName in the code. Those pieces of code are executed on * the SUT or have otherwise no relation with the plugins system. diff --git a/test/fitnesse/junit/JUnitXMLPerPageTestListenerTest.java b/test/fitnesse/junit/JUnitXMLPerPageTestListenerTest.java index c4a2f90d89..e9dfc8994c 100644 --- a/test/fitnesse/junit/JUnitXMLPerPageTestListenerTest.java +++ b/test/fitnesse/junit/JUnitXMLPerPageTestListenerTest.java @@ -1,6 +1,7 @@ package fitnesse.junit; import org.gradle.api.tasks.testing.TestDescriptor; +import org.gradle.api.tasks.testing.TestFailure; import org.gradle.api.tasks.testing.TestResult; import org.junit.Test; @@ -248,6 +249,11 @@ public Throwable getException() { return throwable; } + @Override + public List getFailures() { + return null; + } + @Override public List getExceptions() { return Collections.singletonList(throwable);