Repository: hbase Updated Branches: refs/heads/master ead8f9364 -> 8a179ead5
HBASE-19089 Fix the list of included moduleSets in src and binary tars. Change-Id: I2c4c3fab111fdc311c730c857bb09739dae5585b Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/8a179ead Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/8a179ead Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/8a179ead Branch: refs/heads/master Commit: 8a179ead500719bde013ae8aefab7e5f1b27c700 Parents: ead8f93 Author: Apekshit Sharma <[email protected]> Authored: Wed Oct 25 14:08:19 2017 -0700 Committer: Apekshit Sharma <[email protected]> Committed: Thu Nov 9 14:22:49 2017 -0800 ---------------------------------------------------------------------- hbase-assembly/pom.xml | 32 ++++++++++++-------- hbase-assembly/src/main/assembly/components.xml | 24 +++++++-------- .../src/main/assembly/hadoop-two-compat.xml | 20 ++++++++---- pom.xml | 27 +++++++++++++++++ 4 files changed, 73 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/8a179ead/hbase-assembly/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-assembly/pom.xml b/hbase-assembly/pom.xml index 18b63b5..473f0d3 100644 --- a/hbase-assembly/pom.xml +++ b/hbase-assembly/pom.xml @@ -223,53 +223,51 @@ <dependency> <groupId>org.apache.hbase</groupId> <artifactId>${compat.module}</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-shell</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-thrift</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-rest</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-external-blockcache</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-testing-util</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-metrics-api</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-metrics</artifactId> - <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-protocol</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-protocol-shaded</artifactId> </dependency> <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-resource-bundle</artifactId> - <version>${project.version}</version> <optional>true</optional> </dependency> <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-spark</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> @@ -282,13 +280,23 @@ <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-spark-it</artifactId> - <version>${project.version}</version> <type>test-jar</type> </dependency> <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-backup</artifactId> - <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-replication</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-http</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-examples</artifactId> </dependency> </dependencies> <profiles> http://git-wip-us.apache.org/repos/asf/hbase/blob/8a179ead/hbase-assembly/src/main/assembly/components.xml ---------------------------------------------------------------------- diff --git a/hbase-assembly/src/main/assembly/components.xml b/hbase-assembly/src/main/assembly/components.xml index 42962f9..e6c45e0 100644 --- a/hbase-assembly/src/main/assembly/components.xml +++ b/hbase-assembly/src/main/assembly/components.xml @@ -19,12 +19,12 @@ */ --> -<!--Shared. Does common copying--> +<!-- Filesets shared by different binary tars. --> <component> <fileSets> <!--Copy over the site if built as docs dir --> <fileSet> - <directory>${project.basedir}/../target/site</directory> + <directory>${project.basedir}/../target/site</directory> <outputDirectory>docs</outputDirectory> </fileSet> <!-- Include top level text files--> @@ -50,7 +50,7 @@ <directory>${project.basedir}/../bin</directory> <outputDirectory>bin</outputDirectory> <excludes> - <exclude>**/*.cmd</exclude> + <exclude>**/*.cmd</exclude> </excludes> <fileMode>0755</fileMode> <directoryMode>0755</directoryMode> @@ -60,19 +60,19 @@ <directory>${project.basedir}/../bin</directory> <outputDirectory>bin</outputDirectory> <includes> - <include>**/*.cmd</include> + <include>**/*.cmd</include> </includes> </fileSet> <!-- Move the ruby code over --> <fileSet> - <directory>${project.basedir}/../hbase-shell/src/main/ruby</directory> + <directory>${project.basedir}/../hbase-shell/src/main/ruby</directory> <outputDirectory>lib/ruby</outputDirectory> <fileMode>0644</fileMode> <directoryMode>0755</directoryMode> </fileSet> <!-- Move the webapps to the webapp dir --> <fileSet> - <directory>${project.basedir}/../hbase-server/target/hbase-webapps</directory> + <directory>${project.basedir}/../hbase-server/target/hbase-webapps</directory> <outputDirectory>hbase-webapps</outputDirectory> <fileMode>0644</fileMode> <directoryMode>0755</directoryMode> @@ -91,8 +91,8 @@ </fileSet> <!-- Include native libraries --> <fileSet> - <directory>${project.basedir}/../hbase-server/target/native</directory> - <outputDirectory>lib/native</outputDirectory> + <directory>${project.basedir}/../hbase-server/target/native</directory> + <outputDirectory>lib/native</outputDirectory> <fileMode>0755</fileMode> <directoryMode>0755</directoryMode> <includes> @@ -107,7 +107,7 @@ have 1 submodule to accumulate, but we can copy/paste as necessary until maven is fixed. --> <fileSet> - <directory>${project.basedir}/../hbase-server/target/</directory> + <directory>${project.basedir}/../hbase-server/target/</directory> <outputDirectory>lib</outputDirectory> <includes> <include>${server.test.jar}</include> @@ -115,7 +115,7 @@ <fileMode>0644</fileMode> </fileSet> <fileSet> - <directory>${project.basedir}/../hbase-it/target/</directory> + <directory>${project.basedir}/../hbase-it/target/</directory> <outputDirectory>lib</outputDirectory> <includes> <include>${it.test.jar}</include> @@ -123,7 +123,7 @@ <fileMode>0644</fileMode> </fileSet> <fileSet> - <directory>${project.basedir}/../hbase-annotations/target/</directory> + <directory>${project.basedir}/../hbase-annotations/target/</directory> <outputDirectory>lib</outputDirectory> <includes> <include>${annotations.test.jar}</include> @@ -131,7 +131,7 @@ <fileMode>0644</fileMode> </fileSet> <fileSet> - <directory>${project.basedir}/../hbase-common/target/</directory> + <directory>${project.basedir}/../hbase-common/target/</directory> <outputDirectory>lib</outputDirectory> <includes> <include>${common.test.jar}</include> http://git-wip-us.apache.org/repos/asf/hbase/blob/8a179ead/hbase-assembly/src/main/assembly/hadoop-two-compat.xml ---------------------------------------------------------------------- diff --git a/hbase-assembly/src/main/assembly/hadoop-two-compat.xml b/hbase-assembly/src/main/assembly/hadoop-two-compat.xml index a66237b..03951bd 100644 --- a/hbase-assembly/src/main/assembly/hadoop-two-compat.xml +++ b/hbase-assembly/src/main/assembly/hadoop-two-compat.xml @@ -26,31 +26,39 @@ <format>tar.gz</format> </formats> <componentDescriptors> - <componentDescriptor>src/main/assembly/components.xml</componentDescriptor> + <componentDescriptor>src/main/assembly/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-backup</include> <include>org.apache.hbase:hbase-client</include> <include>org.apache.hbase:hbase-common</include> + <include>org.apache.hbase:hbase-endpoint</include> <include>org.apache.hbase:hbase-examples</include> - <include>org.apache.hbase:hbase-hadoop2-compat</include> + <include>org.apache.hbase:hbase-external-blockcache</include> <include>org.apache.hbase:hbase-hadoop-compat</include> + <include>org.apache.hbase:hbase-hadoop2-compat</include> + <include>org.apache.hbase:hbase-http</include> <include>org.apache.hbase:hbase-it</include> - <include>org.apache.hbase:hbase-prefix-tree</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-replication</include> <include>org.apache.hbase:hbase-rest</include> <include>org.apache.hbase:hbase-rsgroup</include> <include>org.apache.hbase:hbase-server</include> <include>org.apache.hbase:hbase-shell</include> <include>org.apache.hbase:hbase-spark</include> + <include>org.apache.hbase:hbase-spark-it</include> + <include>org.apache.hbase:hbase-testing-util</include> <include>org.apache.hbase:hbase-thrift</include> - <include>org.apache.hbase:hbase-external-blockcache</include> - <include>org.apache.hbase:hbase-backup</include> - <include>org.apache.hbase:hbase-mapreduce</include> </includes> <!-- Binaries for the dependencies also go in the hbase-jars directory --> <binaries> http://git-wip-us.apache.org/repos/asf/hbase/blob/8a179ead/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 8672d8b..132dd62 100755 --- a/pom.xml +++ b/pom.xml @@ -1566,6 +1566,11 @@ <!--Was test scope only but if we want to run hbase-it tests, need the annotations test jar--> </dependency> <dependency> + <artifactId>hbase-backup</artifactId> + <groupId>org.apache.hbase</groupId> + <version>${project.version}</version> + </dependency> + <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-error-prone</artifactId> <version>${project.version}</version> @@ -1761,6 +1766,28 @@ <type>test-jar</type> <scope>test</scope> </dependency> + <dependency> + <artifactId>hbase-rest</artifactId> + <groupId>org.apache.hbase</groupId> + <version>${project.version}</version> + </dependency> + <dependency> + <artifactId>hbase-resource-bundle</artifactId> + <groupId>org.apache.hbase</groupId> + <version>${project.version}</version> + </dependency> + <dependency> + <artifactId>hbase-spark</artifactId> + <groupId>org.apache.hbase</groupId> + <version>${project.version}</version> + </dependency> + <dependency> + <artifactId>hbase-spark-it</artifactId> + <groupId>org.apache.hbase</groupId> + <version>${project.version}</version> + <type>test-jar</type> + <scope>test</scope> + </dependency> <!-- General dependencies --> <dependency> <groupId>com.github.stephenc.findbugs</groupId>
