diff --git a/hbase-hadoop1-compat/pom.xml b/hbase-hadoop1-compat/pom.xml index fcddcf2..e5e0a17 100644 --- a/hbase-hadoop1-compat/pom.xml +++ b/hbase-hadoop1-compat/pom.xml @@ -1,103 +1,98 @@ - - 4.0.0 - - hbase - org.apache.hbase - 0.95-SNAPSHOT - .. - + + 4.0.0 + + hbase + org.apache.hbase + 0.95-SNAPSHOT + .. + + + hbase-hadoop1-compat + HBase - Hadoop One Compatibility + Interfaces to be implemented in order to smooth over hadoop version differences - - - - maven-surefire-plugin - - - - secondPartTestsExecution - test - - test - - - true - - - - - - - + + + + maven-surefire-plugin + + + + secondPartTestsExecution + test + + test + + + true + + + + + + - - - org.apache.hbase - hbase-hadoop-compat - - - org.apache.hadoop - hadoop-core - ${hadoop-one.version} - true - - - hsqldb - hsqldb - - - net.sf.kosmosfs - kfs - - - org.eclipse.jdt - core - - - net.java.dev.jets3t - jets3t - - - oro - oro - - - - - org.apache.hadoop - hadoop-test - ${hadoop-one.version} - true - test - - + + + org.apache.hbase + hbase-hadoop-compat + + + org.apache.hadoop + hadoop-core + true + + + hsqldb + hsqldb + + + net.sf.kosmosfs + kfs + + + org.eclipse.jdt + core + + + net.java.dev.jets3t + jets3t + + + oro + oro + + + + + org.apache.hadoop + hadoop-test + true + test + + diff --git a/hbase-hadoop2-compat/pom.xml b/hbase-hadoop2-compat/pom.xml index bed591c..ef59b72 100644 --- a/hbase-hadoop2-compat/pom.xml +++ b/hbase-hadoop2-compat/pom.xml @@ -1,105 +1,133 @@ - - 4.0.0 - - hbase - org.apache.hbase - 0.95-SNAPSHOT - .. - + + 4.0.0 + + hbase + org.apache.hbase + 0.95-SNAPSHOT + .. + + + hbase-hadoop2-compat + HBase - Hadoop Two Compatibility + Interfaces to be implemented in order to smooth over hadoop version differences - - - - maven-surefire-plugin - - - - secondPartTestsExecution - test - - test - - - true - - - - - - maven-dependency-plugin - - - create-mrapp-generated-classpath - generate-test-resources - - build-classpath - - - - - ${project.build.directory}/test-classes/mrapp-generated-classpath - - - - - - - - + + + + maven-surefire-plugin + + + + secondPartTestsExecution + test + + test + + + true + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.4 + + + create-mrapp-generated-classpath + generate-test-resources + + build-classpath + + + + + ${project.build.directory}/test-classes/mrapp-generated-classpath + + + + + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.apache.maven.plugins + maven-dependency-plugin + [2.4,) + + build-classpath + + + + + + + + + + + + + - - - org.apache.hbase - hbase-hadoop-compat - - - org.apache.hadoop - hadoop-client - ${hadoop-two.version} - - - org.apache.hadoop - hadoop-annotations - ${hadoop-two.version} - - - - org.apache.hadoop - hadoop-minicluster - ${hadoop-two.version} - - + + + org.apache.hbase + hbase-hadoop-compat + + + org.apache.hadoop + hadoop-client + ${hadoop-two.version} + + + org.apache.hadoop + hadoop-annotations + ${hadoop-two.version} + + + + org.apache.hadoop + hadoop-minicluster + ${hadoop-two.version} + + diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml index 850aa03..54aa41b 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -301,7 +301,6 @@ io.netty netty - 3.5.0.Final-SNAPSHOT com.yammer.metrics @@ -492,6 +491,12 @@ test + + + org.codehaus.jettison + jettison + test + diff --git a/pom.xml b/pom.xml index 215b986..341004a 100644 --- a/pom.xml +++ b/pom.xml @@ -826,6 +826,8 @@ 0.0.1-SNAPSHOT 2.6.3 2.3.1 + 1.3.1 + 3.5.0.Final-SNAPSHOT 2.3 1.6 @@ -900,6 +902,16 @@ + io.netty + netty + ${netty.version} + + + org.codehaus.jettison + jettison + ${jettison.version} + + com.yammer.metrics metrics-core ${metrics-core.version}