WIP

apache · Aug 24, 2023 · 0afcadd · 0afcadd
1 parent 61cfd90
commit 0afcadd
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 69 deletions.
diff --git a/contrib/pom.xml b/contrib/pom.xml
@@ -40,39 +40,42 @@
 
   <modules>
     <module>data</module>
-    <module>udfs</module>
-    <module>storage-hbase</module>
-    <module>format-maprdb</module>
-    <module>format-syslog</module>
-    <module>format-ltsv</module>
+    <module>format-access</module>
+    <module>format-deltalake</module>
+    <module>format-esri</module>
     <module>format-excel</module>
+    <module>format-hdf5</module>
     <module>format-httpd</module>
-    <module>format-esri</module>
+    <module>format-iceberg</module>
+    <module>format-image</module>
     <module>format-log</module>
-    <module>format-access</module>
+    <module>format-ltsv</module>
+    <module>format-pcapng</module>
     <module>format-pdf</module>
-    <module>format-hdf5</module>
     <module>format-sas</module>
     <module>format-spss</module>
+    <module>format-syslog</module>
     <module>format-xml</module>
-    <module>format-image</module>
-    <module>format-pcapng</module>
-    <module>format-iceberg</module>
-    <module>format-deltalake</module>
+    <module>storage-cassandra</module>
     <module>storage-drill</module>
-    <module>storage-phoenix</module>
+    <module>storage-druid</module>
+    <module>storage-elasticsearch</module>
     <module>storage-googlesheets</module>
+    <module>storage-hbase</module>
     <module>storage-hive</module>
-    <module>storage-mongo</module>
+    <module>storage-http</module>
     <module>storage-jdbc</module>
     <module>storage-kafka</module>
     <module>storage-kudu</module>
+    <module>storage-mongo</module>
     <module>storage-opentsdb</module>
+    <module>storage-phoenix</module>
     <module>storage-splunk</module>
-    <module>storage-http</module>
-    <module>storage-druid</module>
-    <module>storage-elasticsearch</module>
-    <module>storage-cassandra</module>
+    <module>udfs</module>
+
+    <!-- Modules that are no longer supported
+    <module>format-maprdb</module>
+    -->
   </modules>
 
 </project>
diff --git a/contrib/storage-hive/core/pom.xml b/contrib/storage-hive/core/pom.xml
@@ -354,11 +354,6 @@
         </plugins>
       </build>
       <dependencies>
-        <dependency>
-          <groupId>org.apache.drill.contrib</groupId>
-          <artifactId>drill-format-mapr</artifactId>
-          <version>${project.version}</version>
-        </dependency>
         <dependency>
           <groupId>com.tdunning</groupId>
           <artifactId>json</artifactId>

diff --git a/distribution/pom.xml b/distribution/pom.xml
@@ -453,17 +453,6 @@
           <artifactId>drill-format-esri</artifactId>
           <version>${project.version}</version>
         </dependency>
-        <!--
-         drill-format-mapr is intentionally excluded from distribution for the default profile
-         to avoid adding mapr-specific jars into jars/3rdparty folder and inflation of the target jar.
-         For more details please see DRILL-7213 and DRILL-6929.
-
-         <dependency>
-           <groupId>org.apache.drill.contrib</groupId>
-           <artifactId>drill-format-mapr</artifactId>
-           <version>${project.version}</version>
-         </dependency>
-         -->
         <dependency>
           <groupId>org.apache.drill.contrib</groupId>
           <artifactId>drill-format-excel</artifactId>
@@ -499,6 +488,14 @@
           <artifactId>drill-storage</artifactId>
           <version>${project.version}</version>
         </dependency>
+
+        <!-- Modules that are no longer supported
+        <dependency>
+          <groupId>org.apache.drill.contrib</groupId>
+          <artifactId>drill-format-mapr</artifactId>
+          <version>${project.version}</version>
+        </dependency>
+         -->
       </dependencies>
     </profile>
 

diff --git a/distribution/src/assemble/component.xml b/distribution/src/assemble/component.xml
@@ -25,53 +25,56 @@
     <dependencySet>
       <!-- Now, select which projects to include in this module-set. -->
       <includes>
-        <include>org.apache.drill.exec:drill-jdbc:jar</include>
-        <include>org.apache.drill:drill-protocol:jar</include>
-        <include>org.apache.drill:drill-common:jar</include>
-        <include>org.apache.drill:drill-logical:jar</include>
-        <include>org.apache.drill.exec:vector:jar</include>
-        <include>org.apache.drill.memory:drill-memory-base:jar</include>
-        <include>org.apache.drill.exec:drill-rpc:jar</include>
-        <include>org.apache.drill.exec:drill-java-exec:jar</include>
-        <include>org.apache.drill.metastore:drill-metastore-api:jar</include>
-        <include>org.apache.drill.metastore:drill-iceberg-metastore:jar</include>
-        <include>org.apache.drill.metastore:drill-rdbms-metastore:jar</include>
-        <include>org.apache.drill.metastore:drill-mongo-metastore:jar</include>
-        <include>org.apache.drill.contrib.storage-hive:drill-storage-hive-core:jar</include>
-        <include>org.apache.drill.contrib.storage-hive:drill-hive-exec-shaded:jar</include>
         <include>org.apache.drill.contrib.data:tpch-sample-data:jar</include>
