You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2012/08/18 02:31:55 UTC
svn commit: r1374484 - in /hbase/trunk: bin/hbase hbase-server/pom.xml
pom.xml
Author: stack
Date: Sat Aug 18 00:31:55 2012
New Revision: 1374484
URL: http://svn.apache.org/viewvc?rev=1374484&view=rev
Log:
HBASE-6553 Remove Avro Gateway
Modified:
hbase/trunk/bin/hbase
hbase/trunk/hbase-server/pom.xml
hbase/trunk/pom.xml
Modified: hbase/trunk/bin/hbase
URL: http://svn.apache.org/viewvc/hbase/trunk/bin/hbase?rev=1374484&r1=1374483&r2=1374484&view=diff
==============================================================================
--- hbase/trunk/bin/hbase (original)
+++ hbase/trunk/bin/hbase Sat Aug 18 00:31:55 2012
@@ -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
Modified: hbase/trunk/hbase-server/pom.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/pom.xml?rev=1374484&r1=1374483&r2=1374484&view=diff
==============================================================================
--- hbase/trunk/hbase-server/pom.xml (original)
+++ hbase/trunk/hbase-server/pom.xml Sat Aug 18 00:31:55 2012
@@ -57,24 +57,6 @@
</testResource>
</testResources>
<plugins>
- <plugin>
- <groupId>org.apache.avro</groupId>
- <artifactId>avro-maven-plugin</artifactId>
- <version>${avro.version}</version>
- <executions>
- <execution>
- <id>generate-avro-sources</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>schema</goal>
- <goal>protocol</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <outputDirectory>${project.build.directory}/generated-sources/java</outputDirectory>
- </configuration>
- </plugin>
<!-- Run with -Dmaven.test.skip.exec=true to build -tests.jar without running
tests (this is needed for upstream projects whose tests need this jar simply for
compilation) -->
@@ -252,20 +234,6 @@
<ignore/>
</action>
</pluginExecution>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.avro</groupId>
- <artifactId>avro-maven-plugin</artifactId>
- <versionRange>[1.5.3,)</versionRange>
- <goals>
- <goal>schema</goal>
- <goal>protocol</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore/>
- </action>
- </pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
@@ -351,26 +319,6 @@
<artifactId>log4j</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.avro</groupId>
- <artifactId>avro</artifactId>
- <version>${avro.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.thoughtworks.paranamer</groupId>
- <artifactId>paranamer</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.thoughtworks.paranamer</groupId>
- <artifactId>paranamer-ant</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.avro</groupId>
- <artifactId>avro-ipc</artifactId>
- <version>${avro.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
</dependency>
Modified: hbase/trunk/pom.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/pom.xml?rev=1374484&r1=1374483&r2=1374484&view=diff
==============================================================================
--- hbase/trunk/pom.xml (original)
+++ hbase/trunk/pom.xml Sat Aug 18 00:31:55 2012
@@ -360,7 +360,7 @@
<!--Pass -DskipJavadoc=true or -DskipJavadoc on command-line to skip javadoc building-->
<skip>${skipJavadoc}</skip>
<docfilessubdirs>true</docfilessubdirs>
- <excludePackageNames>org.apache.hadoop.hbase.protobuf.generated.*:org.apache.hadoop.hbase.avro.generated.*:org.apache.hadoop.hbase.thrift.generated:org.apache.hadoop.hbase.rest.generated</excludePackageNames>
+ <excludePackageNames>org.apache.hadoop.hbase.protobuf.generated.*:org.apache.hadoop.hbase.thrift.generated:org.apache.hadoop.hbase.rest.generated</excludePackageNames>
<debug>true</debug>
<maxmemory>2g</maxmemory>
<verbose>true</verbose>
@@ -482,11 +482,6 @@
</plugin>
<!-- Build plugins -->
<plugin>
- <groupId>org.apache.avro</groupId>
- <artifactId>avro-maven-plugin</artifactId>
- <version>${avro.version}</version>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.5</version>
@@ -797,7 +792,6 @@
<!-- Dependencies -->
<hadoop-two.version>2.0.0-alpha</hadoop-two.version>
<hadoop-one.version>1.0.3</hadoop-one.version>
- <avro.version>1.5.3</avro.version>
<commons-cli.version>1.2</commons-cli.version>
<commons-codec.version>1.4</commons-codec.version>
<commons-httpclient.version>3.1</commons-httpclient.version>
@@ -1036,7 +1030,7 @@
<artifactId>servlet-api-2.5</artifactId>
<version>${jetty.jspapi.version}</version>
</dependency>
- <!-- While jackson is also a dependency of both jersey and avro, these
+ <!-- While jackson is also a dependency of jersey it
can bring in jars from different, incompatible versions. We force
the same version with these dependencies -->
<dependency>