Maven Wrapper fix and java 21 update. #6637, #6711 (#6712)

hansva · web-flow · commit 2d487feef959 · 2026-03-05T13:15:56.000+01:00
* Update maven wrapper, fixes #6637 * Upgrade to java 21, fixes #6711
diff --git a/.github/workflows/pr_build_code.yml b/.github/workflows/pr_build_code.yml
@@ -34,10 +34,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v1
         with:
-          java-version: 17
+          java-version: 21
       - name: Cache Maven packages
         uses: actions/cache@v4
         with:
diff --git a/.github/workflows/pr_build_docs.yml b/.github/workflows/pr_build_docs.yml
@@ -32,9 +32,9 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v1
         with:
-          java-version: 17
+          java-version: 21
       - name: RAT Check
         run: mvn clean apache-rat:check
diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
@@ -1,20 +1,3 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#
-
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
+wrapperVersion=3.3.4
+distributionType=only-script
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.12/apache-maven-3.9.12-bin.zip
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -18,7 +18,7 @@
  */
 
 def AGENT_LABEL = env.AGENT_LABEL ?: 'ubuntu'
-def JDK_NAME = env.JDK_NAME ?: 'jdk_17_latest'
+def JDK_NAME = env.JDK_NAME ?: 'jdk_21_latest'
 def MAVEN_NAME = env.MAVEN_NAME ?: 'maven_3_latest'
 
 def MAVEN_PARAMS = "-T 2 -U -B -e -fae -V -Dmaven.compiler.fork=true -Dsurefire.rerunFailingTestsCount=2 -DSkipTestContainers=true"
diff --git a/Jenkinsfile.daily b/Jenkinsfile.daily
@@ -18,7 +18,7 @@
  */
 
 def AGENT_LABEL = env.AGENT_LABEL ?: 'ubuntu'
-def JDK_NAME = env.JDK_NAME ?: 'jdk_17_latest'
+def JDK_NAME = env.JDK_NAME ?: 'jdk_21_latest'
 def MAVEN_NAME = env.MAVEN_NAME ?: 'maven_3_latest'
 
 def MAVEN_PARAMS = "-T 2 -U -B -e -fae -V -Dmaven.compiler.fork=true -Dsurefire.rerunFailingTestsCount=2 -DSkipTestContainers=true"
diff --git a/Jenkinsfile.hop-web-selenium b/Jenkinsfile.hop-web-selenium
@@ -18,7 +18,7 @@
  */
 
 def AGENT_LABEL = env.AGENT_LABEL ?: 'ubuntu'
-def JDK_NAME = env.JDK_NAME ?: 'jdk_17_latest'
+def JDK_NAME = env.JDK_NAME ?: 'jdk_21_latest'
 def MAVEN_NAME = env.MAVEN_NAME ?: 'maven_3_latest'
 
 def MAVEN_PARAMS = "-T 2 -U -B -e -fae -V -Dmaven.compiler.fork=true -Dsurefire.rerunFailingTestsCount=2"
