Merge origin/master

.github/workflows/maven.yml

@@ -27,4 +27,4 @@ jobs:
  distribution: 'temurin'
  cache: maven
  - name: Build with Maven
- run: mvn -B package --file pom.xml
+ run: mvn -B package --file pom.xml -DdisableXmlReport=true

build.gradle

@@ -14,6 +14,7 @@ plugins {
 
  // download the RR tools which have no Maven Repository
  id "de.undercouch.download" version "latest.release"
+ id 'org.hidetake.ssh' version "latest.release"
 
  id "se.bjurr.gitchangelog.git-changelog-gradle-plugin" version "latest.release"
 }
@@ -85,8 +86,8 @@ dependencies {
  testImplementation 'org.mockito:mockito-junit-jupiter:4.+'
 
  // enforce latest version of JavaCC
- testImplementation 'net.java.dev.javacc:javacc:7.0.12'
- javacc 'net.java.dev.javacc:javacc:7.0.12'
+ testImplementation 'net.java.dev.javacc:javacc:+'
+ javacc 'net.java.dev.javacc:javacc:+'
 }
 
 compileJavacc {
@@ -98,6 +99,11 @@ java {
  withJavadocJar()
 }
 
+javadoc {
+ options.addBooleanOption('html5', true)
+ options.addBooleanOption("Xdoclint:none", true)
+}
+
 test {
  environment = [ 'EXPORT_TEST_TO_FILE': 'True' ]
  useJUnitPlatform()
@@ -231,7 +237,7 @@ spotless {
 
  format 'misc', {
  // define the files to apply `misc` to
- target '*.gradle', '*.md', '.gitignore'
+ target '*.rst', '*.md', '.gitignore'
 
  // define the steps to apply to those files
  trimTrailingWhitespace()
@@ -426,36 +432,33 @@ tasks.withType(JavaCompile) {
  options.encoding = 'UTF-8'
 }
 
-task upload(type: Exec) {
- dependsOn(build, gitChangelogTask)
-
- def versionStable = getVersion(false)
-
- if( findProperty("${project.name}.host")==null ) {
- println(
-"""
-Property \"${project.name}.host\' not found.
-Please define \"${project.name}.host\" in the Gradle configuration (e. g. \$HOME/.gradle/gradle.properties.
-"""
- )
- } else {
-
- // define the USERNAME and HOST properties in ~/.gradle/gradle.properties
- args = ["sftp://${findProperty("${project.name}.username")}@${findProperty("${project.name}.host")}/download"]
-
- executable "sftp"
-
- standardInput = new ByteArrayInputStream("""<<EOF
- mkdir ${project.name}-${versionStable}
- cd ${project.name}-${versionStable}
- put build/libs/*
- quit
- EOF"""
- .getBytes(Charset.defaultCharset()))
+remotes {
+ webServer {
+ host = findProperty("${project.name}.host")
+ user = findProperty("${project.name}.username")
+ identity = new File("${System.properties['user.home']}/.ssh/id_rsa")
+ }
+}
 
- standardOutput = new ByteArrayOutputStream()
- ext.output = {
- return standardOutput.toString()
+task upload {
+ doFirst {
+ if( findProperty("${project.name}.host")==null ) {
+ println(
+ """
+ Property \"${project.name}.host\' not found.
+ Please define \"${project.name}.host\" in the Gradle configuration (e. g. \$HOME/.gradle/gradle.properties.
+ """
+ )
+ }
+ }
+ doLast {
+ ssh.run {
+ session(remotes.webServer) {
+ def versionStable = getVersion(false)
+ execute "mkdir -p download/${project.name}-${versionStable}"
+ put from: "${project.buildDir}/libs", into: "download/${project.name}-${versionStable}"
+ }
  }
  }
 }
+

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists