RR v2.2

README.md

@@ -62,6 +62,13 @@ project folder, run this command to build the distribution .zip file:
 gradlew
 ```
 
+## RR on Maven Central
+
+RR is available on Maven Central with groupId `de.bottlecaps.rr` and artifactIds
+
+ -  [`rr-webapp`][rr-webapp] for `rr.war`,
+ -  [`rr-lib`][rr-lib] for `rr.jar`, which can be added to other projects as a dependency.
+
 ## Thanks
 
 This project makes use of
@@ -72,9 +79,9 @@ This project makes use of
   * [Gradle][GRADLE], and
   * [Gradle-License-Report][GRADLE-LICENSE-REPORT].
 
-## License
+# License
 
-RR is released under the [Apache 2 License][ASL].
+Copyright (c) 2010-2025 Gunther Rademacher. RR is provided under the [Apache 2 License][ASL].
 
 ## Links
 
@@ -94,4 +101,5 @@ Thanks to [Vinay Sajip][VINAY], RR also runs on <https://rr.red-dove.com/ui>.
 [GRADLE]: https://gradle.org/
 [GRADLE-LICENSE-REPORT]: https://github.com/jk1/Gradle-License-Report
 [VINAY]: https://github.com/vsajip
-
+[rr-webapp]: https://central.sonatype.com/artifact/de.bottlecaps.rr/rr-webapp
+[rr-lib]: https://central.sonatype.com/artifact/de.bottlecaps.rr/rr-lib

build.gradle

@@ -5,18 +5,18 @@
 plugins {
     id 'java'
     id 'war'
-    id 'com.github.jk1.dependency-license-report' version '2.5'
+    id 'com.github.jk1.dependency-license-report' version '2.9'
     id 'maven-publish'
     id 'signing'
 }
 
 defaultTasks 'build'
 build.dependsOn 'distZip'
 
-version = '2.2-SNAPSHOT'
+version = '2.2'
 group = 'de.bottlecaps.rr'
 def buildTime = new Date()
-def aceVersion = '1.32.3'
+def aceVersion = '1.37.1'
 
 def generatedSrc = "$buildDir/generated-src/main"
 
@@ -42,14 +42,14 @@ configurations {
 dependencies {
     ace "org.webjars.npm:ace-builds:$aceVersion"
 
-    compileOnly 'org.apache.tomcat:tomcat-servlet-api:8.5.97'
+    compileOnly 'org.apache.tomcat:tomcat-servlet-api:8.5.100'
 
-    implementation 'net.sf.saxon:Saxon-HE:12.4'
+    implementation 'net.sf.saxon:Saxon-HE:12.5'
     implementation 'org.xmlresolver:xmlresolver:5.2.2'
     implementation 'org.ccil.cowan.tagsoup:tagsoup:1.2.1'
-    implementation 'org.apache.xmlgraphics:batik-all:1.17'
+    implementation 'org.apache.xmlgraphics:batik-all:1.18'
     implementation 'xml-apis:xml-apis-ext:1.3.04'
-    implementation 'org.apache.xmlgraphics:xmlgraphics-commons:2.8'
+    implementation 'org.apache.xmlgraphics:xmlgraphics-commons:2.10'
 }
 
 configurations.all {
@@ -245,6 +245,7 @@ publishing {
 }
 
 signing {
+    useGpgCmd()
     sign publishing.publications.jar
     sign publishing.publications.war
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

src/main/java/de/bottlecaps/railroad/core/Parser.java

@@ -1,4 +1,4 @@
-// This file was generated on Sun Jan 5, 2025 21:16 (UTC+01) by REx v6.1-SNAPSHOT which is Copyright (c) 1979-2025 by Gunther Rademacher <grd@gmx.net>
+// This file was generated on Thu Jan 30, 2025 12:55 (UTC+01) by REx v6.1 which is Copyright (c) 1979-2025 by Gunther Rademacher <grd@gmx.net>
 // REx command line: -tree -a none -java -saxon -name de.bottlecaps.railroad.core.Parser Parser.ebnf
 
 package de.bottlecaps.railroad.core;