diff --git a/bin/hbase b/bin/hbase index 4eeb145a562..02944f9ee69 100755 --- a/bin/hbase +++ b/bin/hbase @@ -86,8 +86,7 @@ if [ $# = 0 ]; then echo " zookeeper run a Zookeeper server" echo " rest run an HBase REST server" echo " thrift run the HBase Thrift server" - echo " thrift2 run the HBase Thrift2 server" - echo " avro run an HBase Avro server" + echo " thrift2 run the HBase Thrift2 server" echo "" echo "PACKAGE MANAGEMENT" echo " classpath dump hbase CLASSPATH" @@ -313,11 +312,6 @@ elif [ "$COMMAND" = "rest" ] ; then if [ "$1" != "stop" ] ; then HBASE_OPTS="$HBASE_OPTS $HBASE_REST_OPTS" fi -elif [ "$COMMAND" = "avro" ] ; then - CLASS='org.apache.hadoop.hbase.avro.AvroServer' - if [ "$1" != "stop" ] ; then - HBASE_OPTS="$HBASE_OPTS $HBASE_AVRO_OPTS" - fi elif [ "$COMMAND" = "zookeeper" ] ; then CLASS='org.apache.hadoop.hbase.zookeeper.HQuorumPeer' if [ "$1" != "stop" ] ; then diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml index 54aa41b2558..768c25a4efd 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -57,24 +57,6 @@ - - org.apache.avro - avro-maven-plugin - ${avro.version} - - - generate-avro-sources - generate-sources - - schema - protocol - - - - - ${project.build.directory}/generated-sources/java - - @@ -252,20 +234,6 @@ - - - org.apache.avro - avro-maven-plugin - [1.5.3,) - - schema - protocol - - - - - - @@ -350,26 +318,6 @@ log4j log4j - - org.apache.avro - avro - ${avro.version} - - - com.thoughtworks.paranamer - paranamer - - - com.thoughtworks.paranamer - paranamer-ant - - - - - org.apache.avro - avro-ipc - ${avro.version} - org.apache.zookeeper zookeeper diff --git a/pom.xml b/pom.xml index 7a8a643d1ad..13903a6f297 100644 --- a/pom.xml +++ b/pom.xml @@ -360,7 +360,7 @@ ${skipJavadoc} true - org.apache.hadoop.hbase.protobuf.generated.*:org.apache.hadoop.hbase.avro.generated.*:org.apache.hadoop.hbase.thrift.generated:org.apache.hadoop.hbase.rest.generated + org.apache.hadoop.hbase.protobuf.generated.*:org.apache.hadoop.hbase.thrift.generated:org.apache.hadoop.hbase.rest.generated true 2g true @@ -481,11 +481,6 @@ - - org.apache.avro - avro-maven-plugin - ${avro.version} - org.codehaus.mojo build-helper-maven-plugin @@ -797,7 +792,6 @@ 2.0.0-alpha 1.0.3 - 1.5.3 1.2 1.4 3.1 @@ -1036,7 +1030,7 @@ servlet-api-2.5 ${jetty.jspapi.version} -