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

HBASE-7637 hbase-hadoop1-compat conflicts with -Dhadoop.profile=2.0 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1437803 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
eclark 2013-01-23 23:45:36 +00:00
parent c637f33c8c
commit a01797c761
3 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
bin/hbase
View File

@ -153,28 +153,8 @@ add_maven_deps_to_classpath() {
} }
add_maven_main_classes_to_classpath() {
# assumes all modules are named hbase-* in the top level directory
IFS=$ORIG_IFS
for module in `ls $HBASE_HOME | grep 'hbase-*'`
do
add_to_cp_if_exists "$HBASE_HOME/$module/target/classes"
done
}
add_maven_test_classes_to_classpath(){
# assumes all modules are named hbase-* in the top level directory
IFS=$ORIG_IFS
for module in `ls $HBASE_HOME | grep 'hbase-*'`
do
add_to_cp_if_exists "$HBASE_HOME/$module/target/test-classes"
done
}
#Add the development env class path stuff #Add the development env class path stuff
if $in_dev_env; then if $in_dev_env; then
add_maven_main_classes_to_classpath
add_maven_test_classes_to_classpath
add_maven_deps_to_classpath add_maven_deps_to_classpath
fi fi

2
hbase-it/pom.xml
View File

@ -102,7 +102,7 @@
<execution> <execution>
<!-- generates the file that will be used by the bin/hbase script in the dev env --> <!-- generates the file that will be used by the bin/hbase script in the dev env -->
<id>create-hbase-generated-classpath</id> <id>create-hbase-generated-classpath</id>
<phase>compile</phase> <phase>test</phase>
<goals> <goals>
<goal>build-classpath</goal> <goal>build-classpath</goal>
</goals> </goals>

9
pom.xml
View File

@ -52,8 +52,6 @@
<module>hbase-server</module> <module>hbase-server</module>
<module>hbase-protocol</module> <module>hbase-protocol</module>
<module>hbase-client</module> <module>hbase-client</module>
<module>hbase-hadoop2-compat</module>
<module>hbase-hadoop1-compat</module>
<module>hbase-hadoop-compat</module> <module>hbase-hadoop-compat</module>
<module>hbase-common</module> <module>hbase-common</module>
<module>hbase-it</module> <module>hbase-it</module>
@ -903,7 +901,6 @@
<it.test.jar>hbase-it-${project.version}-tests.jar</it.test.jar> <it.test.jar>hbase-it-${project.version}-tests.jar</it.test.jar>
<surefire.version>2.12-TRUNK-HBASE-2</surefire.version> <surefire.version>2.12-TRUNK-HBASE-2</surefire.version>
<surefire.provider>surefire-junit47</surefire.provider> <surefire.provider>surefire-junit47</surefire.provider>
<compat.module>hbase-hadoop1-compat</compat.module>
<!-- default: run small & medium, medium with 2 threads --> <!-- default: run small & medium, medium with 2 threads -->
<surefire.skipFirstPart>false</surefire.skipFirstPart> <surefire.skipFirstPart>false</surefire.skipFirstPart>
<surefire.skipSecondPart>false</surefire.skipSecondPart> <surefire.skipSecondPart>false</surefire.skipSecondPart>
@ -1362,6 +1359,9 @@
<name>!hadoop.profile</name> <name>!hadoop.profile</name>
</property> </property>
</activation> </activation>
<modules>
<module>hbase-hadoop1-compat</module>
</modules>
<properties> <properties>
<hadoop.version>${hadoop-one.version}</hadoop.version> <hadoop.version>${hadoop-one.version}</hadoop.version>
<slf4j.version>1.4.3</slf4j.version> <slf4j.version>1.4.3</slf4j.version>
@ -1418,6 +1418,9 @@
<value>2.0</value> <value>2.0</value>
</property> </property>
</activation> </activation>
<modules>
<module>hbase-hadoop2-compat</module>
</modules>
<properties> <properties>
<slf4j.version>1.6.1</slf4j.version> <slf4j.version>1.6.1</slf4j.version>
<hadoop.version>${hadoop-two.version}</hadoop.version> <hadoop.version>${hadoop-two.version}</hadoop.version>