You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ec...@apache.org on 2013/01/24 00:45:37 UTC
svn commit: r1437803 - in /hbase/trunk: bin/hbase hbase-it/pom.xml pom.xml
Author: eclark
Date: Wed Jan 23 23:45:36 2013
New Revision: 1437803
URL: http://svn.apache.org/viewvc?rev=1437803&view=rev
Log:
HBASE-7637 hbase-hadoop1-compat conflicts with -Dhadoop.profile=2.0
Modified:
hbase/trunk/bin/hbase
hbase/trunk/hbase-it/pom.xml
hbase/trunk/pom.xml
Modified: hbase/trunk/bin/hbase
URL: http://svn.apache.org/viewvc/hbase/trunk/bin/hbase?rev=1437803&r1=1437802&r2=1437803&view=diff
==============================================================================
--- hbase/trunk/bin/hbase (original)
+++ hbase/trunk/bin/hbase Wed Jan 23 23:45:36 2013
@@ -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
if $in_dev_env; then
- add_maven_main_classes_to_classpath
- add_maven_test_classes_to_classpath
add_maven_deps_to_classpath
fi
Modified: hbase/trunk/hbase-it/pom.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-it/pom.xml?rev=1437803&r1=1437802&r2=1437803&view=diff
==============================================================================
--- hbase/trunk/hbase-it/pom.xml (original)
+++ hbase/trunk/hbase-it/pom.xml Wed Jan 23 23:45:36 2013
@@ -102,7 +102,7 @@
<execution>
<!-- generates the file that will be used by the bin/hbase script in the dev env -->
<id>create-hbase-generated-classpath</id>
- <phase>compile</phase>
+ <phase>test</phase>
<goals>
<goal>build-classpath</goal>
</goals>
Modified: hbase/trunk/pom.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/pom.xml?rev=1437803&r1=1437802&r2=1437803&view=diff
==============================================================================
--- hbase/trunk/pom.xml (original)
+++ hbase/trunk/pom.xml Wed Jan 23 23:45:36 2013
@@ -52,8 +52,6 @@
<module>hbase-server</module>
<module>hbase-protocol</module>
<module>hbase-client</module>
- <module>hbase-hadoop2-compat</module>
- <module>hbase-hadoop1-compat</module>
<module>hbase-hadoop-compat</module>
<module>hbase-common</module>
<module>hbase-it</module>
@@ -903,7 +901,6 @@
<it.test.jar>hbase-it-${project.version}-tests.jar</it.test.jar>
<surefire.version>2.12-TRUNK-HBASE-2</surefire.version>
<surefire.provider>surefire-junit47</surefire.provider>
- <compat.module>hbase-hadoop1-compat</compat.module>
<!-- default: run small & medium, medium with 2 threads -->
<surefire.skipFirstPart>false</surefire.skipFirstPart>
<surefire.skipSecondPart>false</surefire.skipSecondPart>
@@ -1362,6 +1359,9 @@
<name>!hadoop.profile</name>
</property>
</activation>
+ <modules>
+ <module>hbase-hadoop1-compat</module>
+ </modules>
<properties>
<hadoop.version>${hadoop-one.version}</hadoop.version>
<slf4j.version>1.4.3</slf4j.version>
@@ -1418,6 +1418,9 @@
<value>2.0</value>
</property>
</activation>
+ <modules>
+ <module>hbase-hadoop2-compat</module>
+ </modules>
<properties>
<slf4j.version>1.6.1</slf4j.version>
<hadoop.version>${hadoop-two.version}</hadoop.version>