spoon: updated to jdk21 and added jenkins test

src/kaskara/spoon/backend/Dockerfile

@@ -1,27 +1,85 @@
-FROM ghcr.io/graalvm/native-image-community:17-muslib AS build
-CMD ["/bin/bash"]
-ENTRYPOINT ["/bin/bash", "-c"]
+FROM ubuntu:24.04 AS test-donor
+RUN apt-get update \
+ && apt-get install -y --no-install-recommends \
+        ca-certificates \
+        git \
+ && rm -rf /var/lib/apt/lists/*
+WORKDIR /tests
+
+ENV JENKINS_REVISION jenkins-2.464
+RUN git clone https://github.com/jenkinsci/jenkins \
+ && git -C jenkins checkout ${JENKINS_REVISION}
+
+ENV SPRING_BOOT_REVISION v3.3.1
+RUN git clone https://github.com/spring-projects/spring-boot \
+ && git -C spring-boot checkout ${SPRING_BOOT_REVISION}
+
+ENV ELASTIC_SEARCH_REVISION v8.14.1
+RUN git clone https://github.com/elastic/elasticsearch \
+ && git -C elasticsearch checkout ${ELASTIC_SEARCH_REVISION}
+
+ENV GUAVA_REVISION v33.2.1
+RUN git clone https://github.com/google/guava \
+ && git -C guava checkout ${GUAVA_REVISION}
+
+ENV DUBBO_REVISION dubbo-3.2.14
+RUN git clone https://github.com/apache/dubbo \
+ && git -C dubbo checkout ${DUBBO_REVISION}
+
+
+# FROM ghcr.io/graalvm/native-image-community:21-muslib AS jar-builder
+FROM openjdk:21-slim AS jar-builder
 COPY . /tmp/kaskara-spoon
 ENV KASKARA_SPOON_VERSION 0.1.0
 RUN cd /tmp/kaskara-spoon \
- && mkdir -p /opt/kaskara-spoon/bin \
  && ./gradlew build \
- && cd ./build/libs \
+ && mv /tmp/kaskara-spoon/build/libs/kaskara-spoon-${KASKARA_SPOON_VERSION}-all.jar /tmp/kaskara-spoon/build/libs/kaskara-spoon.jar
+
+
+FROM ghcr.io/graalvm/native-image-community:21-muslib AS native-image-builder
+CMD ["/bin/bash"]
+ENTRYPOINT ["/bin/bash", "-c"]
+COPY --from=test-donor /tests /tests
+COPY --from=jar-builder /tmp/kaskara-spoon/build/libs /tmp/kaskara-spoon/build/libs
+
+RUN cd /tmp/kaskara-spoon/build/libs \
+ && mkdir -p META-INF/native-image \
+ && echo "test: kaskara-spoon (src/main/java)" \
  && java \
         -agentlib:native-image-agent=config-output-dir=META-INF/native-image \
-        -jar ./kaskara-spoon-0.1.0-all.jar \
+        -jar ./kaskara-spoon.jar \
         /tmp/kaskara-spoon/src/main/java \
+ && echo "test: jenkins (core/src/main/java)" \
+ && java \
+        -agentlib:native-image-agent=config-merge-dir=META-INF/native-image \
+        -jar ./kaskara-spoon.jar \
+        /tests/jenkins/core/src/main/java \
+ && echo "skipping test: guava (guava)" \
+ && echo "skipping test: spring-boot (spring-boot-project/spring-boot/src/main/java)" \
+ && echo "skipping test: elasticsearch"
+
+# && echo "test: guava (guava)" \
+# && java \
+#        -agentlib:native-image-agent=config-merge-dir=META-INF/native-image \
+#        -jar ./kaskara-spoon.jar \
+#        /tests/guava/guava \
+
+# --no-fallback
+RUN cd /tmp/kaskara-spoon/build/libs \
+ && mkdir -p /opt/kaskara-spoon/bin \
  && native-image \
         -classpath . \
-        --verbose \
         --no-fallback \
+        --verbose \
         --static \
         --libc=musl \
-        -jar ./kaskara-spoon-${KASKARA_SPOON_VERSION}-all.jar \
+        -H:+ReportExceptionStackTraces \
+        -jar ./kaskara-spoon.jar \
         -o /opt/kaskara-spoon/bin/kaskara-spoon \
  && /opt/kaskara-spoon/bin/kaskara-spoon --help \
  && /opt/kaskara-spoon/bin/kaskara-spoon /tmp/kaskara-spoon/src/main/java
 
-FROM ghcr.io/graalvm/native-image-community:17-muslib AS run
-COPY --from=build /opt/kaskara-spoon /opt/kaskara-spoon
+
+FROM ubuntu:24.04 AS package
+COPY --from=native-image-builder /opt/kaskara-spoon /opt/kaskara-spoon
 RUN /opt/kaskara-spoon/bin/kaskara-spoon --help

src/kaskara/spoon/backend/build.gradle

@@ -2,7 +2,6 @@ plugins {
   id 'application'
   id 'checkstyle'
   id 'java'
-  id 'org.graalvm.buildtools.native' version '0.9.12'
   id 'com.github.johnrengelman.shadow' version '7.1.2'
 }
 

src/kaskara/spoon/backend/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/kaskara/spoon/backend/gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/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/.
@@ -80,13 +80,11 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# 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
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,18 +198,28 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
         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.

src/kaskara/spoon/backend/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,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,13 +41,13 @@ 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.
-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
 
@@ -56,11 +57,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
 
@@ -75,13 +76,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