-        <include>org.apache.drill.contrib:drill-mongo-storage:jar</include>
-        <include>org.apache.drill.contrib:drill-storage-hbase:jar</include>
-        <include>org.apache.drill.contrib:drill-format-mapr:jar</include>
-        <include>org.apache.drill.contrib:drill-format-syslog:jar</include>
+        <include>org.apache.drill.contrib:drill-deltalake-format:jar</include>
+        <include>org.apache.drill.contrib:drill-druid-storage:jar</include>
         <include>org.apache.drill.contrib:drill-format-esri:jar</include>
-        <include>org.apache.drill.contrib:drill-format-xml:jar</include>
-        <include>org.apache.drill.contrib:drill-format-image:jar</include>
-        <include>org.apache.drill.contrib:drill-format-pcapng:jar</include>
+        <include>org.apache.drill.contrib:drill-format-excel:jar</include>
         <include>org.apache.drill.contrib:drill-format-hdf5:jar</include>
+        <include>org.apache.drill.contrib:drill-format-httpd:jar</include>
+        <include>org.apache.drill.contrib:drill-format-image:jar</include>
         <include>org.apache.drill.contrib:drill-format-log:jar</include>
         <include>org.apache.drill.contrib:drill-format-ltsv:jar</include>
-        <include>org.apache.drill.contrib:drill-format-httpd:jar</include>
-        <include>org.apache.drill.contrib:drill-format-pdf:jar</include>
-        <include>org.apache.drill.contrib:drill-format-excel:jar</include>
         <include>org.apache.drill.contrib:drill-format-msaccess:jar</include>
-        <include>org.apache.drill.contrib:drill-format-spss:jar</include>
+        <include>org.apache.drill.contrib:drill-format-pcapng:jar</include>
+        <include>org.apache.drill.contrib:drill-format-pdf:jar</include>
         <include>org.apache.drill.contrib:drill-format-sas:jar</include>
+        <include>org.apache.drill.contrib:drill-format-spss:jar</include>
+        <include>org.apache.drill.contrib:drill-format-syslog:jar</include>
+        <include>org.apache.drill.contrib:drill-format-xml:jar</include>
+        <include>org.apache.drill.contrib:drill-iceberg-format:jar</include>
         <include>org.apache.drill.contrib:drill-jdbc-storage:jar</include>
         <include>org.apache.drill.contrib:drill-kudu-storage:jar</include>
-        <include>org.apache.drill.contrib:drill-storage-phoenix:jar</include>
-        <include>org.apache.drill.contrib:drill-storage-splunk:jar</include>
-        <include>org.apache.drill.contrib:drill-storage-googlesheets:jar</include>
-        <include>org.apache.drill.contrib:drill-storage-kafka:jar</include>
-        <include>org.apache.drill.contrib:drill-storage-elasticsearch:jar</include>
+        <include>org.apache.drill.contrib:drill-mongo-storage:jar</include>
+        <include>org.apache.drill.contrib:drill-opentsdb-storage:jar</include>
         <include>org.apache.drill.contrib:drill-storage-cassandra:jar</include>
+        <include>org.apache.drill.contrib:drill-storage-elasticsearch:jar</include>
+        <include>org.apache.drill.contrib:drill-storage-googlesheets:jar</include>
+        <include>org.apache.drill.contrib:drill-storage-hbase:jar</include>
         <include>org.apache.drill.contrib:drill-storage-http:jar</include>
-        <include>org.apache.drill.contrib:drill-opentsdb-storage:jar</include>
-        <include>org.apache.drill.contrib:drill-udfs:jar</include>
-        <include>org.apache.drill.contrib:drill-druid-storage:jar</include>
-        <include>org.apache.drill.contrib:drill-iceberg-format:jar</include>
-        <include>org.apache.drill.contrib:drill-deltalake-format:jar</include>
         <include>org.apache.drill.contrib:drill-storage:jar</include>
+        <include>org.apache.drill.contrib:drill-storage-kafka:jar</include>
+        <include>org.apache.drill.contrib:drill-storage-phoenix:jar</include>
+        <include>org.apache.drill.contrib:drill-storage-splunk:jar</include>
+        <include>org.apache.drill.contrib:drill-udfs:jar</include>
+        <include>org.apache.drill.contrib.storage-hive:drill-hive-exec-shaded:jar</include>
+        <include>org.apache.drill.contrib.storage-hive:drill-storage-hive-core:jar</include>
+        <include>org.apache.drill:drill-common:jar</include>
+        <include>org.apache.drill:drill-logical:jar</include>
+        <include>org.apache.drill:drill-protocol:jar</include>
+        <include>org.apache.drill.exec:drill-java-exec:jar</include>
+        <include>org.apache.drill.exec:drill-jdbc:jar</include>
+        <include>org.apache.drill.exec:drill-rpc:jar</include>
+        <include>org.apache.drill.exec:vector:jar</include>
+        <include>org.apache.drill.memory:drill-memory-base:jar</include>
+        <include>org.apache.drill.metastore:drill-iceberg-metastore:jar</include>
+        <include>org.apache.drill.metastore:drill-metastore-api:jar</include>
+        <include>org.apache.drill.metastore:drill-mongo-metastore:jar</include>
+        <include>org.apache.drill.metastore:drill-rdbms-metastore:jar</include>
+
+        <!-- Modules that are no longer supported
+        <include>org.apache.drill.contrib:drill-format-mapr:jar</include>
+        -->
       </includes>
       <outputDirectory>jars</outputDirectory>
       <useProjectArtifact>false</useProjectArtifact>