From 182690a62ea1e348ca40eafeb68f873898ae97c2 Mon Sep 17 00:00:00 2001
From: Apekshit Sharma <appy@apache.org>
Date: Thu, 9 Nov 2017 14:36:03 -0800
Subject: [PATCH] HBASE-19089 Fix the list of included moduleSets in src and
 binary tars.

---
 hbase-assembly/pom.xml                        | 31 ++++++++++++-------
 .../src/main/assembly/components.xml          | 24 +++++++-------
 .../src/main/assembly/hadoop-two-compat.xml   | 16 +++++++---
 pom.xml                                       | 15 +++++++++
 4 files changed, 58 insertions(+), 28 deletions(-)

diff --git a/hbase-assembly/pom.xml b/hbase-assembly/pom.xml
index 8961b2e31d1..105fe8e7c78 100644
--- a/hbase-assembly/pom.xml
+++ b/hbase-assembly/pom.xml
@@ -207,47 +207,46 @@
     <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>
@@ -261,7 +260,18 @@
     <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>
@@ -276,7 +286,6 @@
         <dependency>
           <groupId>org.apache.hbase</groupId>
           <artifactId>hbase-rsgroup</artifactId>
-          <version>${project.version}</version>
         </dependency>
       </dependencies>
     </profile>
diff --git a/hbase-assembly/src/main/assembly/components.xml b/hbase-assembly/src/main/assembly/components.xml
index 42962f9e5ec..e6c45e0a425 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>
diff --git a/hbase-assembly/src/main/assembly/hadoop-two-compat.xml b/hbase-assembly/src/main/assembly/hadoop-two-compat.xml
index 820430f4c75..8d93ae7f58d 100644
--- a/hbase-assembly/src/main/assembly/hadoop-two-compat.xml
+++ b/hbase-assembly/src/main/assembly/hadoop-two-compat.xml
@@ -32,24 +32,30 @@
     <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-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-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>
diff --git a/pom.xml b/pom.xml
index 23301ab431b..8562686d783 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1477,6 +1477,11 @@
         <type>test-jar</type>
         <!--Was test scope only but if we want to run hbase-it tests, need the annotations test jar-->
       </dependency>
+      <dependency>
+        <groupId>org.apache.hbase</groupId>
+        <artifactId>hbase-backup</artifactId>
+        <version>${project.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.hbase</groupId>
         <artifactId>hbase-common</artifactId>
@@ -1668,6 +1673,16 @@
         <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>
       <!-- General dependencies -->
       <dependency>
         <groupId>com.github.stephenc.findbugs</groupId>