This is an automated email from the ASF dual-hosted git repository. dkuzmenko pushed a commit to branch branch-4.1 in repository https://gitbox.apache.org/repos/asf/hive.git
The following commit(s) were added to refs/heads/branch-4.1 by this push: new c48c74b6c69 HIVE-27275: Addendum: Add missing dependencies and expose ports (#5921) c48c74b6c69 is described below commit c48c74b6c69ad70388cfd2015a2014c96707bb16 Author: Denys Kuzmenko <dkuzme...@apache.org> AuthorDate: Sat Jul 5 16:14:45 2025 +0200 HIVE-27275: Addendum: Add missing dependencies and expose ports (#5921) --- standalone-metastore/metastore-server/pom.xml | 39 +++++++++++++++++---- .../metastore-server/src/docker/README.md | 2 +- .../metastore-server/src/docker/build.sh | 6 ++-- .../src/docker/conf/metastore-site.xml | 40 +++++++++------------- .../metastore-server/src/docker/docker-compose.yml | 1 + 5 files changed, 54 insertions(+), 34 deletions(-) diff --git a/standalone-metastore/metastore-server/pom.xml b/standalone-metastore/metastore-server/pom.xml index 2f63ebeaff2..7b0f606de2b 100644 --- a/standalone-metastore/metastore-server/pom.xml +++ b/standalone-metastore/metastore-server/pom.xml @@ -492,24 +492,51 @@ </reporting> </profile> <profile> - <id>dist</id> - </profile> - <profile> - <id>docker</id> + <id>add-extra-deps</id> + <activation> + <property> + <name>allModules</name> + <value>true</value> + </property> + </activation> <dependencies> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-metastore</artifactId> <version>${hive.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-standalone-metastore-rest-catalog</artifactId> <version>${hive.version}</version> - <scope>runtime</scope> + <exclusions> + <exclusion> + <groupId>org.apache.hive</groupId> + <artifactId>hive-iceberg-catalog</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-exec</artifactId> + <version>${project.version}</version> + <classifier>core</classifier> + </dependency> + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-iceberg-handler</artifactId> + <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.hive</groupId> + <artifactId>hive-exec</artifactId> + </exclusion> + </exclusions> </dependency> </dependencies> + </profile> + <profile> + <id>docker</id> <build> <plugins> <plugin> diff --git a/standalone-metastore/metastore-server/src/docker/README.md b/standalone-metastore/metastore-server/src/docker/README.md index 33498797b32..3eba41bfeef 100644 --- a/standalone-metastore/metastore-server/src/docker/README.md +++ b/standalone-metastore/metastore-server/src/docker/README.md @@ -51,7 +51,7 @@ The `build.sh` provides ways to build the image against specified version of the ##### Build from source ```shell -mvn clean install -DskipTests -Pdocker +mvn clean install -DskipTests -DallModules -Pdocker ``` ##### Build with specified version There are some arguments to specify the component version: diff --git a/standalone-metastore/metastore-server/src/docker/build.sh b/standalone-metastore/metastore-server/src/docker/build.sh index c4c790f5368..e0f9d4dc48d 100755 --- a/standalone-metastore/metastore-server/src/docker/build.sh +++ b/standalone-metastore/metastore-server/src/docker/build.sh @@ -66,7 +66,7 @@ mkdir -p "$CACHE_DIR" HADOOP_VERSION=${HADOOP_VERSION:-$(mvn -f "$SOURCE_DIR/pom.xml" -q help:evaluate -Dexpression=hadoop.version -DforceStdout)} HADOOP_FILE_NAME="hadoop-$HADOOP_VERSION.tar.gz" -HADOOP_URL=${HADOOP_URL:-"https://archive.apache.org/dist/hadoop/core/hadoop-$HADOOP_VERSION/$HADOOP_FILE_NAME"} +HADOOP_URL=${HADOOP_URL:-"https://downloads.apache.org/hadoop/core/hadoop-$HADOOP_VERSION/$HADOOP_FILE_NAME"} if [ ! -f "$CACHE_DIR/$HADOOP_FILE_NAME" ]; then echo "Downloading Hadoop from $HADOOP_URL..." if ! curl --fail -L "$HADOOP_URL" -o "$CACHE_DIR/$HADOOP_FILE_NAME.tmp"; then @@ -79,7 +79,7 @@ fi if [ -n "$HIVE_VERSION" ]; then HIVE_FILE_NAME="apache-hive-standalone-metastore-server-$HIVE_VERSION-bin.tar.gz" if [ ! -f "$CACHE_DIR/$HIVE_FILE_NAME" ]; then - HIVE_URL=${HIVE_URL:-"https://archive.apache.org/dist/hive/hive-standalone-metastore-server-$HIVE_VERSION/$HIVE_FILE_NAME"} + HIVE_URL=${HIVE_URL:-"https://downloads.apache.org/hive/hive-standalone-metastore-$HIVE_VERSION/$HIVE_FILE_NAME"} echo "Downloading Hive Metastore from $HIVE_URL..." if ! curl --fail -L "$HIVE_URL" -o "$CACHE_DIR/$HIVE_FILE_NAME.tmp"; then echo "Failed to download Hive Metastore, exiting..." @@ -91,7 +91,7 @@ if [ -n "$HIVE_VERSION" ]; then else HIVE_VERSION=$(mvn -f "$SOURCE_DIR/pom.xml" -q help:evaluate -Dexpression=project.version -DforceStdout) HIVE_TAR="$SOURCE_DIR/metastore-server/target/apache-hive-standalone-metastore-server-$HIVE_VERSION-bin.tar.gz" - if ls "$HIVE_TAR" || mvn -f "$SOURCE_DIR/pom.xml" clean package -DskipTests; then + if ls "$HIVE_TAR" || mvn -f "$SOURCE_DIR/metastore-server/pom.xml" clean package -DskipTests -DallModules; then cp "$HIVE_TAR" "$WORK_DIR/" else echo "Failed to compile Hive Metastore project, exiting..." diff --git a/standalone-metastore/metastore-server/src/docker/conf/metastore-site.xml b/standalone-metastore/metastore-server/src/docker/conf/metastore-site.xml index 2c629ba216c..bb2aec2a931 100644 --- a/standalone-metastore/metastore-server/src/docker/conf/metastore-site.xml +++ b/standalone-metastore/metastore-server/src/docker/conf/metastore-site.xml @@ -16,28 +16,20 @@ limitations under the License. --> <configuration> - <property> - <name>metastore.warehouse.dir</name> - <value>/opt/hive/data/warehouse</value> - </property> - <property> - <name>metastore.compactor.initiator.on</name> - <value>false</value> - </property> - <property> - <name>metastore.compactor.cleaner.on</name> - <value>false</value> - </property> - <property> - <name>metastore.event.db.notification.api.auth</name> - <value>false</value> - </property> - <property> - <name>metastore.catalog.servlet.port</name> - <value>9001</value> - </property> - <property> - <name>metastore.catalog.servlet.auth</name> - <value>none</value> - </property> + <property> + <name>metastore.warehouse.dir</name> + <value>/opt/hive/data/warehouse</value> + </property> + <property> + <name>metastore.event.db.notification.api.auth</name> + <value>false</value> + </property> + <property> + <name>metastore.catalog.servlet.port</name> + <value>9001</value> + </property> + <property> + <name>metastore.catalog.servlet.auth</name> + <value>none</value> + </property> </configuration> diff --git a/standalone-metastore/metastore-server/src/docker/docker-compose.yml b/standalone-metastore/metastore-server/src/docker/docker-compose.yml index 70611af1175..3440f7007ec 100644 --- a/standalone-metastore/metastore-server/src/docker/docker-compose.yml +++ b/standalone-metastore/metastore-server/src/docker/docker-compose.yml @@ -47,6 +47,7 @@ services: -Djavax.jdo.option.ConnectionUserName=hive -Djavax.jdo.option.ConnectionPassword=password' ports: + - '9001:9001' - '9083:9083' volumes: - warehouse:/opt/hive/data/warehouse