From 0748fc99f3a157c2b89eb5b20c7f548a4a0a42db Mon Sep 17 00:00:00 2001 From: Alexander Kolbasov Date: Wed, 29 Aug 2018 12:10:44 -0700 Subject: [PATCH 1/1] HIVE-20451: Metastore client and server tarball issues --- standalone-metastore/metastore-common/pom.xml | 36 +++---- .../metastore-common/src/assembly/bin.xml | 108 --------------------- .../metastore-common/src/assembly/src.xml | 53 ---------- standalone-metastore/metastore-server/pom.xml | 4 +- .../metastore-server/src/assembly/src.xml | 53 ---------- standalone-metastore/metastore-tools/pom.xml | 16 +++ standalone-metastore/pom.xml | 32 +++++- standalone-metastore/src/assembly/src.xml | 84 ++++++++++++++++ 8 files changed, 146 insertions(+), 240 deletions(-) delete mode 100644 standalone-metastore/metastore-common/src/assembly/bin.xml delete mode 100644 standalone-metastore/metastore-common/src/assembly/src.xml delete mode 100644 standalone-metastore/metastore-server/src/assembly/src.xml create mode 100644 standalone-metastore/src/assembly/src.xml diff --git a/standalone-metastore/metastore-common/pom.xml b/standalone-metastore/metastore-common/pom.xml index 334adf8447..b05d43414e 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 @@ -618,6 +596,20 @@ ${basedir}/src/main/java + + + org.apache.maven.plugins + maven-assembly-plugin + + + assemble + none + + single + + + + diff --git a/standalone-metastore/metastore-common/src/assembly/bin.xml b/standalone-metastore/metastore-common/src/assembly/bin.xml deleted file mode 100644 index 5992a484cf..0000000000 --- a/standalone-metastore/metastore-common/src/assembly/bin.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - - bin - - - dir - tar.gz - - - apache-hive-metastore-${project.version}-bin - - - - lib - false - true - true - true - - org.apache.hadoop:* - org.slf4j:* - log4j:* - - - - - - - ${project.basedir} - - target/** - .classpath - .project - .settings/** - lib/** - - - - README.txt - LICENSE - NOTICE - - / - - - - ${project.basedir}/binary-package-licenses - - /* - - - /README - - binary-package-licenses - - - - ${project.basedir}/src/gen/thrift/gen-php - - **/* - - lib/php/packages/hive_metastore - - - - ${project.basedir}/src/gen/thrift/gen-py/hive_metastore - 755 - - **/* - - lib/py/hive_metastore - - - - ${project.basedir}/src/main/resources/ - 644 - - metastore-log4j2.properties - - conf - - - - - - diff --git a/standalone-metastore/metastore-common/src/assembly/src.xml b/standalone-metastore/metastore-common/src/assembly/src.xml deleted file mode 100644 index a2405443ea..0000000000 --- a/standalone-metastore/metastore-common/src/assembly/src.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - src - - - tar.gz - - - apache-hive-metastore-${project.version}-src - - - - ${project.basedir} - - - target/** - - - - .checkstyle - .gitattributes - .gitignore - LICENSE - NOTICE - pom.xml - src/**/* - - / - - - diff --git a/standalone-metastore/metastore-server/pom.xml b/standalone-metastore/metastore-server/pom.xml index 14ea9cecbc..02446415ad 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-${project.artifactId}-${project.version} src/assembly/bin.xml - src/assembly/src.xml gnu diff --git a/standalone-metastore/metastore-server/src/assembly/src.xml b/standalone-metastore/metastore-server/src/assembly/src.xml deleted file mode 100644 index a2405443ea..0000000000 --- a/standalone-metastore/metastore-server/src/assembly/src.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - src - - - tar.gz - - - apache-hive-metastore-${project.version}-src - - - - ${project.basedir} - - - target/** - - - - .checkstyle - .gitattributes - .gitignore - LICENSE - NOTICE - pom.xml - src/**/* - - / - - - diff --git a/standalone-metastore/metastore-tools/pom.xml b/standalone-metastore/metastore-tools/pom.xml index dd721cb080..5b2af629cf 100644 --- a/standalone-metastore/metastore-tools/pom.xml +++ b/standalone-metastore/metastore-tools/pom.xml @@ -125,6 +125,22 @@ + + + + org.apache.maven.plugins + maven-assembly-plugin + + + assemble + none + + single + + + + + diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml index 83f5a9ec8d..4ff92b3aa5 100644 --- a/standalone-metastore/pom.xml +++ b/standalone-metastore/pom.xml @@ -43,7 +43,7 @@ 1.8 false ${settings.localRepository} - 2.3 + 3.1.0 1.6.0 @@ -315,6 +315,11 @@ + + org.apache.maven.plugins + maven-assembly-plugin + ${maven.assembly.plugin.version} + org.apache.rat apache-rat-plugin @@ -350,6 +355,31 @@ + + + org.apache.maven.plugins + maven-assembly-plugin + + + assemble + package + + single + + + apache-${project.artifactId}-${project.version} + + tar.gz + + + src/assembly/src.xml + + gnu + + + + + diff --git a/standalone-metastore/src/assembly/src.xml b/standalone-metastore/src/assembly/src.xml new file mode 100644 index 0000000000..5485eb7fb7 --- /dev/null +++ b/standalone-metastore/src/assembly/src.xml @@ -0,0 +1,84 @@ + + + + + src + + + tar.gz + + + apache-${project.artifactId}-${project.version}-src + + + + ${project.basedir} + + DEV-README + README* + LICENSE* + NOTICE* + pom.xml + + true + + + ${project.basedir} + true + + **/*.log + **/*.iml + **/${project.build.directory}/** + + + + + -- 2.16.3