Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ All notable changes to this project will be documented in this file.
- nifi: Backport NIFI-15958 to log periodic progress while waiting for the content archive scan and provenance re-index, for `2.6.0`, `2.7.2`, and `2.9.0` ([#1611]).
- hbase: Add an SBOM for the web UI (npm) dependencies, which are unpacked from webjars and therefore not covered by the CycloneDX Maven plugin ([#1620]).
- trino: Add SBOMs for the web UI, both for the two npm projects behind it and for the pre-built JavaScript vendored into the source tree ([#1620]).
- hive: Restore the `get_table` and `get_table_objects_by_name` Thrift methods that HIVE-26537 removed in Hive 4.0.1, for `4.2.0` ([#1636]).
- hadoop, spark: Add SBOMs for the pre-built JavaScript that is vendored into the source tree for the HDFS and Spark web UIs ([#1620]).
- stats-exporter: Add `0.31.0` ([#1664]).

Expand Down Expand Up @@ -53,6 +54,8 @@ All notable changes to this project will be documented in this file.
level ([#1638]).
- opensearch-dashboards: Generate the SBOM from the built distribution instead of the source
worktree, so dev dependencies are excluded ([#1641]).
- hive: Build against the Hive modules built alongside each other (in the same reactor) rather than the ones published on Maven Central, for `4.2.0`.
Upstream fixed one instance of this for Hive 4.3.0 in [HIVE-29827](https://issues.apache.org/jira/browse/HIVE-29827) but there are others. ([#1636]).

### Removed

Expand All @@ -70,6 +73,7 @@ All notable changes to this project will be documented in this file.
[#1623]: https://github.com/stackabletech/docker-images/pull/1623
[#1630]: https://github.com/stackabletech/docker-images/pull/1630
[#1635]: https://github.com/stackabletech/docker-images/pull/1635
[#1636]: https://github.com/stackabletech/docker-images/pull/1636
[#1638]: https://github.com/stackabletech/docker-images/pull/1638
[#1641]: https://github.com/stackabletech/docker-images/pull/1641
[#1662]: https://github.com/stackabletech/docker-images/pull/1662
Expand Down
4 changes: 4 additions & 0 deletions hive/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,13 @@ elif [[ "${PRODUCT_VERSION}" == 4.0.* ]]; then
)
else
# Starting with 4.1.0 the build process changed again in https://github.com/apache/hive/pull/5936 (HIVE-29062)
# The main reactor pins its dependencies on the standalone-metastore modules through `standalone-metastore.version`.
# This is _not_ changed by `mvn versions:set` above.
# If we do not change it here it'd download those dependencies (without the -stackableXXXX suffix) from Maven central.
mvn \
clean package \
-Dhadoop.version=${HADOOP_VERSION}-stackable${RELEASE_VERSION} \
-Dstandalone-metastore.version=${NEW_VERSION} \
Comment thread
NickLarsenNZ marked this conversation as resolved.
-DskipTests \
-Pdist
# Looks like we can not filter the projects using "--projects standalone-metastore/metastore-server --also-make",
Expand Down
Comment thread
NickLarsenNZ marked this conversation as resolved.
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
From a8aada47897543df0ba008655852e16aa5ede477 Mon Sep 17 00:00:00 2001
From: Lars Francke <git@lars-francke.de>
Date: Fri, 11 Sep 2026 14:48:51 +0200
Subject: Resolve every in-reactor dependency against the modules built
alongside it

standalone-metastore refers to several modules built in the same reactor through the literal
hive.version property rather than ${project.version}.
We use "mvn versions:set" to stamp our Stackable release version and we also expect Hive to
then honor that. This patch makes sure it does (plus a change in the Dockerfile)

Upstream fixed one instance of this, the metastore-server to metastore-client reference, for
Hive 4.3.0: https://issues.apache.org/jira/browse/HIVE-29827.
---
standalone-metastore/metastore-rest-catalog/pom.xml | 10 +++++-----
standalone-metastore/metastore-server/pom.xml | 2 +-
.../metastore-tools/metastore-benchmarks/pom.xml | 2 +-
standalone-metastore/metastore-tools/pom.xml | 2 +-
standalone-metastore/packaging/pom.xml | 6 +++---
5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/standalone-metastore/metastore-rest-catalog/pom.xml b/standalone-metastore/metastore-rest-catalog/pom.xml
index ad6cecb535..8a4054422f 100644
--- a/standalone-metastore/metastore-rest-catalog/pom.xml
+++ b/standalone-metastore/metastore-rest-catalog/pom.xml
@@ -34,31 +34,31 @@
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-standalone-metastore-server</artifactId>
- <version>${hive.version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-standalone-metastore-common</artifactId>
- <version>${hive.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-iceberg-catalog</artifactId>
- <version>${hive.version}</version>
+ <version>${project.version}</version>
</dependency>
<!-- Test dependencies -->
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-standalone-metastore-common</artifactId>
- <version>${hive.version}</version>
+ <version>${project.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-standalone-metastore-server</artifactId>
- <version>${hive.version}</version>
+ <version>${project.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
diff --git a/standalone-metastore/metastore-server/pom.xml b/standalone-metastore/metastore-server/pom.xml
index 0e24b3ebc9..5ffdb4047f 100644
--- a/standalone-metastore/metastore-server/pom.xml
+++ b/standalone-metastore/metastore-server/pom.xml
@@ -28,7 +28,7 @@
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-standalone-metastore-client</artifactId>
- <version>${hive.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
diff --git a/standalone-metastore/metastore-tools/metastore-benchmarks/pom.xml b/standalone-metastore/metastore-tools/metastore-benchmarks/pom.xml
index 44281104b1..b6a1037574 100644
--- a/standalone-metastore/metastore-tools/metastore-benchmarks/pom.xml
+++ b/standalone-metastore/metastore-tools/metastore-benchmarks/pom.xml
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.apache.hive.hcatalog</groupId>
<artifactId>hive-hcatalog-server-extensions</artifactId>
- <version>${hive.version}</version>
+ <version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.zookeeper</groupId>
diff --git a/standalone-metastore/metastore-tools/pom.xml b/standalone-metastore/metastore-tools/pom.xml
index 4da5ea9d44..b184241f3e 100644
--- a/standalone-metastore/metastore-tools/pom.xml
+++ b/standalone-metastore/metastore-tools/pom.xml
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.hive.hcatalog</groupId>
<artifactId>hive-hcatalog-server-extensions</artifactId>
- <version>${hive.version}</version>
+ <version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.zookeeper</groupId>
diff --git a/standalone-metastore/packaging/pom.xml b/standalone-metastore/packaging/pom.xml
index 5a526cf722..733a203db6 100644
--- a/standalone-metastore/packaging/pom.xml
+++ b/standalone-metastore/packaging/pom.xml
@@ -176,7 +176,7 @@
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-metastore</artifactId>
- <version>${hive.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
@@ -192,13 +192,13 @@
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-exec</artifactId>
- <version>${hive.version}</version>
+ <version>${project.version}</version>
<classifier>core</classifier>
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-iceberg-handler</artifactId>
- <version>${hive.version}</version>
+ <version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.hive</groupId>
Loading
Loading