YETUS-1271. Upgrade to Ubuntu 24.04 (Noble)

.circleci/config.yml

@@ -19,15 +19,14 @@ version: 2
 jobs:
   build:
     docker:
-      - image: ghcr.io/apache/yetus:main
+      - image: ghcr.io/effectivemachines/buretoolbox:main
 
     working_directory: ~/repo
 
     environment:
       # Customize the JVM maximum heap limit
       MAVEN_OPTS: -Xmx3200m
-      # Set JAVA_HOME
-      JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
+      JAVA_HOME: /usr/lib/jvm/default-java
 
     steps:
       - checkout
@@ -38,7 +37,6 @@ jobs:
       - run: >
              ~/repo/precommit/src/main/shell/test-patch.sh
              --plugins=all
-             --java-home=/usr/lib/jvm/java-11-openjdk-amd64
              --patch-dir=/tmp/yetus-out
              --html-report-file=/tmp/yetus-out/report.html
              --console-report-file=/tmp/yetus-out/console.txt

.cirrus.yml

@@ -17,7 +17,9 @@
 
 yetus_task:
   container:
-    image: ghcr.io/apache/yetus:main
+    image: ghcr.io/effectivemachines/buretoolbox:main
+  env:
+    JAVA_HOME: /usr/lib/jvm/default-java
   test_script: >
              ${CIRRUS_WORKING_DIR}/precommit/src/main/shell/test-patch.sh
              --basedir="${CIRRUS_WORKING_DIR}"
@@ -26,7 +28,6 @@ yetus_task:
              --console-report-file=/tmp/yetus-out/console.txt
              --csv-report-file=/tmp/yetus-out/report.csv
              --html-report-file=/tmp/yetus-out/report.html
-             --java-home=/usr/lib/jvm/java-11-openjdk-amd64
              --junit-report-xml=/tmp/yetus-out/junit.xml
              --plugins=all
              --junit-report-xml=line

.github/workflows/action-test.yml

@@ -38,7 +38,6 @@ jobs:
         uses: apache/yetus-test-patch-action@main
         with:
           basedir: ./src
-          javahome: /usr/lib/jvm/java-11-openjdk-amd64
           patchdir: ./out
           buildtool: maven
           githubtoken: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/yetus.yml

@@ -48,10 +48,9 @@ jobs:
           --console-report-file="${GITHUB_WORKSPACE}/out/console.txt"
           --csv-report-file="${GITHUB_WORKSPACE}/out/report.csv"
           --docker
-          --docker-cache-from=ghcr.io/apache/yetus-base:main
+          --docker-cache-from=ghcr.io/effectivemachines/buretoolbox:main
           --github-token="${{ secrets.GITHUB_TOKEN }}"
           --html-report-file="${GITHUB_WORKSPACE}/out/report.html"
-          --java-home=/usr/lib/jvm/java-11-openjdk-amd64
           --junit-report-xml="${GITHUB_WORKSPACE}/out/junit-report.xml"
           --patch-dir="${GITHUB_WORKSPACE}/out"
           --plugins=all

.gitlab-ci.yml

@@ -16,14 +16,15 @@
 ---
 
 buretoolbox-job:
-  image: ghcr.io/apache/yetus:main
+  image: ghcr.io/effectivemachines/buretoolbox:main
   allow_failure: true
+  variables:
+    JAVA_HOME: /usr/lib/jvm/default-java
   script:
     - >
       precommit/src/main/shell/test-patch.sh
       --patch-dir=/tmp/yetus-out
       --plugins=all
-      --java-home=/usr/lib/jvm/java-11-openjdk-amd64
       --html-report-file=/tmp/yetus-out/report.html
       --csv-report-file=/tmp/yetus-out/report.csv
       --console-report-file=/tmp/yetus-out/console.txt

.travis.yml

@@ -30,9 +30,8 @@ script:
     precommit/src/main/shell/test-patch.sh
     --docker
     --patch-dir=/tmp/yetus-out
-    --java-home=/usr/lib/jvm/java-11-openjdk-amd64
     --plugins=all,-detsecrets
-    --docker-cache-from=ghcr.io/apache/yetus:main
+    --docker-cache-from=ghcr.io/effectivemachines/buretoolbox:main
     --html-report-file=/tmp/yetus-out/report.html
     --console-report-file=/tmp/yetus-out/console.txt
     --brief-report-file=/tmp/yetus-out/brief.txt

Jenkinsfile

