From 4a13e7a76be6b184fafe3539f4e2cd46cf547e60 Mon Sep 17 00:00:00 2001 From: Alexander Kolbasov Date: Fri, 24 Aug 2018 16:45:55 -0700 Subject: [PATCH 1/1] HIVE-20451: Metastore client and server tarball issues --- standalone-metastore/metastore-common/pom.xml | 22 ------ standalone-metastore/metastore-server/pom.xml | 4 +- standalone-metastore/pom.xml | 27 +++++++ .../src/assembly/bin.xml => src/assembly/src.xml} | 88 +++++++++------------- 4 files changed, 63 insertions(+), 78 deletions(-) rename standalone-metastore/{metastore-common/src/assembly/bin.xml => src/assembly/src.xml} (50%) diff --git a/standalone-metastore/metastore-common/pom.xml b/standalone-metastore/metastore-common/pom.xml index b0d9eee927..616d91da26 100644 --- a/standalone-metastore/metastore-common/pom.xml +++ b/standalone-metastore/metastore-common/pom.xml @@ -444,28 +444,6 @@ - - org.apache.maven.plugins - maven-assembly-plugin - ${maven.assembly.plugin.version} - - - assemble - package - - single - - - apache-hive-metastore-${project.version} - - src/assembly/bin.xml - src/assembly/src.xml - - gnu - - - - org.apache.maven.plugins maven-enforcer-plugin diff --git a/standalone-metastore/metastore-server/pom.xml b/standalone-metastore/metastore-server/pom.xml index f2c10b08cf..8ee91a753c 100644 --- a/standalone-metastore/metastore-server/pom.xml +++ b/standalone-metastore/metastore-server/pom.xml @@ -457,7 +457,6 @@ org.apache.maven.plugins maven-assembly-plugin - ${maven.assembly.plugin.version} assemble @@ -466,10 +465,9 @@ single - apache-hive-metastore-${project.version} + apache-hive-metastore--server-${project.version} src/assembly/bin.xml - src/assembly/src.xml gnu diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml index 99bf437e4c..98fdd64355 100644 --- a/standalone-metastore/pom.xml +++ b/standalone-metastore/pom.xml @@ -306,6 +306,11 @@ + + org.apache.maven.plugins + maven-assembly-plugin + ${maven.assembly.plugin.version} + org.apache.rat apache-rat-plugin @@ -333,6 +338,28 @@ + + + org.apache.maven.plugins + maven-assembly-plugin + + + assemble + package + + single + + + apache-hive-metastore-${project.version} + + src/assembly/src.xml + + gnu + + + + + diff --git a/standalone-metastore/metastore-common/src/assembly/bin.xml b/standalone-metastore/src/assembly/src.xml similarity index 50% rename from standalone-metastore/metastore-common/src/assembly/bin.xml rename to standalone-metastore/src/assembly/src.xml index 5992a484cf..79ec9b3623 100644 --- a/standalone-metastore/metastore-common/src/assembly/bin.xml +++ b/standalone-metastore/src/assembly/src.xml @@ -22,87 +22,69 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> - bin + src - dir tar.gz - apache-hive-metastore-${project.version}-bin - - - - lib - false - true - true - true - - org.apache.hadoop:* - org.slf4j:* - log4j:* - - - + apache-hive-metastore-${project.version}-src ${project.basedir} + target/** - .classpath - .project - .settings/** - lib/** + true + - README.txt + .checkstyle + .gitattributes + .gitignore LICENSE NOTICE + DEV-README + pom.xml + src/**/* / - - ${project.basedir}/binary-package-licenses - - /* - + ${project.basedir}/metastore-common - /README + target/** - binary-package-licenses - - - - ${project.basedir}/src/gen/thrift/gen-php + true - **/* - - lib/php/packages/hive_metastore - - - - ${project.basedir}/src/gen/thrift/gen-py/hive_metastore - 755 - - **/* + .checkstyle + .gitattributes + .gitignore + LICENSE + NOTICE + pom.xml + src/**/* - lib/py/hive_metastore + metastore-common/ - - ${project.basedir}/src/main/resources/ - 644 + ${project.basedir}/metastore-server + + target/** + + true - metastore-log4j2.properties + .checkstyle + .gitattributes + .gitignore + LICENSE + NOTICE + pom.xml + src/**/* - conf + metastore-server/ - - - -- 2.16.3