Skip to content

Commit 389bb59

Browse files
authored
JDK11+ nashorn scripting, SecurityManager update, Gradle 7.6 (unclebob#1426)
* Use openjdk nashorn dependency for scripting * JDK 11+ buildable (nashorn is not built with 8) * Gradle and dependency upgrades
1 parent b82f9f8 commit 389bb59

File tree

13 files changed

+183
-163
lines changed

13 files changed

+183
-163
lines changed

.github/workflows/build-fitnesse.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
uses: actions/setup-java@v3
1414
with:
1515
distribution: 'zulu'
16-
java-version: '8'
16+
java-version: '11'
1717
- name: Validate Gradle wrapper
1818
uses: gradle/wrapper-validation-action@v1
1919
- name: Build with Gradle

FitNesseRoot/FitNesse/ReleaseNotes/content.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
!2 Pending Changes
2+
* 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]])
23

34
!2 20230503
45
* Add date and page history link to XML responses. ([[1396][https://github.com/unclebob/fitnesse/issues/1396]])

build.gradle

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ buildscript {
1515
mavenCentral()
1616
}
1717
dependencies {
18-
classpath 'info.solidsoft.gradle.pitest:gradle-pitest-plugin:1.6.0'
18+
classpath 'info.solidsoft.gradle.pitest:gradle-pitest-plugin:1.9.0'
1919
}
2020
}
2121

@@ -62,7 +62,7 @@ sourceSets {
6262

6363
java {
6464
toolchain {
65-
languageVersion.set(JavaLanguageVersion.of(8))
65+
languageVersion.set(JavaLanguageVersion.of(11))
6666
}
6767
}
6868

@@ -79,6 +79,8 @@ dependencies {
7979
implementation "org.json:json:20230618"
8080
implementation "com.googlecode.java-diff-utils:diffutils:1.3.0"
8181
implementation "org.apache.commons:commons-text:1.10.0"
82+
implementation "org.openjdk.nashorn:nashorn-core:15.4"
83+
8284
compileOnly gradleApi()
8385
compileOnly "org.apache.ant:ant:1.10.13"
8486
compileOnly "junit:junit:4.13.2"
@@ -180,6 +182,7 @@ jar {
180182
}
181183

182184
task standaloneJar(type: Jar) {
185+
duplicatesStrategy = 'include'
183186
dependsOn jar
184187
archiveBaseName = 'fitnesse'
185188
archiveClassifier = 'standalone'
@@ -296,7 +299,7 @@ nexusPublishing {
296299
}
297300

298301
wrapper {
299-
gradleVersion = '6.9.1'
302+
gradleVersion = '7.6'
300303
}
301304

302305

buildSrc/src/main/groovy/LessCompiler.groovy

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
import org.gradle.api.tasks.*
1+
import org.gradle.api.tasks.Input
2+
import org.gradle.api.tasks.InputDirectory
3+
import org.gradle.api.tasks.JavaExec
4+
import org.gradle.api.tasks.OutputFile
5+
import org.gradle.api.tasks.TaskAction
26

37
class LessCompiler extends JavaExec {
48
@InputDirectory

gradle/wrapper/gradle-wrapper.jar

333 Bytes
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)