From 3443f9a0082bbaec1d013f86807895fe3b34ffa8 Mon Sep 17 00:00:00 2001
From: David Lim <davidlim@apache.org>
Date: Mon, 10 Dec 2018 18:56:32 -0700
Subject: [PATCH] add missing contrib extensions to distribution packaging, fix
 influx package name, fix checkstyle plugin config to support Maven < 3.3.9
 (#6717)

---
 distribution/pom.xml                         | 14 +++++++++-----
 extensions-contrib/influx-extensions/pom.xml |  2 +-
 pom.xml                                      |  4 +++-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/distribution/pom.xml b/distribution/pom.xml
index 1f442b78b4ee..6169d736af24 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -279,9 +279,17 @@
                                         <argument>-c</argument>
                                         <argument>org.apache.druid.extensions.contrib:druid-google-extensions</argument>
                                         <argument>-c</argument>
+                                        <argument>org.apache.druid.extensions.contrib:graphite-emitter</argument>
+                                        <argument>-c</argument>
+                                        <argument>org.apache.druid.extensions.contrib:druid-influx-extensions</argument>
+                                        <argument>-c</argument>
                                         <argument>org.apache.druid.extensions.contrib:druid-kafka-eight-simple-consumer</argument>
                                         <argument>-c</argument>
-                                        <argument>org.apache.druid.extensions.contrib:graphite-emitter</argument>
+                                        <argument>org.apache.druid.extensions.contrib:kafka-emitter</argument>
+                                        <argument>-c</argument>
+                                        <argument>org.apache.druid.extensions.contrib:materialized-view-maintenance</argument>
+                                        <argument>-c</argument>
+                                        <argument>org.apache.druid.extensions.contrib:materialized-view-selection</argument>
                                         <argument>-c</argument>
                                         <argument>org.apache.druid.extensions.contrib:druid-opentsdb-emitter</argument>
                                         <argument>-c</argument>
@@ -300,10 +308,6 @@
                                         <argument>org.apache.druid.extensions.contrib:druid-time-min-max</argument>
                                         <argument>-c</argument>
                                         <argument>org.apache.druid.extensions.contrib:druid-virtual-columns</argument>
-                                        <argument>-c</argument>
-                                        <argument>org.apache.druid.extensions.contrib:materialized-view-maintenance</argument>
-                                        <argument>-c</argument>
-                                        <argument>org.apache.druid.extensions.contrib:materialized-view-selection</argument>
                                     </arguments>
                                 </configuration>
                             </execution>
diff --git a/extensions-contrib/influx-extensions/pom.xml b/extensions-contrib/influx-extensions/pom.xml
index bb9d0fdaab56..e966b40da3d6 100644
--- a/extensions-contrib/influx-extensions/pom.xml
+++ b/extensions-contrib/influx-extensions/pom.xml
@@ -22,7 +22,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.apache.druid.extensions</groupId>
+  <groupId>org.apache.druid.extensions.contrib</groupId>
   <artifactId>druid-influx-extensions</artifactId>
   <name>druid-influx-extensions</name>
   <description>druid-influx-extensions</description>
diff --git a/pom.xml b/pom.xml
index 46a1355d7287..ca2321486f5a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -881,7 +881,9 @@
                 <artifactId>maven-checkstyle-plugin</artifactId>
                 <version>3.0.0</version>
                 <configuration>
-                    <sourceDirectories>${project.build.sourceDirectory}</sourceDirectories>
+                    <sourceDirectories>
+                        <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+                    </sourceDirectories>
                     <includeTestSourceDirectory>true</includeTestSourceDirectory>
                     <configLocation>codestyle/checkstyle.xml</configLocation>
                     <suppressionsLocation>codestyle/checkstyle-suppressions.xml</suppressionsLocation>