diff --git a/bin/hbase b/bin/hbase index 3c6e403..d55688b 100755 --- a/bin/hbase +++ b/bin/hbase @@ -156,8 +156,6 @@ add_maven_main_classes_to_classpath() { for module in `ls $HBASE_HOME | grep 'hbase-*'` do add_to_cp_if_exists "$HBASE_HOME/$module/target/classes" - # Add the root dir too. We need to do this so we can find hbase-webapps - #add_to_cp_if_exists "$HBASE_HOME/$module/target/" done } @@ -179,9 +177,10 @@ fi # For releases, add hbase & webapps to CLASSPATH # Webapps must come first else it messes up Jetty -if [ -d "$HBASE_HOME/hbase-server/src/main/resources/hbase-webapps" ]; then - add_to_cp_if_exists "$HBASE_HOME/hbase-server/" +if [ -d "$HBASE_HOME/hbase-webapps" ]; then + add_to_cp_if_exists "${HBASE_HOME}" fi +#add if we are in a dev environment if [ -d "$HBASE_HOME/hbase-server/target/hbase-webapps" ]; then add_to_cp_if_exists "${HBASE_HOME}/hbase-server/target" fi diff --git a/hbase-assembly/pom.xml b/hbase-assembly/pom.xml index 54f103c..ae4ea33 100644 --- a/hbase-assembly/pom.xml +++ b/hbase-assembly/pom.xml @@ -31,6 +31,7 @@ hbase-assembly HBase - Assembly Assembly all HBase modules into deployable packages + pom diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml index 18d63c7..dca9352 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -33,6 +33,33 @@ Main functionality for HBase + + + + + ${project.build.directory} + + hbase-webapps/** + + + + src/main/resources/ + + hbase-default.xml + + true + + + + + src/test/resources + + hbase-site.xml + + + + org.apache.avro @@ -133,20 +160,6 @@ run - - - process-resources - - - - - - - - run - - @@ -167,23 +180,6 @@ - - - add-test-resource - - add-test-resource - - - - - src/test/resources - - hbase-site.xml - - - - - diff --git a/hbase-server/src/main/resources/hbase-default.xml b/hbase-server/src/main/resources/hbase-default.xml index ffe8c91..370b06f 100644 --- a/hbase-server/src/main/resources/hbase-default.xml +++ b/hbase-server/src/main/resources/hbase-default.xml @@ -754,9 +754,9 @@ hbase.defaults.for.version - @@@VERSION@@@ + ${hbase.version} - This defaults file was compiled for version @@@VERSION@@@. This variable is used + This defaults file was compiled for version ${hbase.version}. This variable is used to make sure that a user doesn't have an old version of hbase-default.xml on the classpath. @@ -770,7 +770,7 @@ the other side of a maven generation; i.e. running in an ide. You'll want to set this boolean to true to avoid seeing the RuntimException complaint: "hbase-default.xml file - seems to be for and old version of HBase (@@@VERSION@@@), this + seems to be for and old version of HBase (\${hbase.version}), this version is X.X.X-SNAPSHOT" diff --git a/hbase-site/pom.xml b/hbase-site/pom.xml index d0c64ef..a012bd2 100644 --- a/hbase-site/pom.xml +++ b/hbase-site/pom.xml @@ -22,10 +22,11 @@ 4.0.0 - hbase - org.apache.hbase - 0.95-SNAPSHOT - + hbase + org.apache.hbase + 0.95-SNAPSHOT + + hbase-site pom diff --git a/pom.xml b/pom.xml index 46a0c17..ec39e5f 100644 --- a/pom.xml +++ b/pom.xml @@ -457,7 +457,11 @@ - + + + maven-surefire-report-plugin + ${surefire.version} + maven-clean-plugin @@ -471,10 +475,6 @@ - maven-surefire-report-plugin - ${surefire.version} - - org.codehaus.mojo findbugs-maven-plugin ${findbugs.version} @@ -509,6 +509,9 @@ maven-resources-plugin ${maven.resources.plugin.version} + + \ + @@ -618,24 +621,6 @@ - - - src/main/resources/ - - hbase-default.xml - - - - - - - src/test/resources - - hbase-site.xml - - - - @@ -661,6 +646,7 @@ ${maven.build.timestamp} 1.6 + ${project.version} 1.5.3