@@ -95,7 +95,6 @@ pipeline {
                 # enable writing back to Github
                 YETUS_ARGS+=(--github-token="${GITHUB_TOKEN}")
 
-                YETUS_ARGS+=(--java-home=/usr/lib/jvm/java-11-openjdk-amd64)
 
                 # enable writing back to ASF JIRA
                 YETUS_ARGS+=(--jira-issue-re='^YETUS-[0-9]*$')
@@ -133,10 +132,10 @@ pipeline {
                 # run in docker mode and specifically point to our
                 # Dockerfile since we don't want to use the auto-pulled version.
                 if [[ "${USE_DOCKER_FLAG}" == true ]]; then
-                  docker pull ubuntu:jammy
+                  docker pull ubuntu:noble
                   YETUS_ARGS+=("--docker")
                   YETUS_ARGS+=("--dockerfile=${YETUS_DOCKERFILE}")
-                  YETUS_ARGS+=("--docker-cache-from=ghcr.io/apache/yetus-base:main")
+                  YETUS_ARGS+=("--docker-cache-from=ghcr.io/effectivemachines/buretoolbox:main")
                 else
                   # need to figure this out programmatically; hard-coded for now
                   export JAVA_HOME=/home/jenkins/tools/java/latest1.8

asf-site-src/Dockerfile

@@ -48,7 +48,7 @@ RUN apt-get -q update \
 RUN echo "export GPG_TTY=\$(tty)" >>  /root/.bashrc
 # hadolint disable=DL3059
 RUN groupadd --non-unique -g "${GROUP_ID}" "${USER_NAME}" \
-    && useradd -l -g "${GROUP_ID}" -u "${USER_ID}" -k /root -m "${USER_NAME}"
+    && useradd --non-unique -l -g "${GROUP_ID}" -u "${USER_ID}" -k /root -m "${USER_NAME}"
 # hadolint disable=DL3059,SC2039,SC1117
 RUN echo -e "${USER_NAME}\\tALL=NOPASSWD: ALL" > "/etc/sudoers.d/yetus-build-${USER_ID}" # pragma: allowlist secret
 ENV HOME=/home/${USER_NAME}
@@ -79,10 +79,9 @@ ENV GEM_HOME=${BUNDLE_PATH}
 # pre-install most of the middleman stack to save time
 # on re-launches
 # hadolint ignore=DL3028
-RUN gem install bundler \
-        middleman:'4.5.0' \
+RUN gem install bundler:'4.0.8' \
+        middleman:'4.6.3' \
         middleman-syntax \
-        nokogiri:1.15.4 \
         sassc:2.4.0 \
         tzinfo-data
 

asf-site-src/Gemfile.lock

@@ -1,128 +1,153 @@
 GIT
   remote: https://github.com/middleman/middleman-syntax.git
-  revision: 2d44853d28766850db2ca800e880270fa7dd8ad6
+  revision: 89aab5386c40bb99cfe670396e53c334d7ea3460
   specs:
-    middleman-syntax (3.4.0)
+    middleman-syntax (3.6.1)
       middleman-core (>= 3.2)
-      rouge (~> 3.2)
+      rouge (>= 3.2, < 5)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.8.7)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+    activesupport (8.1.3)
+      base64
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
+      json
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      tzinfo (~> 2.0)
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
-    backports (3.25.0)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
+    addressable (2.8.9)
+      public_suffix (>= 2.0.2, < 8.0)
+    base64 (0.3.0)
+    bigdecimal (4.1.0)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.3.4)
-    contracts (0.16.1)
-    dotenv (3.1.7)
+    concurrent-ruby (1.3.6)
+    connection_pool (3.0.2)
+    contracts (0.17.3)
+    dotenv (3.2.0)
+    drb (2.2.3)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
-    erubis (2.7.0)
+    erubi (1.13.1)
     eventmachine (1.2.7)
     execjs (2.10.0)
     fast_blank (1.0.1)
-    fastimage (2.4.0)
-    ffi (1.17.1)
+    fastimage (2.4.1)
+    ffi (1.17.4-aarch64-linux-gnu)
+    ffi (1.17.4-arm64-darwin)
+    ffi (1.17.4-x86_64-darwin)
+    ffi (1.17.4-x86_64-linux-gnu)
     haml (5.2.2)
       temple (>= 0.8.0)
       tilt
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
-    hashie (3.6.0)
-    http_parser.rb (0.8.0)
-    i18n (1.6.0)
+    hashie (5.1.0)
+      logger
+    http_parser.rb (0.8.1)
+    i18n (1.14.8)
       concurrent-ruby (~> 1.0)
-    kramdown (2.5.1)
-      rexml (>= 3.3.9)
+    json (2.19.3)
+    kramdown (2.5.2)
+      rexml (>= 3.4.4)
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    libv8-node (21.7.2.0-aarch64-linux)
-    libv8-node (21.7.2.0-arm64-darwin)
-    libv8-node (21.7.2.0-x86_64-darwin)
-    libv8-node (21.7.2.0-x86_64-linux)
-    listen (3.9.0)
+    libv8-node (24.12.0.1-aarch64-linux)
+    libv8-node (24.12.0.1-arm64-darwin)
+    libv8-node (24.12.0.1-x86_64-darwin)
+    libv8-node (24.12.0.1-x86_64-linux)
+    listen (3.10.0)
+      logger
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
+    logger (1.7.0)
     memoist (0.16.2)
