Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

JDK11+ nashorn scripting, SecurityManager update, Gradle 7.6 #1426

Merged
merged 13 commits into from
Oct 29, 2023
Merged

JDK11+ nashorn scripting, SecurityManager update, Gradle 7.6 #1426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
6c8cf97
Use openjdk nashorn dependency for scripting
tcnh Feb 13, 2023
985de0b
Merge remote-tracking branch 'origin/master' into nashorn_jdk11
tcnh Feb 13, 2023
be7d142
override method in XmlPerPageTestListenerTest, sanitize
tcnh Mar 21, 2023
a629bf3
Merge remote-tracking branch 'origin/master' into nashorn_jdk11
tcnh Mar 21, 2023
9970c1f
build with java 11; Gradle 7.6 wrapper
tcnh Mar 21, 2023
bad8ce0
Gradle 7.6 wrapper
tcnh Mar 21, 2023
3283be6
Remove runtime config (no longer exists in gradle). Copy using sourceSet
tcnh Mar 21, 2023
f7b3f43
build.gradle sync with changes from origin
tcnh Mar 21, 2023
a26bb6d
Use modern junit+mockito
tcnh Mar 21, 2023
d5fa0fd
Merge remote-tracking branch 'origin/master' into nashorn_jdk11
tcnh Aug 9, 2023
3521499
Revert wrong annotation in groovy tasks
tcnh Aug 15, 2023
3512208
Add pending JDK11 change to release notes
tcnh Aug 15, 2023
e07557b
Merge branch 'master' into nashorn_jdk11
fhoeben Oct 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-fitnesse.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions FitNesseRoot/FitNesse/ReleaseNotes/content.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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]])
Expand Down
9 changes: 6 additions & 3 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}

Expand Down Expand Up @@ -62,7 +62,7 @@ sourceSets {

java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(8))
languageVersion.set(JavaLanguageVersion.of(11))
}
}

Expand All @@ -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"
Expand Down Expand Up @@ -180,6 +182,7 @@ jar {
}

task standaloneJar(type: Jar) {
duplicatesStrategy = 'include'
dependsOn jar
archiveBaseName = 'fitnesse'
archiveClassifier = 'standalone'
Expand Down Expand Up @@ -296,7 +299,7 @@ nexusPublishing {
}

wrapper {
gradleVersion = '6.9.1'
gradleVersion = '7.6'
}


Expand Down
6 changes: 5 additions & 1 deletion buildSrc/src/main/groovy/LessCompiler.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Loading