This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/hop.git
The following commit(s) were added to refs/heads/main by this push:
new 908814a103 [RELEASE] fix 2.21.0 build (#9140)
908814a103 is described below
commit 908814a103372d7ea3f5292fe4ff74f4fdce1a2a
Author: Hans Van Akelyen <[email protected]>
AuthorDate: Thu Oct 29 08:59:06 2026 +0100
[RELEASE] fix 2.21.0 build (#9140)
---
tools/install-wave1-plugins.sh | 11 +++++++++--
tools/list-marketplace-plugins.sh | 10 ++++++++--
2 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/tools/install-wave1-plugins.sh b/tools/install-wave1-plugins.sh
index 80ba2e6e8e..54d0391783 100755
--- a/tools/install-wave1-plugins.sh
+++ b/tools/install-wave1-plugins.sh
@@ -25,7 +25,6 @@ set -euo pipefail
ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
INSTALL_DIR="${1:-${ROOT}/assemblies/client/target/hop}"
-VERSION="${HOP_VERSION:-2.20.0-SNAPSHOT}"
LIST_SCRIPT="${ROOT}/tools/list-marketplace-plugins.sh"
ZIP_DIR="${HOP_PLUGIN_ZIP_DIR:-}"
@@ -44,7 +43,7 @@ fi
PLUGINS=()
while IFS= read -r entry; do
[[ -n "${entry}" ]] && PLUGINS+=("${entry}")
-done < <(HOP_VERSION="${VERSION}" "${LIST_SCRIPT}" --zips)
+done < <("${LIST_SCRIPT}" --zips)
installed=0
skipped=0
@@ -67,4 +66,12 @@ for entry in ${PLUGINS[@]+"${PLUGINS[@]}"}; do
done
echo "Marketplace plugins: installed=${installed} skipped=${skipped} into
${INSTALL_DIR}"
+# Installing nothing at all means the zips were looked up under the wrong
version or were never
+# built. Fail here rather than let a later step trip over a missing plugin
(e.g. the Beam-owned
+# hop-conf --generate-fat-jar option).
+if [[ ${#PLUGINS[@]} -gt 0 && ${installed} -eq 0 ]]; then
+ echo "ERROR: none of the ${#PLUGINS[@]} marketplace plugin zips were found."
>&2
+ echo "Build the plugin modules first, or set HOP_VERSION to the version they
were built with." >&2
+ exit 1
+fi
# Note: the Beam plugin zip unpacks SDKs into lib/core (and Spark client jars
into lib/spark-client).
diff --git a/tools/list-marketplace-plugins.sh
b/tools/list-marketplace-plugins.sh
index 8a1b55ec56..054b549c53 100755
--- a/tools/list-marketplace-plugins.sh
+++ b/tools/list-marketplace-plugins.sh
@@ -15,14 +15,20 @@
#
# Usage:
# ./tools/list-marketplace-plugins.sh
-# HOP_VERSION=2.19.0-SNAPSHOT ./tools/list-marketplace-plugins.sh --zips
+# HOP_VERSION=2.21.0-SNAPSHOT ./tools/list-marketplace-plugins.sh --zips
# → artifactId|modulePath/target/artifactId-${HOP_VERSION}.zip
#
set -euo pipefail
ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
REGISTRY="${ROOT}/plugins/misc/marketplace/src/main/resources/org/apache/hop/marketplace/optional-plugins.yaml"
-VERSION="${HOP_VERSION:-2.19.0-SNAPSHOT}"
+# Default to the version of the reactor this script lives in (the project
<version> right after
+# </parent> in the root pom), so a release version bump never leaves a stale
default behind.
+VERSION="${HOP_VERSION:-$(awk '/<\/parent>/ {p=1; next} p && /<version>/
{gsub(/.*<version>|<\/version>.*/, ""); print; exit}' "${ROOT}/pom.xml")}"
+if [[ -z "${VERSION}" ]]; then
+ echo "Could not determine the Hop version from ${ROOT}/pom.xml; set
HOP_VERSION." >&2
+ exit 1
+fi
MODE="pairs"
if [[ "${1:-}" == "--zips" ]]; then
