From 53886a677c63e1c9c4b85db00ae43b5c1d3492ef Mon Sep 17 00:00:00 2001
From: Fangjin Yang <fangjinyang@gmail.com>
Date: Mon, 13 Jun 2016 04:28:21 -0700
Subject: [PATCH] include avro in the druid tarball (#3123)

---
 distribution/pom.xml | 18 ++++++++++++------
 pom.xml              | 20 ++++++++++----------
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/distribution/pom.xml b/distribution/pom.xml
index 310018f4a62..775cc96d0c7 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -59,7 +59,9 @@
                                 <classpath/>
                                 <argument>-Ddruid.extensions.loadList=[]</argument>
                                 <argument>-Ddruid.extensions.directory=${project.build.directory}/extensions</argument>
-                                <argument>-Ddruid.extensions.hadoopDependenciesDir=${project.build.directory}/hadoop-dependencies</argument>
+                                <argument>
+                                    -Ddruid.extensions.hadoopDependenciesDir=${project.build.directory}/hadoop-dependencies
+                                </argument>
                                 <argument>io.druid.cli.Main</argument>
                                 <argument>tools</argument>
                                 <argument>pull-deps</argument>
@@ -69,6 +71,8 @@
                                 <argument>-l</argument>
                                 <argument>${settings.localRepository}</argument>
                                 <argument>-c</argument>
+                                <argument>io.druid.extensions:druid-avro-extensions</argument>
+                                <argument>-c</argument>
                                 <argument>io.druid.extensions:druid-examples</argument>
                                 <argument>-c</argument>
                                 <argument>io.druid.extensions:druid-datasketches</argument>
@@ -83,13 +87,13 @@
                                 <argument>-c</argument>
                                 <argument>io.druid.extensions:druid-kafka-indexing-service</argument>
                                 <argument>-c</argument>
-                                <argument>io.druid.extensions:mysql-metadata-storage</argument>
-                                <argument>-c</argument>
                                 <argument>io.druid.extensions:druid-lookups-cached-global</argument>
                                 <argument>-c</argument>
-                                <argument>io.druid.extensions:postgresql-metadata-storage</argument>
-                                <argument>-c</argument>
                                 <argument>io.druid.extensions:druid-s3-extensions</argument>
+                                <argument>-c</argument>
+                                <argument>io.druid.extensions:mysql-metadata-storage</argument>
+                                <argument>-c</argument>
+                                <argument>io.druid.extensions:postgresql-metadata-storage</argument>
                             </arguments>
                         </configuration>
                     </execution>
@@ -105,7 +109,9 @@
                                 <argument>-C</argument>
                                 <argument>${project.build.directory}/extensions</argument>
                                 <argument>-czvf</argument>
-                                <argument>${project.build.directory}/mysql-metadata-storage-${project.parent.version}.tar.gz</argument>
+                                <argument>
+                                    ${project.build.directory}/mysql-metadata-storage-${project.parent.version}.tar.gz
+                                </argument>
                                 <argument>mysql-metadata-storage</argument>
                             </arguments>
                         </configuration>
diff --git a/pom.xml b/pom.xml
index ae9bb6e340f..a82d6c4872b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -103,7 +103,7 @@
         <module>extensions-contrib/rabbitmq</module>
         <module>extensions-contrib/distinctcount</module>
         <module>extensions-contrib/parquet-extensions</module>
-	<module>extensions-contrib/statsd-emitter</module>
+        <module>extensions-contrib/statsd-emitter</module>
 
         <!-- distribution packaging -->
         <module>distribution</module>
@@ -211,20 +211,20 @@
                         <artifactId>slf4j-api</artifactId>
                     </exclusion>
                 </exclusions>
-              </dependency>
+            </dependency>
             <dependency>
                 <groupId>org.apache.zookeeper</groupId>
                 <artifactId>zookeeper</artifactId>
                 <version>3.4.8</version>
                 <exclusions>
-                  <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-log4j12</artifactId>
-                  </exclusion>
-                  <exclusion>
-                    <groupId>log4j</groupId>
-                    <artifactId>log4j</artifactId>
-                  </exclusion>
+                    <exclusion>
+                        <groupId>org.slf4j</groupId>
+                        <artifactId>slf4j-log4j12</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>log4j</groupId>
+                        <artifactId>log4j</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>