Merge branch 'MirrorTest' into pr/942

build.gradle

@@ -11,10 +11,10 @@ plugins {
 	id 'jacoco'
 	id 'java'
 
-	id 'com.diffplug.spotless' version '6.7.2'
+	id 'com.diffplug.spotless' version '6.9.0'
 	id 'com.github.johnrengelman.shadow' version '7.1.2'
-	id 'net.nemerosa.versioning' version '2.15.1'
-	id 'org.ajoberstar.grgit' version '4.1.1'
+	id 'net.nemerosa.versioning' version '3.0.0'
+	id 'org.ajoberstar.grgit' version '5.0.0'
 	id 'org.panteleyev.jpackageplugin' version '1.3.1'
 }
 mainClassName = 'net.sourceforge.kolmafia.KoLmafia'
@@ -56,17 +56,18 @@ repositories {
 
 dependencies {
 	// Use JUnit Jupiter for running JUnit5 tests.
-	testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.8.2'
-	testRuntimeOnly 'org.junit.jupiter:junit-jupiter:5.8.2'
+	testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.9.0'
+	testRuntimeOnly 'org.junit.jupiter:junit-jupiter:5.9.0'
 
 	testImplementation 'org.hamcrest:hamcrest:2.2'
 	testImplementation 'com.spotify:hamcrest-optional:1.2.0'
-	testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
-	testImplementation 'org.junit.jupiter:junit-jupiter-params:5.8.2'
+	testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.0'
+	testImplementation 'org.junit.jupiter:junit-jupiter-params:5.9.0'
 	testImplementation 'org.mockito:mockito-inline:4.6.1'
 	testImplementation('org.eclipse.xtext:org.eclipse.xtext.xbase.lib:2.12.0') {
 		because 'assertion errors including Location/Range/Position need it'
 	}
+	testImplementation 'org.junit-pioneer:junit-pioneer:1.7.1'
 
 	implementation 'com.formdev:flatlaf:1.6.2'
 	implementation 'com.formdev:flatlaf-intellij-themes:1.6.2'
@@ -90,7 +91,7 @@ dependencies {
 	implementation 'org.json:json:20220320'
 	implementation 'org.mozilla:rhino:1.7.14'
 	implementation 'org.swinglabs:swingx:1.0'
-	implementation 'org.tmatesoft.svnkit:svnkit:1.10.6'
+	implementation 'org.tmatesoft.svnkit:svnkit:1.10.7'
 	implementation 'com.jgoodies:jgoodies-binding:2.13.0'
 	implementation 'org.eclipse.jgit:org.eclipse.jgit:6.2.0.202206071550-r'
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -205,6 +205,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

jenkinsfile

@@ -18,24 +18,20 @@ pipeline {
     stage('Building') {
       steps {
         script {
-          withEnv(["JAVA_HOME=/usr/lib/jvm/temurin-17-jdk-amd64"]) {
             sh 'ls'
             sh 'java --version'
             sh './gradlew -v'
             sh './gradlew --no-daemon clean shadowJar'
-          }
         }
       }
     }
     stage('Testing') {
       steps {
         script {
-          withEnv(["JAVA_HOME=/usr/lib/jvm/temurin-17-jdk-amd64"]) {
-            sh './gradlew --no-daemon --stacktrace jacocoTestReport'
+            sh './gradlew --no-daemon jacocoTestReport'
             jacoco buildOverBuild: true, changeBuildStatus: true, deltaBranchCoverage: '5', deltaClassCoverage: '5', deltaComplexityCoverage: '5', deltaInstructionCoverage: '5', deltaLineCoverage: '5', deltaMethodCoverage: '5', maximumBranchCoverage: '70', maximumClassCoverage: '70', maximumComplexityCoverage: '70', maximumInstructionCoverage: '70', maximumLineCoverage: '70', maximumMethodCoverage: '70', runAlways: true
             publishCoverage adapters: [jacocoAdapter(mergeToOneReport: true, path: 'build/reports/jacoco/test/jacocoTestReport.xml')], sourceFileResolver: sourceFiles('NEVER_STORE')
             publishHTML([allowMissing: true, alwaysLinkToLastBuild: false, keepAll: true, reportDir: 'build/reports/jacoco/test/html/', reportFiles: 'index.html', reportName: 'JaCoCo Test Report', reportTitles: ''])
-          }
         }
       }
     }