Update for 26.1.2

build-versions.sh

@@ -82,12 +82,34 @@ for ver in "${versions[@]}"; do
         BUILD_JAVA_21=$( [ -z ${BUILD_JAVA_21+x} ] && echo "1.21.10" || echo "$BUILD_JAVA_21,1.21.10" )
     elif [[ "$ver" =~ ^1\.21\.11$ ]]; then
         BUILD_JAVA_21=$( [ -z ${BUILD_JAVA_21+x} ] && echo "1.21.11" || echo "$BUILD_JAVA_21,1.21.11" )
+    elif [[ "$ver" =~ ^26\.1(\.[12])?$ ]]; then
+        BUILD_JAVA_25=$( [ -z ${BUILD_JAVA_25+x} ] && echo "26.1.2" || echo "$BUILD_JAVA_25,26.1.2" )
     else
-        echo "Unknown version $ver, attempting to build with java 21"
+        echo "Unknown version $ver, attempting to build with java 25"
-        BUILD_JAVA_21=$( [ -z ${BUILD_JAVA_21+x} ] && echo "$ver" || echo "$BUILD_JAVA_21,$ver" )
+        BUILD_JAVA_25=$( [ -z ${BUILD_JAVA_25+x} ] && echo "$ver" || echo "$BUILD_JAVA_21,$ver" )
     fi
 done
 
+if [ ! -z ${BUILD_JAVA_25+x} ]; then
+    if [ -z ${JAVA_VERSION+x} ]; then
+        JAVA_VERSION=25
+        echo "No java version specified, defaulting to 25"
+    fi
+
+    echo "Checking for java 25 spigot builds: $BUILD_JAVA_25"
+
+    docker run --rm \
+        --user $(id -u):$(id -g) \
+        -e MAVEN_CONFIG=/var/maven/.m2 \
+        -e M2_PATH=/var/maven/.m2 \
+        -e REV="$BUILD_JAVA_25" \
+        -e SERVER_REQUIRED="$SERVER_REQUIRED" \
+        --volume "$BUILD_DIRECTORY:/build" \
+        --volume "$M2_DIRECTORY:/var/maven/.m2" \
+        --volume "$SCRIPT_DIR/scripts:/scripts" \
+        -- docker.io/maven:3.9.14-eclipse-temurin-25 ./scripts/install-spigot.sh
+fi
+
 if [ ! -z ${BUILD_JAVA_21+x} ]; then
     if [ -z ${JAVA_VERSION+x} ]; then
         JAVA_VERSION=21

run.sh

@@ -8,7 +8,7 @@ export SERVER_REQUIRED="false"
 source "$SCRIPT_DIR/build-versions.sh"
 
 echo "Mounting m2 from $M2_DIRECTORY"
-echo "Using java version ${JAVA_VERSION:-21}"
+echo "Using java version ${JAVA_VERSION:-25}"
 
 docker run --rm -it \
     --user $(id -u):$(id -g) \
@@ -18,4 +18,4 @@ docker run --rm -it \
     --volume "$WORKSPACE:/workspace" \
     --volume "$M2_DIRECTORY:/var/maven/.m2" \
     --volume "$SCRIPT_DIR/scripts:/scripts" \
-    -- docker.io/maven:3.9.11-eclipse-temurin-${JAVA_VERSION:-21} /scripts/initialize.sh "$@"
+    -- docker.io/maven:3.9.11-eclipse-temurin-${JAVA_VERSION:-25} /scripts/initialize.sh "$@"

run_server.sh

@@ -2,7 +2,7 @@
 
 if [ "$#" -lt 1 ]; then
     echo "Using default spigot version 1.21.11"
-    export REV=1.21.11
+    export REV=26.1.2
 else
     echo "Using spigot version $1"
     export REV="$1"
@@ -24,4 +24,4 @@ docker run --rm -it \
     --volume "$WORKSPACE:/workspace" \
     --volume "$M2_DIRECTORY:/var/maven/.m2" \
     --volume "$SCRIPT_DIR/scripts:/scripts" \
-    -- docker.io/maven:3.9.11-eclipse-temurin-${JAVA_VERSION:-21} /scripts/initialize.sh java -Xms4096M -Xmx4096M -jar "/build/spigot-${REV}.jar" --nogui
+    -- docker.io/maven:3.9.11-eclipse-temurin-${JAVA_VERSION:-25} /scripts/initialize.sh java -Xms4096M -Xmx4096M -jar "/build/spigot-${REV}.jar" --nogui

scripts/install-spigot.sh

@@ -25,7 +25,7 @@ for ver in "${versions[@]}"; do
     fi
 
     cd ${HOME}/buildtools
-    [ ! -f "BuildTools.jar" ] && wget -O BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar
+    [ ! -f "BuildTools.jar" ] && curl -o BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar
 
     java -jar BuildTools.jar --rev "$ver"