-    middleman (4.5.1)
-      coffee-script (~> 2.2)
-      haml (>= 4.0.5)
-      kramdown (>= 2.3.0)
-      middleman-cli (= 4.5.1)
-      middleman-core (= 4.5.1)
-    middleman-cli (4.5.1)
-      thor (>= 0.17.0, < 1.3.0)
-    middleman-core (4.5.1)
-      activesupport (>= 6.1, < 7.1)
+    middleman (4.6.3)
+      middleman-cli (= 4.6.3)
+      middleman-core (= 4.6.3)
+    middleman-cli (4.6.3)
+      thor (>= 0.17.0, < 2)
+    middleman-core (4.6.3)
+      activesupport (>= 6.1)
       addressable (~> 2.4)
-      backports (~> 3.6)
-      bundler (~> 2.0)
-      contracts (~> 0.13, < 0.17)
+      bundler (> 2.0)
+      coffee-script (~> 2.2)
+      contracts
       dotenv
-      erubis
+      erubi
       execjs (~> 2.0)
       fast_blank
       fastimage (~> 2.0)
+      haml (>= 4.0.5, < 7)
       hamster (~> 3.0)
-      hashie (~> 3.4)
-      i18n (~> 1.6.0)
+      hashie (>= 3.4, < 6.0)
+      i18n (>= 1.6, < 1.15)
+      kramdown (~> 2.4)
       listen (~> 3.0)
       memoist (~> 0.14)
-      padrino-helpers (~> 0.15.0)
+      padrino-helpers (>= 0.15, < 0.17)
       parallel
-      rack (>= 1.4.5, < 3)
+      rack (>= 3)
+      rackup
       sassc (~> 2.0)
       servolux
-      tilt (~> 2.0.9)
+      tilt (~> 2.2)
       toml
-      uglifier (~> 3.0)
+      uglifier (>= 3, < 5)
       webrick
-    middleman-livereload (3.4.7)
+    middleman-livereload (3.5.0)
       em-websocket (~> 0.5.1)
       middleman-core (>= 3.3)
-      rack-livereload (~> 0.3.15)
-    mini_racer (0.12.0)
-      libv8-node (~> 21.7.2.0)
-    minitest (5.25.4)
-    padrino-helpers (0.15.3)
+      rack-livereload (~> 0.6.1)
+    mini_racer (0.20.0)
+      libv8-node (~> 24.12.0.1)
+    minitest (6.0.2)
+      drb (~> 2.0)
+      prism (~> 1.5)
+    padrino-helpers (0.16.1)
       i18n (>= 0.6.7, < 2)
-      padrino-support (= 0.15.3)
-      tilt (>= 1.4.1, < 3)
-    padrino-support (0.15.3)
-    parallel (1.26.3)
+      padrino-support (= 0.16.1)
+      tilt (>= 2.1, < 3)
+    padrino-support (0.16.1)
+    parallel (1.27.0)
     parslet (2.0.0)
-    public_suffix (6.0.1)
-    rack (2.2.22)
-    rack-livereload (0.3.17)
-      rack
+    prism (1.9.0)
+    public_suffix (7.0.5)
+    rack (3.1.20)
+    rack-livereload (0.6.1)
+      rack (>= 3.0, < 3.2)
+    rackup (2.3.1)
+      rack (>= 3)
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rexml (3.4.2)
-    rouge (3.30.0)
+    rexml (3.4.4)
+    rouge (4.7.0)
     sassc (2.4.0)
       ffi (~> 1.9)
+    securerandom (0.4.1)
     servolux (0.13.0)
-    temple (0.10.3)
-    thor (1.2.2)
-    tilt (2.0.11)
+    temple (0.10.4)
+    thor (1.5.0)
+    tilt (2.7.0)
     toml (0.3.0)
       parslet (>= 1.8.0, < 3.0.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    uglifier (3.2.0)
+    uglifier (4.2.1)
       execjs (>= 0.3.0, < 3)
-    webrick (1.9.1)
+    uri (1.1.1)
+    webrick (1.9.2)
 
 PLATFORMS
   aarch64-linux
@@ -141,4 +166,4 @@ DEPENDENCIES
   wdm (~> 0.1.0)
 
 BUNDLED WITH
-   2.5.23
+   4.0.8

asf-site-src/config.rb

@@ -17,7 +17,6 @@
 # limitations under the License.
 #
 
-require 'ruby27_fix_uri'
 require 'kramdown-parser-gfm'
 
 set :markdown_engine, :kramdown