diff --git a/README.md b/README.md
@@ -51,14 +51,14 @@ the [Hop website](https://hop.apache.org) for more information on how to contrib
 
 Required:
 
-- [OpenJDK](https://openjdk.java.net/) Java 17 compiler. Make sure to update your JDK to the latest possible patch
+- [OpenJDK](https://openjdk.java.net/) Java 21 compiler. Make sure to update your JDK to the latest possible patch
   version.
 
 Recommended:
 
 - [Maven](http://maven.apache.org/) 3.6.3 or higher
 
-Verify Maven Java version: (should be Java 17 to compile properly without skipping tests)
+Verify Maven Java version: (should be Java 21 to compile properly without skipping tests)
 
     mvn -version
 
@@ -84,11 +84,11 @@ You can download a source release [here](https://downloads.apache.org/hop/)
 
 Required:
 
-- [OpenJDK](https://openjdk.java.net/) Java 17 compiler or higher. Make sure to get the latest updates to support recent
+- [OpenJDK](https://openjdk.java.net/) Java 21 compiler or higher. Make sure to get the latest updates to support recent
   features like dark mode on the various platforms.
 - [Maven](http://maven.apache.org/) 3.6.3 or higher
 
-Verify Maven Java version: (should be Java 17 to compile properly without skipping tests)
+Verify Maven Java version: (should be Java 21 to compile properly without skipping tests)
 
     mvn -version
 
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -94,7 +94,7 @@ RUN addgroup -g ${HOP_GID} -S hop \
     && adduser -u ${HOP_UID} -S -D -G hop hop \
     && chmod 777 -R /tmp && chmod o+t -R /tmp \
     && apk update \
-    && apk --no-cache add bash curl fontconfig msttcorefonts-installer openjdk17-jre procps \
+    && apk --no-cache add bash curl fontconfig msttcorefonts-installer openjdk21-jre procps \
     && update-ms-fonts \
     && fc-cache -f \
     && rm -rf /var/cache/apk/* \
diff --git a/docker/dataflowTemplate.Dockerfile b/docker/dataflowTemplate.Dockerfile
@@ -16,7 +16,7 @@
 # under the License.
 #
 
-FROM gcr.io/dataflow-templates-base/java17-template-launcher-base
+FROM gcr.io/dataflow-templates-base/java21-template-launcher-base
 
   ARG WORKDIR=/dataflow/template
   RUN mkdir -p ${WORKDIR}
diff --git a/docker/integration-tests/unit-tests.Dockerfile b/docker/integration-tests/unit-tests.Dockerfile
@@ -56,7 +56,7 @@ RUN apt-get update \
   procps \
   git \
   python3-pip \
-  openjdk-17-jre-headless \
+  openjdk-21-jre-headless \
   unzip \
   ttf-mscorefonts-installer \
   locales \
diff --git a/docker/rest.Dockerfile b/docker/rest.Dockerfile
@@ -16,7 +16,7 @@
 # under the License.
 #
 
-FROM tomcat:10-jdk17-openjdk
+FROM tomcat:10-jdk21-openjdk
 LABEL maintainer="Apache Hop Team"
 ENV HOP_CONFIG_FOLDER=""
 ENV HOP_AES_ENCODER_KEY=""
diff --git a/docker/unified.Dockerfile b/docker/unified.Dockerfile
@@ -50,7 +50,7 @@ RUN git clone --depth 1 --branch ${HOP_GIT_TAG} ${HOP_GIT_REPO} hop
 ################################################################################
 # Stage 2a: Full Maven Builder (slower, complete build)
 ################################################################################
-FROM maven:3.9-eclipse-temurin-17 AS builder-full
+FROM maven:3.9-eclipse-temurin-21 AS builder-full
 ARG HOP_BUILD_FROM_SOURCE=local
 ARG MAVEN_OPTS="-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
 ARG MAVEN_THREADS="1C"
@@ -309,7 +309,7 @@ ENTRYPOINT ["/bin/bash", "/opt/hop/run.sh"]
 ################################################################################
 # Stage 4b: Hop Web Image
 ################################################################################
-FROM tomcat:10-jdk17 AS web
+FROM tomcat:10-jdk21 AS web
 
 # Build arguments
 ARG HOP_UID=501
@@ -363,7 +363,7 @@ CMD ["/bin/bash", "/usr/local/tomcat/run-web.sh"]
 ################################################################################
 # Stage 4c: Hop REST Image
 ################################################################################
-FROM tomcat:10-jdk17 AS rest
+FROM tomcat:10-jdk21 AS rest
 
 # Environment variables
 ENV HOP_CONFIG_FOLDER=""
@@ -398,7 +398,7 @@ CMD ["/bin/bash", "/usr/local/tomcat/run-rest.sh"]
 ################################################################################
 # Stage 4d: Hop Dataflow Template Image
 ################################################################################
-FROM gcr.io/dataflow-templates-base/java17-template-launcher-base AS dataflow
+FROM gcr.io/dataflow-templates-base/java21-template-launcher-base AS dataflow
 
 ARG WORKDIR=/dataflow/template
 RUN mkdir -p ${WORKDIR}
diff --git a/docker/web.Dockerfile b/docker/web.Dockerfile
@@ -16,7 +16,7 @@
 # under the License.
 #
 
-FROM tomcat:10-jdk17
+FROM tomcat:10-jdk21
 LABEL maintainer="Apache Hop Team"
 # The UID for the created user
 ARG HOP_UID=501
diff --git a/docs/hop-dev-manual/modules/ROOT/pages/docker-build.adoc b/docs/hop-dev-manual/modules/ROOT/pages/docker-build.adoc
@@ -170,7 +170,7 @@ The following image stages can be specified with the `--images` argument:
 
 |`client`
 |`hop`
-|Main Hop client/server image. Based on Alpine Linux with OpenJDK 17. Can run pipelines, workflows, and Hop Server.
+|Main Hop client/server image. Based on Alpine Linux with OpenJDK 21. Can run pipelines, workflows, and Hop Server.
 
 |`web`
 |`hop-web`
diff --git a/docs/hop-dev-manual/modules/ROOT/pages/hopweb/index.adoc b/docs/hop-dev-manual/modules/ROOT/pages/hopweb/index.adoc
@@ -32,7 +32,7 @@ WARNING: Hop Web is built with https://eclipse.dev/rap/demos/[Eclipse RAP], and
 
 Before starting, ensure you have:
 
-* **Java 17** installed and available in your PATH
+* **Java 21** installed and available in your PATH
 * **Apache Hop** built from source (run `mvn clean install -DskipTests` in the Hop source directory)
 * **Apache Tomcat 10** downloaded and extracted
 
@@ -55,7 +55,7 @@ Additional info in xref:hopweb/developer-guide.adoc#_building_the_hop_web_docker
 
 We'll use Apache Tomcat in this example. If you use another application server, the process should be similar.
 
-Hop 2.x is built with Java 17, so you'll need to https://tomcat.apache.org/download-10.cgi[download the latest Tomcat 10] (or use the official Tomcat 10 Docker image).
+Hop 2.x is built with Java 21, so you'll need to https://tomcat.apache.org/download-10.cgi[download the latest Tomcat 10] (or use the official Tomcat 10 Docker image).
 
 Copy or extract the following files from your Hop build, where `$CATALINA_HOME` is your Tomcat installation folder.
 
@@ -240,7 +240,7 @@ image:hop-web.png[Hop Web, width="90%"]
 === Tomcat won't start
 
 * **Check Tomcat logs**: `$CATALINA_HOME/logs/catalina.out` for errors
-* **Verify Java 17**: Run `java -version` (should show version 17)
+* **Verify Java 21**: Run `java -version` (should show version 17)
 * **Check port availability**: `lsof -i :8080` (Linux/Mac) - port 8080 must be free
 
 === Permission denied errors
diff --git a/docs/hop-tech-manual/modules/ROOT/pages/docker-container.adoc b/docs/hop-tech-manual/modules/ROOT/pages/docker-container.adoc
@@ -32,7 +32,7 @@ A long-lived setup starts a Hop server and waits for work.
 == Operating system
 
 The docker container runs a minimal Linux system called https://hub.docker.com/_/alpine[Alpine].
-OpenJDK version 11 is then used to execute Apache Hop.
+OpenJDK version 21 is then used to execute Apache Hop.
 The Linux user used to execute in the container is `hop` and the group is `hop` as well.
 
 == Container Folder Structure
diff --git a/docs/hop-user-manual/modules/ROOT/pages/getting-started/hop-download-install.adoc b/docs/hop-user-manual/modules/ROOT/pages/getting-started/hop-download-install.adoc
@@ -32,7 +32,7 @@ Download Hop from the http://hop.apache.org/download/[downloads page].
 == Prerequisites
 
 Hop is self contained, all you need is a Java runtime.
-Hop official java version is 17. Check the https://java.com/en/download/help/download_options.html[Java docs] to download and install a Java runtime for your operating system.
+Hop official java version is 21. Check the https://java.com/en/download/help/download_options.html[Java docs] to download and install a Java runtime for your operating system.
 
 == Install
 
diff --git a/docs/hop-user-manual/modules/ROOT/pages/installation-configuration.adoc b/docs/hop-user-manual/modules/ROOT/pages/installation-configuration.adoc
@@ -53,17 +53,17 @@ Apache Hop is known to work well on the following widely used Java Runtimes:
 * https://www.microsoft.com/openjdk[Microsoft OpenJDK] (OpenJDK builds for Windows, MacOS and Linux).
 * https://openjdk.java.net/install/[OpenJDK Java Runtime]
 
-Apache Hop works well with these 64-bit java runtimes for version 11.
+Apache Hop works well with these 64-bit java runtimes for version 21.
 
 Other Java Runtimes may work but haven't been used and tested as extensively as the Oracle and OpenJDK JREs, so you may be pioneering. Feel free to open a https://hop.apache.org/community/tools/#GitHub-Issues[GitHub ticket] if you run into issues, but please mention your JRE and version.
 
 Run `java -version` if you're not sure which Java version is currently installed on your system. Your output should be similar to the one shown below.
 
 [source,shell]
 ----
-openjdk version "11.0.2" 2019-01-15
-OpenJDK Runtime Environment 18.9 (build 11.0.2+9)
-OpenJDK 64-Bit Server VM 18.9 (build 11.0.2+9, mixed mode)
+openjdk version "21.0.10" 2026-01-20
+OpenJDK Runtime Environment Homebrew (build 21.0.10)
+OpenJDK 64-Bit Server VM Homebrew (build 21.0.10, mixed mode, sharing)
 ----
 
 Make sure to point the `JAVA_HOME` environment variable for your operating system to your desired JRE installation. Refer to your operating system's documentation for more information on environment variables.
diff --git a/docs/hop-user-manual/modules/ROOT/pages/pipeline/beam/flink-k8s-operator-running-hop-pipeline.adoc b/docs/hop-user-manual/modules/ROOT/pages/pipeline/beam/flink-k8s-operator-running-hop-pipeline.adoc
@@ -52,6 +52,7 @@ In the Flink deployment file below we'll do the following things different from
 
 - Run with Java 11 since we're using Apache Hop >= 2.0.0
 - Run with Java 17 since we're using Apache Hop >= 2.10.0
+- Run with Java 21 since we're using Apache Hop >= 2.18.0
 - Create an ephemeral volume called `hop-resources` which is mounted by all images in folder `/hop`
 - Before any Flink container starts we run an initContainer to copy our Hop files (fat jar, pipeline, metadata) to the `hop-resources` volume.  Container https://hub.docker.com/r/agiledigital/s3-artifact-fetcher[agiledigital/s3-artifact-fetcher] is used to synchronize an S3 folder with our ephemeral volume shared by the nodes/containers.
 - We specify the Hop main Beam class and pass in the pipeline and metadata JSON filenames (now found locally on the container) along with the name of the Flink Hop pipeline run configuration as arguments.
diff --git a/docs/hop-user-manual/modules/ROOT/pages/pipeline/beam/running-the-beam-samples.adoc b/docs/hop-user-manual/modules/ROOT/pages/pipeline/beam/running-the-beam-samples.adoc
diff --git a/docs/hop-user-manual/modules/ROOT/pages/supported-jvms.adoc b/docs/hop-user-manual/modules/ROOT/pages/supported-jvms.adoc
diff --git a/integration-tests/mdi/files/excelwriter-mdi-test.xlsx b/integration-tests/mdi/files/excelwriter-mdi-test.xlsx
diff --git a/mvnw b/mvnw
diff --git a/mvnw.cmd b/mvnw.cmd
diff --git a/plugins/tech/cassandra/src/main/java/org/apache/hop/pipeline/transforms/cassandrasstableoutput/SSTableOutput.java b/plugins/tech/cassandra/src/main/java/org/apache/hop/pipeline/transforms/cassandrasstableoutput/SSTableOutput.java
diff --git a/plugins/tech/cassandra/src/test/java/org/apache/hop/pipeline/transforms/cassandrasstableoutput/SSTableOutputTest.java b/plugins/tech/cassandra/src/test/java/org/apache/hop/pipeline/transforms/cassandrasstableoutput/SSTableOutputTest.java
diff --git a/pom.xml b/pom.xml

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`# under the License.`
`17`	`17`	`#`
`18`	`18`
`19`		`-FROM gcr.io/dataflow-templates-base/java17-template-launcher-base`
	`19`	`+FROM gcr.io/dataflow-templates-base/java21-template-launcher-base`
`20`	`20`
`21`	`21`	`ARG WORKDIR=/dataflow/template`
`22`	`22`	`RUN mkdir -p ${WORKDIR}`