You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by bu...@apache.org on 2018/06/12 17:53:20 UTC
[11/11] hbase git commit: HBASE-19735 Create a client-tarball assembly
HBASE-19735 Create a client-tarball assembly
Provides an extra client descriptor to build a second
tarball with a reduced set of dependencies. Not of great
impact now, but will build the way for better in the future.
Signed-off-by: Sean Busbey <bu...@apache.org>
Conflicts:
hbase-assembly/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/5f831142
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/5f831142
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/5f831142
Branch: refs/heads/HBASE-20331
Commit: 5f831142b1515549864d3e9b64af1f3be3c31c31
Parents: 44fedb0
Author: Josh Elser <el...@apache.org>
Authored: Wed Feb 7 18:37:39 2018 -0500
Committer: Sean Busbey <bu...@apache.org>
Committed: Tue Jun 12 12:52:42 2018 -0500
----------------------------------------------------------------------
hbase-assembly/pom.xml | 33 +++--
.../src/main/assembly/client-components.xml | 92 +++++++++++++
hbase-assembly/src/main/assembly/client.xml | 137 +++++++++++++++++++
hbase-procedure/pom.xml | 4 +-
hbase-spark/pom.xml | 6 +
pom.xml | 10 ++
6 files changed, 268 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/5f831142/hbase-assembly/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-assembly/pom.xml b/hbase-assembly/pom.xml
index 5da105b..4fa859a 100644
--- a/hbase-assembly/pom.xml
+++ b/hbase-assembly/pom.xml
@@ -95,6 +95,7 @@
<tarLongFileMode>gnu</tarLongFileMode>
<descriptors>
<descriptor>${assembly.file}</descriptor>
+ <descriptor>src/main/assembly/client.xml</descriptor>
</descriptors>
</configuration>
</plugin>
@@ -220,22 +221,22 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-hadoop-compat</artifactId>
- <exclusions>
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-hadoop-compat</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>${compat.module}</artifactId>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>${compat.module}</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-shell</artifactId>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-shell</artifactId>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
@@ -315,6 +316,14 @@
<groupId>jline</groupId>
<artifactId>jline</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-shaded-client</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-shaded-mapreduce</artifactId>
+ </dependency>
</dependencies>
<profiles>
<profile>
http://git-wip-us.apache.org/repos/asf/hbase/blob/5f831142/hbase-assembly/src/main/assembly/client-components.xml
----------------------------------------------------------------------
diff --git a/hbase-assembly/src/main/assembly/client-components.xml b/hbase-assembly/src/main/assembly/client-components.xml
new file mode 100644
index 0000000..2fd1b57
--- /dev/null
+++ b/hbase-assembly/src/main/assembly/client-components.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+
+<!-- Filesets shared by different binary tars. -->
+<component>
+ <fileSets>
+ <!--Copy over the site if built as docs dir -->
+ <fileSet>
+ <directory>${project.basedir}/../target/site</directory>
+ <outputDirectory>docs</outputDirectory>
+ </fileSet>
+ <!-- Include top level text files-->
+ <fileSet>
+ <directory>${project.basedir}/..</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>CHANGES.txt</include>
+ <include>README.txt</include>
+ </includes>
+ <fileMode>0644</fileMode>
+ </fileSet>
+ <!-- Include the top level conf directory -->
+ <fileSet>
+ <directory>${project.basedir}/../conf</directory>
+ <outputDirectory>conf</outputDirectory>
+ <fileMode>0644</fileMode>
+ <directoryMode>0755</directoryMode>
+ </fileSet>
+ <!-- Include top level bin directory -->
+ <!-- First copy all but the *.cmd files-->
+ <fileSet>
+ <directory>${project.basedir}/../bin</directory>
+ <outputDirectory>bin</outputDirectory>
+ <includes>
+ <include>get-active-master.rb</include>
+ <include>hbase</include>
+ <include>hbase-common.sh</include>
+ <include>hbase-config.sh</include>
+ <include>hbase-jruby</include>
+ <include>hirb.rb</include>
+ <include></include>
+ </includes>
+ <fileMode>0755</fileMode>
+ <directoryMode>0755</directoryMode>
+ </fileSet>
+ <!--Now do the cmd files; we do not want these executable.-->
+ <fileSet>
+ <directory>${project.basedir}/../bin</directory>
+ <outputDirectory>bin</outputDirectory>
+ <includes>
+ <include>hbase.cmd</include>
+ <include>hbase-config.cmd</include>
+ </includes>
+ </fileSet>
+ <!-- Move the ruby code over -->
+ <fileSet>
+ <directory>${project.basedir}/../hbase-shell/src/main/ruby</directory>
+ <outputDirectory>lib/ruby</outputDirectory>
+ <fileMode>0644</fileMode>
+ <directoryMode>0755</directoryMode>
+ </fileSet>
+ <!-- Include native libraries -->
+ <fileSet>
+ <directory>${project.basedir}/../hbase-server/target/native</directory>
+ <outputDirectory>lib/native</outputDirectory>
+ <fileMode>0755</fileMode>
+ <directoryMode>0755</directoryMode>
+ <includes>
+ <include>*.so</include>
+ <include>*.dylib</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</component>
http://git-wip-us.apache.org/repos/asf/hbase/blob/5f831142/hbase-assembly/src/main/assembly/client.xml
----------------------------------------------------------------------
diff --git a/hbase-assembly/src/main/assembly/client.xml b/hbase-assembly/src/main/assembly/client.xml
new file mode 100644
index 0000000..7951961
--- /dev/null
+++ b/hbase-assembly/src/main/assembly/client.xml
@@ -0,0 +1,137 @@
+<?xml version="1.0"?>
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/xsd/assembly-1.1.1.xsd">
+<!--
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+
+ <!--This 'all' id is not appended to the produced bundle because we do this: http://maven.apache.org/plugins/maven-assembly-plugin/faq.html#required-classifiers -->
+ <id>client-bin</id>
+ <formats>
+ <format>tar.gz</format>
+ </formats>
+ <!-- Override the root directory in the tarball -->
+ <baseDirectory>hbase-${project.version}-client</baseDirectory>
+ <componentDescriptors>
+ <componentDescriptor>src/main/assembly/client-components.xml</componentDescriptor>
+ </componentDescriptors>
+ <moduleSets>
+ <moduleSet>
+ <useAllReactorProjects>true</useAllReactorProjects>
+ <includes>
+ <!-- Keep this list sorted by name -->
+ <include>org.apache.hbase:hbase-annotations</include>
+ <include>org.apache.hbase:hbase-client</include>
+ <include>org.apache.hbase:hbase-common</include>
+ <include>org.apache.hbase:hbase-hadoop-compat</include>
+ <include>org.apache.hbase:hbase-hadoop2-compat</include>
+ <include>org.apache.hbase:hbase-mapreduce</include>
+ <include>org.apache.hbase:hbase-metrics</include>
+ <include>org.apache.hbase:hbase-metrics-api</include>
+ <include>org.apache.hbase:hbase-procedure</include>
+ <include>org.apache.hbase:hbase-protocol</include>
+ <include>org.apache.hbase:hbase-protocol-shaded</include>
+ <include>org.apache.hbase:hbase-server</include>
+ <include>org.apache.hbase:hbase-zookeeper</include>
+ </includes>
+ <!-- Binaries for the dependencies also go in the hbase-jars directory -->
+ <binaries>
+ <outputDirectory>lib</outputDirectory>
+ <unpack>false</unpack>
+ <dependencySets>
+ <!-- Exclude jruby-complete from hbase_home/lib -->
+ <dependencySet>
+ <excludes>
+ <exclude>com.sun.jersey:*</exclude>
+ <exclude>com.sun.jersey.contribs:*</exclude>
+ <!-- Exclude jars which typical clients don't need -->
+ <exclude>org.apache.hbase:hbase-external-blockcache</exclude>
+ <exclude>org.apache.hbase:hbase-http</exclude>
+ <exclude>org.apache.hbase:hbase-replication</exclude>
+ <exclude>org.apache.hbase:hbase-rest</exclude>
+ <exclude>org.apache.hbase:hbase-rsgroup</exclude>
+ <exclude>org.apache.hbase:hbase-shaded-client</exclude>
+ <exclude>org.apache.hbase:hbase-shaded-mapreduce</exclude>
+ <!-- At present, hbase-shell doesn't actually contain
+ any Java code we need to include. Ruby files are
+ copied elsewhere in this descriptor. -->
+ <exclude>org.apache.hbase:hbase-shell</exclude>
+ <exclude>org.apache.hbase:hbase-thrift</exclude>
+ <exclude>org.jruby:jruby-complete</exclude>
+ </excludes>
+ </dependencySet>
+ </dependencySets>
+ </binaries>
+ </moduleSet>
+ <moduleSet>
+ <useAllReactorProjects>true</useAllReactorProjects>
+ <includes>
+ <include>org.apache.hbase:hbase-shaded-client</include>
+ <include>org.apache.hbase:hbase-shaded-mapreduce</include>
+ </includes>
+ <!-- Binaries for the dependencies also go in the hbase-jars directory -->
+ <binaries>
+ <outputDirectory>shaded-lib</outputDirectory>
+ <unpack>false</unpack>
+ <dependencySets>
+ <dependencySet>
+ <includes>
+ <!-- Keep this list sorted by name -->
+ <include>org.apache.hbase:hbase-shaded-client</include>
+ <include>org.apache.hbase:hbase-shaded-mapreduce</include>
+ </includes>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ </dependencySet>
+ </dependencySets>
+ </binaries>
+ </moduleSet>
+ </moduleSets>
+ <!-- Include the generated LICENSE and NOTICE files -->
+ <files>
+ <file>
+ <source>${project.build.directory}/maven-shared-archive-resources/META-INF/LICENSE</source>
+ <outputDirectory>.</outputDirectory>
+ <destName>LICENSE.txt</destName>
+ <lineEnding>unix</lineEnding>
+ </file>
+ <file>
+ <source>${project.build.directory}/NOTICE.aggregate</source>
+ <outputDirectory>.</outputDirectory>
+ <destName>NOTICE.txt</destName>
+ <lineEnding>unix</lineEnding>
+ </file>
+ <file>
+ <source>${basedir}/src/main/resources/META-INF/LEGAL</source>
+ <outputDirectory>.</outputDirectory>
+ <destName>LEGAL</destName>
+ <lineEnding>unix</lineEnding>
+ </file>
+ </files>
+
+ <!-- Add jruby-complete to hbase_home/lib/ruby.
+ Update JRUBY_PACKAGED_WITH_HBASE in bin/hbase and hbase.cmd if you would like to update outputDirectory below -->
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>lib/ruby</outputDirectory>
+ <includes>
+ <include>org.jruby:jruby-complete</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+
+</assembly>
http://git-wip-us.apache.org/repos/asf/hbase/blob/5f831142/hbase-procedure/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-procedure/pom.xml b/hbase-procedure/pom.xml
index 3fedda8..b89acdb 100644
--- a/hbase-procedure/pom.xml
+++ b/hbase-procedure/pom.xml
@@ -57,8 +57,8 @@
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-common</artifactId>
- <version>${project.version}</version>
- <classifier>tests</classifier>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
http://git-wip-us.apache.org/repos/asf/hbase/blob/5f831142/hbase-spark/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-spark/pom.xml b/hbase-spark/pom.xml
index 7654be4..a5f96b4 100644
--- a/hbase-spark/pom.xml
+++ b/hbase-spark/pom.xml
@@ -238,6 +238,12 @@
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-common</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
<artifactId>hbase-annotations</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
http://git-wip-us.apache.org/repos/asf/hbase/blob/5f831142/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a943125..b9a1b77 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1853,6 +1853,16 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-shaded-client</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-shaded-mapreduce</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<!-- General dependencies -->
<dependency>
<groupId>com.github.stephenc.findbugs</groupId>