Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-19089 Fix the list of included moduleSets in src and binary tars.

This commit is contained in:
Apekshit Sharma 2017-11-09 14:36:03 -08:00
parent 6938ac274a
commit 182690a62e
4 changed files with 58 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
hbase-assembly/pom.xml
View File

@ -207,47 +207,46 @@
<dependency> <dependency>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.hbase</groupId>
<artifactId>${compat.module}</artifactId> <artifactId>${compat.module}</artifactId>
<version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.hbase</groupId>
<artifactId>hbase-shell</artifactId> <artifactId>hbase-shell</artifactId>
<version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.hbase</groupId>
<artifactId>hbase-thrift</artifactId> <artifactId>hbase-thrift</artifactId>
<version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.hbase</groupId>
<artifactId>hbase-rest</artifactId> <artifactId>hbase-rest</artifactId>
<version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.hbase</groupId>
<artifactId>hbase-external-blockcache</artifactId> <artifactId>hbase-external-blockcache</artifactId>
<version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.hbase</groupId>
<artifactId>hbase-testing-util</artifactId> <artifactId>hbase-testing-util</artifactId>
<version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.hbase</groupId>
<artifactId>hbase-metrics-api</artifactId> <artifactId>hbase-metrics-api</artifactId>
<version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.hbase</groupId>
<artifactId>hbase-metrics</artifactId> <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>
<dependency> <dependency>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.hbase</groupId>
<artifactId>hbase-resource-bundle</artifactId> <artifactId>hbase-resource-bundle</artifactId>
<version>${project.version}</version>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
@ -261,7 +260,18 @@
<dependency> <dependency>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.hbase</groupId>
<artifactId>hbase-backup</artifactId> <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> </dependency>
</dependencies> </dependencies>
<profiles> <profiles>
@ -276,7 +286,6 @@
<dependency> <dependency>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.hbase</groupId>
<artifactId>hbase-rsgroup</artifactId> <artifactId>hbase-rsgroup</artifactId>
<version>${project.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
</profile> </profile>

24
hbase-assembly/src/main/assembly/components.xml
View File

@ -19,12 +19,12 @@
*/ */
--> -->
<!--Shared. Does common copying--> <!-- Filesets shared by different binary tars. -->
<component> <component>
<fileSets> <fileSets>
<!--Copy over the site if built as docs dir --> <!--Copy over the site if built as docs dir -->
<fileSet> <fileSet>
<directory>${project.basedir}/../target/site</directory> <directory>${project.basedir}/../target/site</directory>
<outputDirectory>docs</outputDirectory> <outputDirectory>docs</outputDirectory>
</fileSet> </fileSet>
<!-- Include top level text files--> <!-- Include top level text files-->
@ -50,7 +50,7 @@
<directory>${project.basedir}/../bin</directory> <directory>${project.basedir}/../bin</directory>
<outputDirectory>bin</outputDirectory> <outputDirectory>bin</outputDirectory>
<excludes> <excludes>
<exclude>**/*.cmd</exclude> <exclude>**/*.cmd</exclude>
</excludes> </excludes>
<fileMode>0755</fileMode> <fileMode>0755</fileMode>
<directoryMode>0755</directoryMode> <directoryMode>0755</directoryMode>
@ -60,19 +60,19 @@
<directory>${project.basedir}/../bin</directory> <directory>${project.basedir}/../bin</directory>
<outputDirectory>bin</outputDirectory> <outputDirectory>bin</outputDirectory>
<includes> <includes>
<include>**/*.cmd</include> <include>**/*.cmd</include>
</includes> </includes>
</fileSet> </fileSet>
<!-- Move the ruby code over --> <!-- Move the ruby code over -->
<fileSet> <fileSet>
<directory>${project.basedir}/../hbase-shell/src/main/ruby</directory> <directory>${project.basedir}/../hbase-shell/src/main/ruby</directory>
<outputDirectory>lib/ruby</outputDirectory> <outputDirectory>lib/ruby</outputDirectory>
<fileMode>0644</fileMode> <fileMode>0644</fileMode>
<directoryMode>0755</directoryMode> <directoryMode>0755</directoryMode>
</fileSet> </fileSet>
<!-- Move the webapps to the webapp dir --> <!-- Move the webapps to the webapp dir -->
<fileSet> <fileSet>
<directory>${project.basedir}/../hbase-server/target/hbase-webapps</directory> <directory>${project.basedir}/../hbase-server/target/hbase-webapps</directory>
<outputDirectory>hbase-webapps</outputDirectory> <outputDirectory>hbase-webapps</outputDirectory>
<fileMode>0644</fileMode> <fileMode>0644</fileMode>
<directoryMode>0755</directoryMode> <directoryMode>0755</directoryMode>
@ -91,8 +91,8 @@
</fileSet> </fileSet>
<!-- Include native libraries --> <!-- Include native libraries -->
<fileSet> <fileSet>
<directory>${project.basedir}/../hbase-server/target/native</directory> <directory>${project.basedir}/../hbase-server/target/native</directory>
<outputDirectory>lib/native</outputDirectory> <outputDirectory>lib/native</outputDirectory>
<fileMode>0755</fileMode> <fileMode>0755</fileMode>
<directoryMode>0755</directoryMode> <directoryMode>0755</directoryMode>
<includes> <includes>
@ -107,7 +107,7 @@
have 1 submodule to accumulate, but we can copy/paste as necessary until maven is have 1 submodule to accumulate, but we can copy/paste as necessary until maven is
fixed. --> fixed. -->
<fileSet> <fileSet>
<directory>${project.basedir}/../hbase-server/target/</directory> <directory>${project.basedir}/../hbase-server/target/</directory>
<outputDirectory>lib</outputDirectory> <outputDirectory>lib</outputDirectory>
<includes> <includes>
<include>${server.test.jar}</include> <include>${server.test.jar}</include>
@ -115,7 +115,7 @@
<fileMode>0644</fileMode> <fileMode>0644</fileMode>
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>${project.basedir}/../hbase-it/target/</directory> <directory>${project.basedir}/../hbase-it/target/</directory>
<outputDirectory>lib</outputDirectory> <outputDirectory>lib</outputDirectory>
<includes> <includes>
<include>${it.test.jar}</include> <include>${it.test.jar}</include>
@ -123,7 +123,7 @@
<fileMode>0644</fileMode> <fileMode>0644</fileMode>
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>${project.basedir}/../hbase-annotations/target/</directory> <directory>${project.basedir}/../hbase-annotations/target/</directory>
<outputDirectory>lib</outputDirectory> <outputDirectory>lib</outputDirectory>
<includes> <includes>
<include>${annotations.test.jar}</include> <include>${annotations.test.jar}</include>
@ -131,7 +131,7 @@
<fileMode>0644</fileMode> <fileMode>0644</fileMode>
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>${project.basedir}/../hbase-common/target/</directory> <directory>${project.basedir}/../hbase-common/target/</directory>
<outputDirectory>lib</outputDirectory> <outputDirectory>lib</outputDirectory>
<includes> <includes>
<include>${common.test.jar}</include> <include>${common.test.jar}</include>

16
hbase-assembly/src/main/assembly/hadoop-two-compat.xml
View File

@ -32,24 +32,30 @@
<moduleSet> <moduleSet>
<useAllReactorProjects>true</useAllReactorProjects> <useAllReactorProjects>true</useAllReactorProjects>
<includes> <includes>
<!-- Keep this list sorted by name -->
<include>org.apache.hbase:hbase-annotations</include> <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-client</include>
<include>org.apache.hbase:hbase-common</include> <include>org.apache.hbase:hbase-common</include>
<include>org.apache.hbase:hbase-examples</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-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-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-procedure</include>
<include>org.apache.hbase:hbase-protocol</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-rest</include>
<include>org.apache.hbase:hbase-rsgroup</include> <include>org.apache.hbase:hbase-rsgroup</include>
<include>org.apache.hbase:hbase-server</include> <include>org.apache.hbase:hbase-server</include>
<include>org.apache.hbase:hbase-shell</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-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> </includes>
<!-- Binaries for the dependencies also go in the hbase-jars directory --> <!-- Binaries for the dependencies also go in the hbase-jars directory -->
<binaries> <binaries>

15
pom.xml
View File

@ -1477,6 +1477,11 @@
<type>test-jar</type> <type>test-jar</type>
<!--Was test scope only but if we want to run hbase-it tests, need the annotations test jar--> <!--Was test scope only but if we want to run hbase-it tests, need the annotations test jar-->
</dependency> </dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-backup</artifactId>
<version>${project.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.hbase</groupId>
<artifactId>hbase-common</artifactId> <artifactId>hbase-common</artifactId>
@ -1668,6 +1673,16 @@
<type>test-jar</type> <type>test-jar</type>
<scope>test</scope> <scope>test</scope>
</dependency> </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 --> <!-- General dependencies -->
<dependency> <dependency>
<groupId>com.github.stephenc.findbugs</groupId> <groupId>com.github.stephenc.findbugs</groupId>