diff --git a/common/src/main/java/org/apache/drill/common/config/DrillProperties.java b/common/src/main/java/org/apache/drill/common/config/DrillProperties.java
index 2ba886da982..7aedb298576 100644
--- a/common/src/main/java/org/apache/drill/common/config/DrillProperties.java
+++ b/common/src/main/java/org/apache/drill/common/config/DrillProperties.java
@@ -85,10 +85,13 @@ public final class DrillProperties extends Properties {
   public static final String TLS_HANDSHAKE_TIMEOUT = "TLSHandshakeTimeout";
   public static final String TLS_PROVIDER = "TLSProvider";
   public static final String USE_SYSTEM_TRUSTSTORE = "useSystemTrustStore";
-  public static final String USE_MAPR_SSL_CONFIG = "useMapRSSLConfig";
-
   public static final String QUERY_TAGS = "queryTags";
 
+  // Properties that are no longer supported.
+  /*
+  public static final String USE_MAPR_SSL_CONFIG = "useMapRSSLConfig";
+  */
+
   // Although all properties from the application are sent to the server (from the client), the following
   // sets of properties are used by the client and server respectively. These are reserved words.
 
diff --git a/contrib/pom.xml b/contrib/pom.xml
index b4ee5326b35..95670faf856 100644
--- a/contrib/pom.xml
+++ b/contrib/pom.xml
@@ -40,39 +40,43 @@
 
   <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-hbase/pom.xml b/contrib/storage-hbase/pom.xml
index c1edbb177ef..352b791b858 100644
--- a/contrib/storage-hbase/pom.xml
+++ b/contrib/storage-hbase/pom.xml
@@ -259,6 +259,8 @@
       </dependencies>
     </profile>
 
+    <!-- Profiles that are no longer supported. -->
+    <!--
     <profile>
       <id>mapr</id>
       <properties>
@@ -313,5 +315,6 @@
         </dependency>
       </dependencies>
     </profile>
+    -->
   </profiles>
 </project>
diff --git a/contrib/storage-hive/core/pom.xml b/contrib/storage-hive/core/pom.xml
index 57f17d8689e..1a6e1ae2be6 100644
--- a/contrib/storage-hive/core/pom.xml
+++ b/contrib/storage-hive/core/pom.xml
@@ -322,6 +322,8 @@
     </plugins>
   </build>
   <profiles>
+    <!-- Profiles that are no longer supported. -->
+    <!--
     <profile>
       <id>mapr</id>
       <properties>
@@ -350,11 +352,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>
@@ -370,5 +367,6 @@
         </dependency>
       </dependencies>
     </profile>
+    -->
   </profiles>
 </project>
diff --git a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveStoragePlugin.java b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveStoragePlugin.java
index 2bd58563e79..997d0e39cb0 100644
--- a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveStoragePlugin.java
+++ b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveStoragePlugin.java
@@ -36,8 +36,6 @@
 import org.apache.drill.common.exceptions.DrillRuntimeException;
 import org.apache.drill.common.exceptions.ExecutionSetupException;
 import org.apache.drill.common.expression.SchemaPath;
-import org.apache.drill.common.logical.FormatPluginConfig;
-import org.apache.drill.common.logical.StoragePluginConfig;
 import org.apache.drill.exec.ExecConstants;
 import org.apache.drill.exec.ops.OptimizerRulesContext;
 import org.apache.drill.exec.physical.base.AbstractGroupScan;
@@ -50,11 +48,9 @@
 import org.apache.drill.exec.store.AbstractStoragePlugin;
 import org.apache.drill.exec.store.SchemaConfig;
 import org.apache.drill.exec.store.StoragePluginOptimizerRule;
-import org.apache.drill.exec.store.dfs.FormatPlugin;
 import org.apache.drill.exec.store.hive.schema.HiveSchemaFactory;
 import com.google.common.collect.ImmutableSet;
 
-import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hive.conf.HiveConf;
 import org.apache.hadoop.hive.conf.HiveConf.ConfVars;
 import org.apache.hadoop.hive.metastore.api.MetaException;
@@ -64,8 +60,6 @@ public class HiveStoragePlugin extends AbstractStoragePlugin {
 
   private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(HiveStoragePlugin.class);
 
-  public static final String HIVE_MAPRDB_FORMAT_PLUGIN_NAME = "hive-maprdb";
-
   private final HiveStoragePluginConfig config;
   private HiveSchemaFactory schemaFactory;
   private final HiveConf hiveConf;
@@ -206,44 +200,10 @@ public Set<StoragePluginOptimizerRule> getOptimizerRules(OptimizerRulesContext o
             options.getBoolean(ExecConstants.HIVE_OPTIMIZE_PARQUET_SCAN_WITH_NATIVE_READER)) {
           ruleBuilder.add(ConvertHiveParquetScanToDrillParquetScan.INSTANCE);
         }
-        if (options.getBoolean(ExecConstants.HIVE_OPTIMIZE_MAPRDB_JSON_SCAN_WITH_NATIVE_READER)) {
-          try {
-            Class<?> hiveToDrillMapRDBJsonRuleClass =
-                Class.forName("org.apache.drill.exec.planner.sql.logical.ConvertHiveMapRDBJsonScanToDrillMapRDBJsonScan");
-            ruleBuilder.add((StoragePluginOptimizerRule) hiveToDrillMapRDBJsonRuleClass.getField("INSTANCE").get(null));
-          } catch (ReflectiveOperationException e) {
-            logger.warn("Current Drill build is not designed for working with Hive MapR-DB tables. " +
-                "Please disable {} option", ExecConstants.HIVE_OPTIMIZE_MAPRDB_JSON_SCAN_WITH_NATIVE_READER);
-          }
-        }
         return ruleBuilder.build();
       }
       default:
         return ImmutableSet.of();
     }
   }
-
-  @Override
-  public FormatPlugin getFormatPlugin(FormatPluginConfig formatConfig) {
-    //  TODO: implement formatCreator similar to FileSystemPlugin formatCreator. DRILL-6621
-    try {
-      Class<?> mapRDBFormatPluginConfigClass =
-          Class.forName("org.apache.drill.exec.store.mapr.db.MapRDBFormatPluginConfig");
-      Class<?> mapRDBFormatPluginClass =
-          Class.forName("org.apache.drill.exec.store.mapr.db.MapRDBFormatPlugin");
-
-      if (mapRDBFormatPluginConfigClass.isInstance(formatConfig)) {
-        return (FormatPlugin) mapRDBFormatPluginClass.getConstructor(
-              new Class[]{String.class, DrillbitContext.class, Configuration.class,
-                  StoragePluginConfig.class, mapRDBFormatPluginConfigClass})
-          .newInstance(
-              new Object[]{HIVE_MAPRDB_FORMAT_PLUGIN_NAME, context, hiveConf, config, formatConfig});
-      }
-    } catch (ReflectiveOperationException e) {
-      throw new DrillRuntimeException("The error is occurred while connecting to MapR-DB or instantiating mapRDBFormatPlugin", e);
-    }
-    throw new DrillRuntimeException(String.format("Hive storage plugin doesn't support usage of %s format plugin",
-        formatConfig.getClass().getName()));
-  }
-
 }
diff --git a/distribution/pom.xml b/distribution/pom.xml
index dfb9d28484a..df247a5a929 100644
--- 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,15 @@
           <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>
 
@@ -535,90 +533,6 @@
         </plugins>
       </build>
     </profile>
-    <profile>
-      <id>mapr</id>
-      <dependencies>
-        <dependency>
-          <groupId>org.apache.drill.contrib</groupId>
-          <artifactId>drill-format-mapr</artifactId>
-          <version>${project.version}</version>
-          <exclusions>
-            <exclusion>
-              <groupId>com.mapr</groupId>
-              <artifactId>mapr-test-annotations</artifactId>
-            </exclusion>
-          </exclusions>
-        </dependency>
-        <dependency>
-          <groupId>org.apache.hbase</groupId>
-          <artifactId>hbase-client</artifactId>
-        </dependency>
-        <dependency>
-          <groupId>org.apache.hbase</groupId>
-          <artifactId>hbase-annotations</artifactId>
-        </dependency>
-        <dependency>
-          <groupId>org.apache.hbase</groupId>
-          <artifactId>hbase-common</artifactId>
-        </dependency>
-        <dependency>
-          <groupId>org.apache.hbase</groupId>
-          <artifactId>hbase-protocol</artifactId>
-        </dependency>
-        <dependency>
-          <groupId>org.apache.hive</groupId>
-          <artifactId>hive-maprdb-json-handler</artifactId>
-        </dependency>
-        <dependency>
-          <groupId>com.mapr.db</groupId>
-          <artifactId>maprdb-mapreduce</artifactId>
-        </dependency>
-        <dependency>
-          <groupId>com.mapr.security</groupId>
-          <artifactId>mapr-security-web</artifactId>
-        </dependency>
-      </dependencies>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-resources-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>copy-winutils</id>
-                <phase>none</phase>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-dependency-plugin</artifactId>
-            <version>3.6.0</version>
-            <executions>
-              <execution>
-                <id>unpack-winutils</id>
-                <goals>
-                  <goal>unpack</goal>
-                </goals>
-                <phase>process-resources</phase>
-                <configuration>
-                  <artifactItems>
-                    <artifactItem>
-                      <groupId>org.apache.hadoop</groupId>
-                      <artifactId>hadoop-winutils</artifactId>
-                      <version>2.7.0-mapr-1506</version>
-                      <type>zip</type>
-                      <overWrite>true</overWrite>
-                      <outputDirectory>${project.build.directory}/winutils</outputDirectory>
-                      <excludes>**/*.pdb,**/*.lib,**/*.exp</excludes>
-                    </artifactItem>
-                  </artifactItems>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
     <profile>
       <id>rpm</id>
       <build>
@@ -868,6 +782,94 @@
         </plugins>
       </build>
     </profile>
+
+    <!-- Profiles that are no longer supported. -->
+    <!--
+    <profile>
+      <id>mapr</id>
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.drill.contrib</groupId>
+          <artifactId>drill-format-mapr</artifactId>
+          <version>${project.version}</version>
+          <exclusions>
+            <exclusion>
+              <groupId>com.mapr</groupId>
+              <artifactId>mapr-test-annotations</artifactId>
+            </exclusion>
+          </exclusions>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.hbase</groupId>
+          <artifactId>hbase-client</artifactId>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.hbase</groupId>
+          <artifactId>hbase-annotations</artifactId>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.hbase</groupId>
+          <artifactId>hbase-common</artifactId>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.hbase</groupId>
+          <artifactId>hbase-protocol</artifactId>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.hive</groupId>
+          <artifactId>hive-maprdb-json-handler</artifactId>
+        </dependency>
+        <dependency>
+          <groupId>com.mapr.db</groupId>
+          <artifactId>maprdb-mapreduce</artifactId>
+        </dependency>
+        <dependency>
+          <groupId>com.mapr.security</groupId>
+          <artifactId>mapr-security-web</artifactId>
+        </dependency>
+      </dependencies>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-resources-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>copy-winutils</id>
+                <phase>none</phase>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-dependency-plugin</artifactId>
+            <version>3.1.1</version>
+            <executions>
+              <execution>
+                <id>unpack-winutils</id>
+                <goals>
+                  <goal>unpack</goal>
+                </goals>
+                <phase>process-resources</phase>
+                <configuration>
+                  <artifactItems>
+                    <artifactItem>
+                      <groupId>org.apache.hadoop</groupId>
+                      <artifactId>hadoop-winutils</artifactId>
+                      <version>2.7.0-mapr-1506</version>
+                      <type>zip</type>
+                      <overWrite>true</overWrite>
+                      <outputDirectory>${project.build.directory}/winutils</outputDirectory>
+                      <excludes>**/*.pdb,**/*.lib,**/*.exp</excludes>
+                    </artifactItem>
+                  </artifactItems>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    -->
   </profiles>
 
 </project>
diff --git a/distribution/src/assemble/component.xml b/distribution/src/assemble/component.xml
index 7cf3066e51d..9516821d869 100644
--- a/distribution/src/assemble/component.xml
+++ b/distribution/src/assemble/component.xml
@@ -25,53 +25,57 @@
     <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>
diff --git a/exec/java-exec/pom.xml b/exec/java-exec/pom.xml
index 045d812aece..fc4ee1099ca 100644
--- a/exec/java-exec/pom.xml
+++ b/exec/java-exec/pom.xml
@@ -688,46 +688,6 @@
         </plugins>
       </build>
     </profile>
-    <profile>
-      <id>mapr</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>build-helper-maven-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>add-mapr-sources</id>
-                <phase>generate-sources</phase>
-                <goals>
-                  <goal>add-source</goal>
-                </goals>
-                <configuration>
-                  <sources>
-                    <source>srcMapr/main/java</source>
-                  </sources>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-      <dependencies>
-        <dependency>
-          <groupId>com.mapr.hadoop</groupId>
-          <artifactId>maprfs</artifactId>
-          <scope>runtime</scope>
-        </dependency>
-        <dependency>
-          <groupId>com.tdunning</groupId>
-          <artifactId>json</artifactId>
-        </dependency>
-        <dependency>
-          <groupId>com.mapr.security</groupId>
-          <artifactId>mapr-security-web</artifactId>
-        </dependency>
-      </dependencies>
-    </profile>
     <profile>
       <id>hdp</id>
       <dependencies>
@@ -830,6 +790,49 @@
         </plugins>
       </build>
     </profile>
+    <!-- Profiles that are no longer supported. -->
+    <!--
+    <profile>
+      <id>mapr</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>build-helper-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>add-mapr-sources</id>
+                <phase>generate-sources</phase>
+                <goals>
+                  <goal>add-source</goal>
+                </goals>
+                <configuration>
+                  <sources>
+                    <source>srcMapr/main/java</source>
+                  </sources>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+      <dependencies>
+        <dependency>
+          <groupId>com.mapr.hadoop</groupId>
+          <artifactId>maprfs</artifactId>
+          <scope>runtime</scope>
+        </dependency>
+        <dependency>
+          <groupId>com.tdunning</groupId>
+          <artifactId>json</artifactId>
+        </dependency>
+        <dependency>
+          <groupId>com.mapr.security</groupId>
+          <artifactId>mapr-security-web</artifactId>
+        </dependency>
+      </dependencies>
+    </profile>
+    -->
   </profiles>
   <build>
     <plugins>
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/ExecConstants.java b/exec/java-exec/src/main/java/org/apache/drill/exec/ExecConstants.java
index 8fd01be1ef2..cff5cd2562d 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/ExecConstants.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/ExecConstants.java
@@ -213,7 +213,6 @@ private ExecConstants() {
   public static final String SSL_TRUSTSTORE_PATH = "drill.exec.ssl.trustStorePath"; // path to keystore. default : $JRE_HOME/lib/security/cacerts.jks
   public static final String SSL_TRUSTSTORE_PASSWORD = "drill.exec.ssl.trustStorePassword"; // default: changeit
   public static final String SSL_USE_HADOOP_CONF = "drill.exec.ssl.useHadoopConfig"; // Initialize ssl params from hadoop if not provided by drill. default: true
-  public static final String SSL_USE_MAPR_CONFIG = "drill.exec.ssl.useMapRSSLConfig"; // Use keyStore and trustStore credentials provided by MapR platform.
   public static final String SSL_HANDSHAKE_TIMEOUT = "drill.exec.security.user.encryption.ssl.handshakeTimeout"; // Default 10 seconds
 
   public static final String TEXT_LINE_READER_BATCH_SIZE = "drill.exec.storage.file.text.batch.size";
@@ -646,21 +645,6 @@ private ExecConstants() {
   public static final OptionValidator HIVE_OPTIMIZE_PARQUET_SCAN_WITH_NATIVE_READER_VALIDATOR =
       new BooleanValidator(HIVE_OPTIMIZE_PARQUET_SCAN_WITH_NATIVE_READER,
           new OptionDescription("Optimize reads of Parquet-backed external tables from Hive by using Drill native readers instead of the Hive Serde interface. (Drill 1.2+)"));
-  public static final String HIVE_OPTIMIZE_MAPRDB_JSON_SCAN_WITH_NATIVE_READER = "store.hive.maprdb_json.optimize_scan_with_native_reader";
-  public static final OptionValidator HIVE_OPTIMIZE_MAPRDB_JSON_SCAN_WITH_NATIVE_READER_VALIDATOR =
-      new BooleanValidator(HIVE_OPTIMIZE_MAPRDB_JSON_SCAN_WITH_NATIVE_READER,
-          new OptionDescription("Enables Drill to use the Drill native reader (instead of the Hive Serde interface) to optimize reads of MapR Database JSON tables from Hive. Default is false. (Drill 1.14+)"));
-
-  public static final String HIVE_READ_MAPRDB_JSON_TIMESTAMP_WITH_TIMEZONE_OFFSET = "store.hive.maprdb_json.read_timestamp_with_timezone_offset";
-  public static final OptionValidator HIVE_READ_MAPRDB_JSON_TIMESTAMP_WITH_TIMEZONE_OFFSET_VALIDATOR =
-      new BooleanValidator(HIVE_READ_MAPRDB_JSON_TIMESTAMP_WITH_TIMEZONE_OFFSET,
-          new OptionDescription("Enables Drill to read timestamp values with timezone offset when Hive plugin is used and Drill native MaprDB JSON reader usage is enabled. (Drill 1.16+)"));
-
-  public static final String HIVE_MAPRDB_JSON_ALL_TEXT_MODE = "store.hive.maprdb_json.all_text_mode";
-  public static final OptionValidator HIVE_MAPRDB_JSON_ALL_TEXT_MODE_VALIDATOR =
-      new BooleanValidator(HIVE_MAPRDB_JSON_ALL_TEXT_MODE,
-          new OptionDescription("Drill reads all data from the maprDB Json tables as VARCHAR when hive plugin is used and Drill native MaprDB JSON reader usage is enabled. Prevents schema change errors. (Drill 1.17+)"));
-
   public static final String HIVE_CONF_PROPERTIES = "store.hive.conf.properties";
   public static final OptionValidator HIVE_CONF_PROPERTIES_VALIDATOR = new StringValidator(HIVE_CONF_PROPERTIES,
       new OptionDescription("Enables the user to specify Hive properties at the session level. Do not set the property values in quotes. Separate the property name and value by =. Separate each property with a new line (\\n). Example: set `store.hive.conf.properties` = 'hive.mapred.supports.subdirectories=true\\nmapred.input.dir.recursive=true'. (Drill 1.14+)"));
@@ -1314,4 +1298,23 @@ ENABLE_DYNAMIC_CREDIT_BASED_FC, new OptionDescription("Enable dynamic credit bas
   public static final String HTTPS_PROXY_PORT = NET_PROXY_BASE + ".https.port";
   public static final String HTTPS_PROXY_USER_NAME = NET_PROXY_BASE + ".https.user_name";
   public static final String HTTPS_PROXY_PASSWORD = NET_PROXY_BASE + ".https.password";
+
+  // Options that are no longer supported.
+  /*
+  public static final String SSL_USE_MAPR_CONFIG = "drill.exec.ssl.useMapRSSLConfig"; // Use keyStore and trustStore credentials provided by MapR platform.
+  public static final String HIVE_OPTIMIZE_MAPRDB_JSON_SCAN_WITH_NATIVE_READER = "store.hive.maprdb_json.optimize_scan_with_native_reader";
+  public static final OptionValidator HIVE_OPTIMIZE_MAPRDB_JSON_SCAN_WITH_NATIVE_READER_VALIDATOR =
+      new BooleanValidator(HIVE_OPTIMIZE_MAPRDB_JSON_SCAN_WITH_NATIVE_READER,
+          new OptionDescription("Enables Drill to use the Drill native reader (instead of the Hive Serde interface) to optimize reads of MapR Database JSON tables from Hive. Default is false. (Drill 1.14+)"));
+
+  public static final String HIVE_READ_MAPRDB_JSON_TIMESTAMP_WITH_TIMEZONE_OFFSET = "store.hive.maprdb_json.read_timestamp_with_timezone_offset";
+  public static final OptionValidator HIVE_READ_MAPRDB_JSON_TIMESTAMP_WITH_TIMEZONE_OFFSET_VALIDATOR =
+      new BooleanValidator(HIVE_READ_MAPRDB_JSON_TIMESTAMP_WITH_TIMEZONE_OFFSET,
+          new OptionDescription("Enables Drill to read timestamp values with timezone offset when Hive plugin is used and Drill native MaprDB JSON reader usage is enabled. (Drill 1.16+)"));
+
+  public static final String HIVE_MAPRDB_JSON_ALL_TEXT_MODE = "store.hive.maprdb_json.all_text_mode";
+  public static final OptionValidator HIVE_MAPRDB_JSON_ALL_TEXT_MODE_VALIDATOR =
+      new BooleanValidator(HIVE_MAPRDB_JSON_ALL_TEXT_MODE,
+          new OptionDescription("Drill reads all data from the maprDB Json tables as VARCHAR when hive plugin is used and Drill native MaprDB JSON reader usage is enabled. Prevents schema change errors. (Drill 1.17+)"));
+  */
 }
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/SystemOptionManager.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/SystemOptionManager.java
index 707cec90b63..cf5d77693ee 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/SystemOptionManager.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/SystemOptionManager.java
@@ -220,9 +220,6 @@ public static CaseInsensitiveMap<OptionDefinition> createDefaultOptionDefinition
       new OptionDefinition(ExecConstants.KAFKA_READER_ESCAPE_ANY_CHAR_VALIDATOR),
       new OptionDefinition(ExecConstants.HIVE_OPTIMIZE_SCAN_WITH_NATIVE_READERS_VALIDATOR),
       new OptionDefinition(ExecConstants.HIVE_OPTIMIZE_PARQUET_SCAN_WITH_NATIVE_READER_VALIDATOR),
-      new OptionDefinition(ExecConstants.HIVE_OPTIMIZE_MAPRDB_JSON_SCAN_WITH_NATIVE_READER_VALIDATOR),
-      new OptionDefinition(ExecConstants.HIVE_READ_MAPRDB_JSON_TIMESTAMP_WITH_TIMEZONE_OFFSET_VALIDATOR),
-      new OptionDefinition(ExecConstants.HIVE_MAPRDB_JSON_ALL_TEXT_MODE_VALIDATOR),
       new OptionDefinition(ExecConstants.HIVE_CONF_PROPERTIES_VALIDATOR),
       new OptionDefinition(ExecConstants.SLICE_TARGET_OPTION),
       new OptionDefinition(ExecConstants.AFFINITY_FACTOR),
@@ -327,6 +324,13 @@ public static CaseInsensitiveMap<OptionDefinition> createDefaultOptionDefinition
       new OptionDefinition(ExecConstants.STORAGE_PLUGIN_RETRY_ATTEMPTS_VALIDATOR, new OptionMetaData(OptionValue.AccessibleScopes.SYSTEM, true, false)),
       new OptionDefinition(ExecConstants.STORAGE_PLUGIN_RETRY_DELAY_VALIDATOR, new OptionMetaData(OptionValue.AccessibleScopes.SYSTEM, true, false)),
       new OptionDefinition(ExecConstants.STORAGE_PLUGIN_AUTO_DISABLE_VALIDATOR, new OptionMetaData(OptionValue.AccessibleScopes.SYSTEM, true, false))
+
+      // Options that are no longer supported.
+      /*
+      new OptionDefinition(ExecConstants.HIVE_OPTIMIZE_MAPRDB_JSON_SCAN_WITH_NATIVE_READER_VALIDATOR),
+      new OptionDefinition(ExecConstants.HIVE_READ_MAPRDB_JSON_TIMESTAMP_WITH_TIMEZONE_OFFSET_VALIDATOR),
+      new OptionDefinition(ExecConstants.HIVE_MAPRDB_JSON_ALL_TEXT_MODE_VALIDATOR),
+      */
     };
 
     CaseInsensitiveMap<OptionDefinition> map = Arrays.stream(definitions)
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/ssl/SSLConfigClient.java b/exec/java-exec/src/main/java/org/apache/drill/exec/ssl/SSLConfigClient.java
index 3b4f12b4907..607c855fafe 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/ssl/SSLConfigClient.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/ssl/SSLConfigClient.java
@@ -59,8 +59,7 @@ public SSLConfigClient(Properties properties, Configuration hadoopConfig) throws
     SSLCredentialsProvider credentialsProvider = SSLCredentialsProvider.getSSLCredentialsProvider(
         this::getStringProperty,
         this::getPasswordStringProperty,
-        getMode(),
-        getBooleanProperty(DrillProperties.USE_MAPR_SSL_CONFIG)
+        getMode()
     );
     trustStoreType = credentialsProvider.getTrustStoreType(DrillProperties.TRUSTSTORE_TYPE, "JKS");
     trustStorePath = credentialsProvider.getTrustStoreLocation(DrillProperties.TRUSTSTORE_PATH, "");
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/ssl/SSLConfigServer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/ssl/SSLConfigServer.java
index 8d3e7e2fa01..3d3c6b07ab5 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/ssl/SSLConfigServer.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/ssl/SSLConfigServer.java
@@ -78,8 +78,8 @@ public SSLConfigServer(DrillConfig config, Configuration hadoopConfig) throws Dr
     SSLCredentialsProvider credentialsProvider = SSLCredentialsProvider.getSSLCredentialsProvider(
         this::getConfigParam,
         this::getPasswordConfigParam,
-        Mode.SERVER,
-        config.getBoolean(ExecConstants.SSL_USE_MAPR_CONFIG));
+        Mode.SERVER
+    );
     trustStoreType = credentialsProvider.getTrustStoreType(
         ExecConstants.SSL_TRUSTSTORE_TYPE, resolveHadoopPropertyName(HADOOP_SSL_TRUSTSTORE_TYPE_TPL_KEY, mode));
     trustStorePath = credentialsProvider.getTrustStoreLocation(
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/ssl/SSLCredentialsProvider.java b/exec/java-exec/src/main/java/org/apache/drill/exec/ssl/SSLCredentialsProvider.java
index e2d0ceda3ff..982bfc11782 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/ssl/SSLCredentialsProvider.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/ssl/SSLCredentialsProvider.java
@@ -17,23 +17,13 @@
  */
 package org.apache.drill.exec.ssl;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Optional;
 import java.util.function.BiFunction;
 
 /**
- * Provides an implementation of credentials provider depending on "useMapRSSLConfig" option value
- * and whether Drill was built with mapr profile or not.
+ * Provides an implementation of credentials provider.
  */
 abstract class SSLCredentialsProvider {
 
-  private static final String MAPR_CREDENTIALS_PROVIDER_CLIENT = "org.apache.drill.exec.ssl.SSLCredentialsProviderMaprClient";
-  private static final String MAPR_CREDENTIALS_PROVIDER_SERVER = "org.apache.drill.exec.ssl.SSLCredentialsProviderMaprServer";
-
-  private static final Logger logger = LoggerFactory.getLogger(SSLCredentialsProvider.class);
-
   /**
    * Provides a concrete implementation of {@link SSLCredentialsProvider}.
    *
@@ -48,34 +38,11 @@ abstract class SSLCredentialsProvider {
    *                          using Hadoop's CredentialProvider API with fallback
    *                          to standard means as is used for {@code getPropertyMethod}
    * @param mode              CLIENT or SERVER
-   * @param useMapRSSLConfig  use a MapR credential provider
    * @return concrete implementation of SSLCredentialsProvider
    */
   static SSLCredentialsProvider getSSLCredentialsProvider(BiFunction<String, String, String> getPropertyMethod,
-      BiFunction<String, String, String> getPasswordPropertyMethod, SSLConfig.Mode mode, boolean useMapRSSLConfig) {
-    return useMapRSSLConfig ? getMaprCredentialsProvider(mode)
-        .orElseGet(() -> new SSLCredentialsProviderImpl(getPropertyMethod, getPasswordPropertyMethod)) :
-        new SSLCredentialsProviderImpl(getPropertyMethod, getPasswordPropertyMethod);
-  }
-
-  private static Optional<SSLCredentialsProvider> getMaprCredentialsProvider(SSLConfig.Mode mode) {
-    String maprCredentialsProviderClass = "";
-    switch (mode) {
-      case SERVER:
-        maprCredentialsProviderClass = MAPR_CREDENTIALS_PROVIDER_SERVER;
-        break;
-      case CLIENT:
-        maprCredentialsProviderClass = MAPR_CREDENTIALS_PROVIDER_CLIENT;
-        break;
-      default:
-        throw new IllegalStateException("Should never occur.");
-    }
-    try {
-      return Optional.of((SSLCredentialsProvider) Class.forName(maprCredentialsProviderClass).newInstance());
-    } catch (ClassNotFoundException | InstantiationException | IllegalAccessException e) {
-      logger.warn("Trying to use MapR credentials provider on a non-MapR platform", e);
-      return Optional.empty();
-    }
+      BiFunction<String, String, String> getPasswordPropertyMethod, SSLConfig.Mode mode) {
+    return new SSLCredentialsProviderImpl(getPropertyMethod, getPasswordPropertyMethod);
   }
 
   abstract String getTrustStoreType(String propertyName, String defaultValue);
diff --git a/exec/java-exec/src/main/resources/drill-module.conf b/exec/java-exec/src/main/resources/drill-module.conf
index ff817b5e4b8..48c43b0ea24 100644
--- a/exec/java-exec/src/main/resources/drill-module.conf
+++ b/exec/java-exec/src/main/resources/drill-module.conf
@@ -219,10 +219,12 @@ drill.exec: {
     # if true, then Drill will read SSL parameters from the
     # Hadoop configuration files.
     useHadoopConfig : true,
-    # Use keyStore and trustStore credentials provided by MapR platform.
-    useMapRSSLConfig : false,
-    #Drill can use either the JDK implementation or the OpenSSL implementation.
+    # Drill can use either the JDK implementation or the OpenSSL implementation.
     provider: "JDK"
+
+    # Options that are no longer supported.
+    # Use keyStore and trustStore credentials provided by MapR platform.
+    # useMapRSSLConfig : false,
   },
   network: {
     start: 35000
@@ -695,9 +697,6 @@ drill.exec.options: {
     store.format: "parquet",
     store.hive.optimize_scan_with_native_readers: false,
     store.hive.parquet.optimize_scan_with_native_reader: false,
-    store.hive.maprdb_json.optimize_scan_with_native_reader: false,
-    store.hive.maprdb_json.read_timestamp_with_timezone_offset: false,
-    store.hive.maprdb_json.all_text_mode: false,
     # Properties values should NOT be set in double-quotes or any other quotes.
     # Property name and value should be separated by =.
     # Properties should be separated by new line (\n).
@@ -800,4 +799,9 @@ drill.exec.options: {
     metastore.metadata.use_statistics: true,
     metastore.metadata.ctas.auto-collect: "NONE",
     metastore.metadata.fallback_to_file_metadata: true
+
+    # Options that are no longer supported.
+    # store.hive.maprdb_json.optimize_scan_with_native_reader: false,
+    # store.hive.maprdb_json.read_timestamp_with_timezone_offset: false,
+    # store.hive.maprdb_json.all_text_mode: false,
 }
diff --git a/exec/java-exec/srcMapr/main/java/org/apache/drill/exec/ssl/SSLCredentialsProviderMaprClient.java b/exec/java-exec/srcMapr/main/java/org/apache/drill/exec/ssl/SSLCredentialsProviderMaprClient.java
deleted file mode 100644
index aebfd59057d..00000000000
--- a/exec/java-exec/srcMapr/main/java/org/apache/drill/exec/ssl/SSLCredentialsProviderMaprClient.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.drill.exec.ssl;
-
-import com.mapr.web.security.SslConfig;
-import com.mapr.web.security.WebSecurityManager;
-
-/**
- * Provides SSL credentials for Client using {@link WebSecurityManager}.
- */
-class SSLCredentialsProviderMaprClient extends SSLCredentialsProvider {
-
-  private final SslConfig sslConfig = WebSecurityManager.getSslConfig();
-
-  @Override
-  String getTrustStoreType(String propertyName, String defaultValue) {
-    return sslConfig.getClientTruststoreType();
-  }
-
-  @Override
-  String getTrustStoreLocation(String propertyName, String defaultValue) {
-    return sslConfig.getClientTruststoreLocation();
-  }
-
-  @Override
-  String getTrustStorePassword(String propertyName, String defaultValue) {
-    return String.valueOf(sslConfig.getClientTruststorePassword());
-  }
-
-  @Override
-  String getKeyStoreType(String propertyName, String defaultValue) {
-    return sslConfig.getClientKeystoreType();
-  }
-
-  @Override
-  String getKeyStoreLocation(String propertyName, String defaultValue) {
-    return sslConfig.getClientKeystoreLocation();
-  }
-
-  @Override
-  String getKeyStorePassword(String propertyName, String defaultValue) {
-    return String.valueOf(sslConfig.getClientKeystorePassword());
-  }
-
-  @Override
-  String getKeyPassword(String propertyName, String defaultValue) {
-    return String.valueOf(sslConfig.getClientKeyPassword());
-  }
-}
diff --git a/exec/java-exec/srcMapr/main/java/org/apache/drill/exec/ssl/SSLCredentialsProviderMaprServer.java b/exec/java-exec/srcMapr/main/java/org/apache/drill/exec/ssl/SSLCredentialsProviderMaprServer.java
deleted file mode 100644
index 11860dfa377..00000000000
--- a/exec/java-exec/srcMapr/main/java/org/apache/drill/exec/ssl/SSLCredentialsProviderMaprServer.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.drill.exec.ssl;
-
-import com.mapr.web.security.SslConfig;
-import com.mapr.web.security.WebSecurityManager;
-
-/**
- * Provides SSL credentials for Server using {@link WebSecurityManager}.
- */
-class SSLCredentialsProviderMaprServer extends SSLCredentialsProvider {
-
-  private final SslConfig sslConfig = WebSecurityManager.getSslConfig();
-
-  @Override
-  String getTrustStoreType(String propertyName, String defaultValue) {
-    return sslConfig.getServerTruststoreType();
-  }
-
-  @Override
-  String getTrustStoreLocation(String propertyName, String defaultValue) {
-    return sslConfig.getServerTruststoreLocation();
-  }
-
-  @Override
-  String getTrustStorePassword(String propertyName, String defaultValue) {
-    return String.valueOf(sslConfig.getServerTruststorePassword());
-  }
-
-  @Override
-  String getKeyStoreType(String propertyName, String defaultValue) {
-    return sslConfig.getServerKeystoreType();
-  }
-
-  @Override
-  String getKeyStoreLocation(String propertyName, String defaultValue) {
-    return sslConfig.getServerKeystoreLocation();
-  }
-
-  @Override
-  String getKeyStorePassword(String propertyName, String defaultValue) {
-    return String.valueOf(sslConfig.getServerKeystorePassword());
-  }
-
-  @Override
-  String getKeyPassword(String propertyName, String defaultValue) {
-    return String.valueOf(sslConfig.getServerKeyPassword());
-  }
-}
diff --git a/exec/jdbc-all/pom.xml b/exec/jdbc-all/pom.xml
index 4ea4f06e3b5..f6b64275b70 100644
--- a/exec/jdbc-all/pom.xml
+++ b/exec/jdbc-all/pom.xml
@@ -822,6 +822,73 @@
   </build>
 
   <profiles>
+    <profile>
+      <id>apache-release</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>attach-javadocs</id>
+                <goals>
+                  <goal>aggregate-jar</goal>
+                </goals>
+                <inherited>false</inherited>
+                <configuration>
+                  <includeDependencySources>true</includeDependencySources>
+                  <dependencySourceIncludes>
+                    <dependencySourceInclude>org.apache.drill.exec:drill-jdbc</dependencySourceInclude>
+                  </dependencySourceIncludes>
+                  <!-- Include only the published interface in the Javadoc-
+                       generated documentation.  Unfortunately, the plugin does
+                       not support inclusion patterns and hence we have to rely
+                       on an exclusion pattern. -->
+                  <excludePackageNames>org.apache.drill.jdbc.impl</excludePackageNames>
+
+                  <!-- windowtitle: common part of window titles (goes in
+                       parentheses at end of window title, after in-page title
+                       (e.g., package name)) -->
+                  <windowtitle>
+                    Apache Drill JDBC Driver v. ${project.version}
+                  </windowtitle>
+
+                  <!-- header, footer:  small text at right edge of
+                       top, bottom Overview/Package/etc. menu bars -->
+                  <header>Apache Drill JDBC Driver v. ${project.version}</header>
+                  <footer>Apache Drill JDBC Driver v. ${project.version}</footer>
+
+                  <!-- doctitle:  in-page title for overview page  -->
+                  <doctitle>
+                    Apache Drill JDBC Driver version ${project.version}
+                  </doctitle>
+                  <groups>
+                    <group>
+                      <title>Drill JDBC Driver</title>
+                      <packages>org.apache.drill.jdbc</packages>
+                    </group>
+                    <group>
+                      <title>Tracing Proxy JDBC Driver</title>
+                      <packages>org.apache.drill.jdbc.proxy</packages>
+                    </group>
+                  </groups>
+
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>hadoop-2</id>
+      <properties>
+        <jdbc-all-jar.maxsize>51000000</jdbc-all-jar.maxsize>
+      </properties>
+    </profile>
+    <!-- Profiles that are no longer supported. -->
+    <!--
     <profile>
       <id>mapr</id>
       <properties>
@@ -835,16 +902,16 @@
             <configuration>
               <shadedArtifactAttached>false</shadedArtifactAttached>
               <createDependencyReducedPom>true</createDependencyReducedPom>
-              <!-- TODO DRILL-4336: try to move the dependencyReducedPom out of the default location (the module root).
+              <!== TODO DRILL-4336: try to move the dependencyReducedPom out of the default location (the module root).
                    Putting it here caused the target directory to be run as a submodule (oddly
-                   only when trying to run the maven release goal) -->
-              <!--dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation-->
-              <!-- TODO DRILL-4336: an attempt to fix the issue by moving the file elsewhere, had issues executing
-                   but may be able to be modified to to fix the issue-->
-              <!--dependencyReducedPomLocation>${project.build.directory}/generated/shade/dependency-reduced-pom.xml</dependencyReducedPomLocation-->
+                   only when trying to run the maven release goal) ==>
+              <!==dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation==>
+              <!== TODO DRILL-4336: an attempt to fix the issue by moving the file elsewhere, had issues executing
+                   but may be able to be modified to to fix the issue==>
+              <!==dependencyReducedPomLocation>${project.build.directory}/generated/shade/dependency-reduced-pom.xml</dependencyReducedPomLocation==>
               <minimizeJar>false</minimizeJar>
 
-              <!-- Exclude dependencies at artifact level. Format is "groupId:artifactId[[:type]:classifier]" -->
+              <!== Exclude dependencies at artifact level. Format is "groupId:artifactId[[:type]:classifier]" ==>
               <artifactSet>
                 <includes>
                   <include>*:*</include>
@@ -907,7 +974,7 @@
                 </excludes>
               </artifactSet>
               <relocations>
-                <!-- Relocate Drill classes to minimize classloader hell. -->
+                <!== Relocate Drill classes to minimize classloader hell. ==>
                 <relocation>
                   <pattern>org.apache.drill.exec.</pattern>
                   <shadedPattern>oadd.org.apache.drill.exec.</shadedPattern>
@@ -917,7 +984,7 @@
                   <shadedPattern>oadd.org.apache.drill.common.</shadedPattern>
                 </relocation>
 
-                <!-- Move dependencies out of path -->
+                <!== Move dependencies out of path ==>
                 <relocation>
                   <pattern>antlr.</pattern>
                   <shadedPattern>oadd.antlr.</shadedPattern>
@@ -1137,7 +1204,7 @@
                 </transformer>
               </transformers>
 
-              <!-- Remove the particular directory or class level dependency from final jar -->
+              <!== Remove the particular directory or class level dependency from final jar ==>
               <filters>
                 <filter>
                   <artifact>*:*</artifact>
@@ -1212,13 +1279,13 @@
                     <exclude>webapps/**</exclude>
                   </excludes>
                 </filter>
-                <!-- This file is used to automatically load given jdbc driver without calling Class.forName().
-                     Excluding the Avatica service file which is conflicting with the Drill one. -->
+                <!== This file is used to automatically load given jdbc driver without calling Class.forName().
+                     Excluding the Avatica service file which is conflicting with the Drill one. ==>
                 <filter>
                   <artifact>org.apache.calcite.avatica:*</artifact>
                   <excludes>
                     <exclude>META-INF/services/java.sql.Driver</exclude>
-                    <!-- Excludes shaded slf4j to avoid conflicts when they are put into the fat jar -->
+                    <!== Excludes shaded slf4j to avoid conflicts when they are put into the fat jar ==>
                     <exclude>org/slf4j/**</exclude>
                   </excludes>
                 </filter>
@@ -1229,71 +1296,7 @@
 
       </build>
     </profile>
-    <profile>
-      <id>apache-release</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>attach-javadocs</id>
-                <goals>
-                  <goal>aggregate-jar</goal>
-                </goals>
-                <inherited>false</inherited>
-                <configuration>
-                  <includeDependencySources>true</includeDependencySources>
-                  <dependencySourceIncludes>
-                    <dependencySourceInclude>org.apache.drill.exec:drill-jdbc</dependencySourceInclude>
-                  </dependencySourceIncludes>
-                  <!-- Include only the published interface in the Javadoc-
-                       generated documentation.  Unfortunately, the plugin does
-                       not support inclusion patterns and hence we have to rely
-                       on an exclusion pattern. -->
-                  <excludePackageNames>org.apache.drill.jdbc.impl</excludePackageNames>
-
-                  <!-- windowtitle: common part of window titles (goes in
-                       parentheses at end of window title, after in-page title
-                       (e.g., package name)) -->
-                  <windowtitle>
-                    Apache Drill JDBC Driver v. ${project.version}
-                  </windowtitle>
-
-                  <!-- header, footer:  small text at right edge of
-                       top, bottom Overview/Package/etc. menu bars -->
-                  <header>Apache Drill JDBC Driver v. ${project.version}</header>
-                  <footer>Apache Drill JDBC Driver v. ${project.version}</footer>
-
-                  <!-- doctitle:  in-page title for overview page  -->
-                  <doctitle>
-                    Apache Drill JDBC Driver version ${project.version}
-                  </doctitle>
-                  <groups>
-                    <group>
-                      <title>Drill JDBC Driver</title>
-                      <packages>org.apache.drill.jdbc</packages>
-                    </group>
-                    <group>
-                      <title>Tracing Proxy JDBC Driver</title>
-                      <packages>org.apache.drill.jdbc.proxy</packages>
-                    </group>
-                  </groups>
-
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
-      <id>hadoop-2</id>
-      <properties>
-        <jdbc-all-jar.maxsize>51000000</jdbc-all-jar.maxsize>
-      </properties>
-    </profile>
+    -->
   </profiles>
 
 </project>
diff --git a/exec/jdbc/pom.xml b/exec/jdbc/pom.xml
index 6f02d45fb0a..0cb00015488 100644
--- a/exec/jdbc/pom.xml
+++ b/exec/jdbc/pom.xml
@@ -124,31 +124,17 @@
       </dependencies>
     </profile>
     <profile>
-      <id>mapr</id>
+      <id>cdh4</id>
       <dependencies>
         <dependency>
           <groupId>org.apache.hadoop</groupId>
           <artifactId>hadoop-common</artifactId>
           <scope>test</scope>
-          <exclusions>
-            <exclusion>
-              <artifactId>commons-logging</artifactId>
-              <groupId>commons-logging</groupId>
-            </exclusion>
-            <exclusion>
-              <groupId>org.eclipse.jetty</groupId>
-              <artifactId>jetty-server</artifactId>
-            </exclusion>
-            <exclusion>
-              <groupId>org.eclipse.jetty</groupId>
-              <artifactId>jetty-servlet</artifactId>
-            </exclusion>
-          </exclusions>
         </dependency>
       </dependencies>
     </profile>
     <profile>
-      <id>cdh4</id>
+      <id>hdp</id>
       <dependencies>
         <dependency>
           <groupId>org.apache.hadoop</groupId>
@@ -157,15 +143,32 @@
         </dependency>
       </dependencies>
     </profile>
+    <!-- Profiles that are no longer supported. -->
+    <!--
     <profile>
-      <id>hdp</id>
+      <id>mapr</id>
       <dependencies>
         <dependency>
           <groupId>org.apache.hadoop</groupId>
           <artifactId>hadoop-common</artifactId>
           <scope>test</scope>
+          <exclusions>
+            <exclusion>
+              <artifactId>commons-logging</artifactId>
+              <groupId>commons-logging</groupId>
+            </exclusion>
+            <exclusion>
+              <groupId>org.eclipse.jetty</groupId>
+              <artifactId>jetty-server</artifactId>
+            </exclusion>
+            <exclusion>
+              <groupId>org.eclipse.jetty</groupId>
+              <artifactId>jetty-servlet</artifactId>
+            </exclusion>
+          </exclusions>
         </dependency>
       </dependencies>
     </profile>
+    -->
   </profiles>
 </project>
diff --git a/metastore/iceberg-metastore/pom.xml b/metastore/iceberg-metastore/pom.xml
index 2737bfd3be7..da030f5efb8 100644
--- a/metastore/iceberg-metastore/pom.xml
+++ b/metastore/iceberg-metastore/pom.xml
@@ -158,6 +158,8 @@
   </dependencies>
 
   <profiles>
+    <!-- Profiles that are no longer supported. -->
+    <!--
     <profile>
       <id>mapr</id>
       <dependencies>
@@ -195,6 +197,7 @@
         </dependency>
       </dependencies>
     </profile>
+    -->
   </profiles>
 
 </project>
diff --git a/pom.xml b/pom.xml
index 418885d0ca1..36334eab200 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,8 +59,6 @@
     <sqlline.version>1.12.0</sqlline.version>
     <jackson.version>2.14.3</jackson.version>
     <zookeeper.version>3.5.7</zookeeper.version>
-    <mapr.release.version>6.1.0-mapr</mapr.release.version>
-    <ojai.version>3.0-mapr-1808</ojai.version>
     <kerby.version>1.0.0</kerby.version>
     <findbugs.version>3.0.5</findbugs.version>
     <netty.tcnative.classifier />
@@ -134,6 +132,11 @@
     <mongo.version>4.3.3</mongo.version>
     <swagger.version>2.1.12</swagger.version>
     <junit.args />
+    <!-- Properties that are no longer supported. -->
+    <!--
+    <mapr.release.version>6.1.0-mapr</mapr.release.version>
+    <ojai.version>3.0-mapr-1808</ojai.version>
+    -->
   </properties>
 
   <scm>
@@ -174,18 +177,6 @@
   </mailingLists>
 
   <repositories>
-    <repository>
-      <id>mapr-releases</id>
-      <url>https://repository.mapr.com/maven/</url>
-      <releases>
-        <enabled>true</enabled>
-        <checksumPolicy>fail</checksumPolicy>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-
     <repository>
       <id>sonatype-nexus-snapshots</id>
       <url>https://oss.sonatype.org/content/repositories/snapshots</url>
@@ -202,6 +193,21 @@
       <id>jitpack.io</id>
       <url>https://jitpack.io</url>
     </repository>
+
+    <!-- Repositories that are no longer supported. -->
+    <!--
+    <repository>
+      <id>mapr-releases</id>
+      <url>https://repository.mapr.com/maven/</url>
+      <releases>
+        <enabled>true</enabled>
+        <checksumPolicy>fail</checksumPolicy>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
+    -->
   </repositories>
 
   <issueManagement>
@@ -1643,109 +1649,6 @@
         <artifactId>jackson-dataformat-hocon</artifactId>
         <version>1.1.1</version>
       </dependency>
-      <dependency>
-        <groupId>com.mapr.db</groupId>
-        <artifactId>maprdb</artifactId>
-        <version>${mapr.release.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.mapr.fs</groupId>
-        <artifactId>mapr-hbase</artifactId>
-        <version>${mapr.release.version}</version>
-        <exclusions>
-          <exclusion>
-            <artifactId>log4j</artifactId>
-            <groupId>log4j</groupId>
-          </exclusion>
-          <exclusion>
-            <artifactId>slf4j-log4j12</artifactId>
-            <groupId>org.slf4j</groupId>
-          </exclusion>
-          <exclusion>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-reload4j</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-core</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-server</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-json</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>asm</groupId>
-            <artifactId>asm</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-server</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-servlet</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>org.json</groupId>
-            <artifactId>json</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>com.mapr.hadoop</groupId>
-        <artifactId>maprfs</artifactId>
-        <version>${mapr.release.version}</version>
-        <exclusions>
-          <exclusion>
-            <groupId>org.yaml</groupId>
-            <artifactId>snakeyaml</artifactId>
-          </exclusion>
-          <exclusion>
-            <artifactId>commons-logging</artifactId>
-            <groupId>commons-logging</groupId>
-          </exclusion>
-          <exclusion>
-            <artifactId>log4j</artifactId>
-            <groupId>log4j</groupId>
-          </exclusion>
-          <exclusion>
-            <artifactId>slf4j-log4j12</artifactId>
-            <groupId>org.slf4j</groupId>
-          </exclusion>
-          <exclusion>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-reload4j</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>org.json</groupId>
-            <artifactId>json</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>com.mapr.security</groupId>
-        <artifactId>mapr-security-web</artifactId>
-        <version>${mapr.release.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.ojai</groupId>
-        <artifactId>ojai</artifactId>
-        <version>${ojai.version}</version>
-        <exclusions>
-          <exclusion>
-            <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-common</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
       <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty-tcnative</artifactId>
@@ -2027,6 +1930,114 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+
+      <!-- Dependency management that is no longer supported. -->
+      <!--
+      <dependency>
+        <groupId>com.mapr.db</groupId>
+        <artifactId>maprdb</artifactId>
+        <version>${mapr.release.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.mapr.fs</groupId>
+        <artifactId>mapr-hbase</artifactId>
+        <version>${mapr.release.version}</version>
+        <exclusions>
+          <exclusion>
+            <artifactId>log4j</artifactId>
+            <groupId>log4j</groupId>
+          </exclusion>
+          <exclusion>
+            <artifactId>slf4j-log4j12</artifactId>
+            <groupId>org.slf4j</groupId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-reload4j</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>com.sun.jersey</groupId>
+            <artifactId>jersey-core</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>com.sun.jersey</groupId>
+            <artifactId>jersey-server</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>com.sun.jersey</groupId>
+            <artifactId>jersey-json</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>asm</groupId>
+            <artifactId>asm</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-server</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-servlet</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>com.mapr.hadoop</groupId>
+        <artifactId>maprfs</artifactId>
+        <version>${mapr.release.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+          </exclusion>
+          <exclusion>
+            <artifactId>commons-logging</artifactId>
+            <groupId>commons-logging</groupId>
+          </exclusion>
+          <exclusion>
+            <artifactId>log4j</artifactId>
+            <groupId>log4j</groupId>
+          </exclusion>
+          <exclusion>
+            <artifactId>slf4j-log4j12</artifactId>
+            <groupId>org.slf4j</groupId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-reload4j</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>com.mapr.security</groupId>
+        <artifactId>mapr-security-web</artifactId>
+        <version>${mapr.release.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.ojai</groupId>
+        <artifactId>ojai</artifactId>
+        <version>${ojai.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-common</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      -->
+
     </dependencies>
   </dependencyManagement>
 
@@ -2935,23 +2946,16 @@
       </dependencyManagement>
     </profile>
     <profile>
-      <id>mapr</id>
+      <id>cdh</id>
       <properties>
-        <alt-hadoop>mapr</alt-hadoop>
-        <hive.version>2.3.3-mapr-1808</hive.version>
-        <hbase.version>1.1.1-mapr-1602-m7-5.2.0</hbase.version>
-        <hadoop.version>2.7.0-mapr-1808</hadoop.version>
-        <zookeeper.version>3.4.11-mapr-1808</zookeeper.version>
-        <!-- TODO: Remove this property and use a common dependency of curator-test after ZooKeeper 3.5+
-        for MapR profile is released. See problem description in https://issues.apache.org/jira/browse/CURATOR-428 -->
-        <curator.test.version>2.13.0</curator.test.version>
+        <alt-hadoop>cdh4</alt-hadoop>
       </properties>
       <dependencyManagement>
         <dependencies>
           <dependency>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-common</artifactId>
-            <version>${hadoop.version}</version>
+            <version>2.3.0-cdh5.0.3</version>
             <exclusions>
               <exclusion>
                 <artifactId>commons-logging</artifactId>
@@ -2966,13 +2970,40 @@
                 <artifactId>jetty-servlet</artifactId>
               </exclusion>
               <exclusion>
-                <groupId>javax.servlet</groupId>
-                <artifactId>servlet-api</artifactId>
-              </exclusion>
+                <groupId>dnsjava</groupId>
+                <artifactId>dnsjava</artifactId>
+              </exclusion>
+            </exclusions>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-client</artifactId>
+            <version>2.3.0-cdh5.0.3</version>
+            <exclusions>
+              <exclusion>
+                <groupId>javax.servlet</groupId>
+                <artifactId>servlet-api</artifactId>
+              </exclusion>
+              <exclusion>
+                <artifactId>commons-logging</artifactId>
+                <groupId>commons-logging</groupId>
+              </exclusion>
               <exclusion>
                 <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-util</artifactId>
+                <artifactId>jetty-server</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-servlet</artifactId>
               </exclusion>
+            </exclusions>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-yarn-client</artifactId>
+            <version>2.3.0-cdh5.0.3</version>
+            <scope>compile</scope>
+            <exclusions>
               <exclusion>
                 <groupId>com.sun.jersey</groupId>
                 <artifactId>jersey-core</artifactId>
@@ -2989,34 +3020,6 @@
                 <groupId>com.sun.jersey</groupId>
                 <artifactId>jersey-client</artifactId>
               </exclusion>
-              <exclusion>
-                <artifactId>jets3t</artifactId>
-                <groupId>net.java.dev.jets3t</groupId>
-              </exclusion>
-              <exclusion>
-                <artifactId>log4j</artifactId>
-                <groupId>log4j</groupId>
-              </exclusion>
-              <exclusion>
-                <artifactId>slf4j-log4j12</artifactId>
-                <groupId>org.slf4j</groupId>
-              </exclusion>
-              <exclusion>
-                <artifactId>slf4j-reload4j</artifactId>
-                <groupId>org.slf4j</groupId>
-              </exclusion>
-              <exclusion>
-                <artifactId>mockito-all</artifactId>
-                <groupId>org.mockito</groupId>
-              </exclusion>
-              <exclusion>
-                <artifactId>commons-logging-api</artifactId>
-                <groupId>commons-logging</groupId>
-              </exclusion>
-              <exclusion>
-                <artifactId>core</artifactId>
-                <groupId>org.eclipse.jdt</groupId>
-              </exclusion>
               <exclusion>
                 <groupId>org.codehaus.jackson</groupId>
                 <artifactId>jackson-core-asl</artifactId>
@@ -3033,24 +3036,50 @@
                 <groupId>org.codehaus.jackson</groupId>
                 <artifactId>jackson-jaxrs</artifactId>
               </exclusion>
+
+              <!-- Exclude the following to prevent enforcer failures. YARN uses them,
+                   but Drill forbids them. -->
+
               <exclusion>
-                <groupId>org.apache.hadoop</groupId>
-                <artifactId>hadoop-core</artifactId>
+                <groupId>log4j</groupId>
+                <artifactId>log4j</artifactId>
               </exclusion>
               <exclusion>
-                <groupId>commons-httpclient</groupId>
-                <artifactId>commons-httpclient</artifactId>
+                <groupId>javax.servlet</groupId>
+                <artifactId>servlet-api</artifactId>
               </exclusion>
               <exclusion>
-                <groupId>dnsjava</groupId>
-                <artifactId>dnsjava</artifactId>
+                <groupId>commons-logging</groupId>
+                <artifactId>commons-logging</artifactId>
               </exclusion>
             </exclusions>
           </dependency>
+        </dependencies>
+      </dependencyManagement>
+      <repositories>
+        <repository>
+          <id>cloudera</id>
+          <url>https://repository.cloudera.com/artifactory/cloudera-repos/</url>
+          <releases>
+            <checksumPolicy>fail</checksumPolicy>
+          </releases>
+          <snapshots>
+            <checksumPolicy>fail</checksumPolicy>
+          </snapshots>
+        </repository>
+      </repositories>
+    </profile>
+    <profile>
+      <id>hdp</id>
+      <properties>
+        <alt-hadoop>hdp</alt-hadoop>
+      </properties>
+      <dependencyManagement>
+        <dependencies>
           <dependency>
             <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-client</artifactId>
-            <version>${hadoop.version}</version>
+            <artifactId>hadoop-common</artifactId>
+            <version>2.4.0.2.1.3.0-563</version>
             <exclusions>
               <exclusion>
                 <artifactId>commons-logging</artifactId>
@@ -3065,83 +3094,38 @@
                 <artifactId>jetty-servlet</artifactId>
               </exclusion>
               <exclusion>
-                <groupId>javax.servlet</groupId>
-                <artifactId>servlet-api</artifactId>
-              </exclusion>
-              <exclusion>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-util</artifactId>
-              </exclusion>
-              <exclusion>
-                <artifactId>jets3t</artifactId>
-                <groupId>net.java.dev.jets3t</groupId>
-              </exclusion>
-              <exclusion>
-                <artifactId>log4j</artifactId>
-                <groupId>log4j</groupId>
-              </exclusion>
-              <exclusion>
-                <artifactId>slf4j-log4j12</artifactId>
-                <groupId>org.slf4j</groupId>
-              </exclusion>
-              <exclusion>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-reload4j</artifactId>
+                <groupId>dnsjava</groupId>
+                <artifactId>dnsjava</artifactId>
               </exclusion>
+            </exclusions>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-client</artifactId>
+            <version>2.4.0.2.1.3.0-563</version>
+            <exclusions>
               <exclusion>
-                <artifactId>mockito-all</artifactId>
-                <groupId>org.mockito</groupId>
+                <groupId>javax.servlet</groupId>
+                <artifactId>servlet-api</artifactId>
               </exclusion>
               <exclusion>
-                <artifactId>commons-logging-api</artifactId>
+                <artifactId>commons-logging</artifactId>
                 <groupId>commons-logging</groupId>
               </exclusion>
               <exclusion>
-                <groupId>com.sun.jersey</groupId>
-                <artifactId>jersey-core</artifactId>
-              </exclusion>
-              <exclusion>
-                <groupId>com.sun.jersey</groupId>
-                <artifactId>jersey-server</artifactId>
-              </exclusion>
-              <exclusion>
-                <groupId>com.sun.jersey</groupId>
-                <artifactId>jersey-json</artifactId>
-              </exclusion>
-              <exclusion>
-                <groupId>com.sun.jersey</groupId>
-                <artifactId>jersey-client</artifactId>
-              </exclusion>
-              <exclusion>
-                <artifactId>core</artifactId>
-                <groupId>org.eclipse.jdt</groupId>
-              </exclusion>
-              <exclusion>
-                <groupId>org.codehaus.jackson</groupId>
-                <artifactId>jackson-core-asl</artifactId>
-              </exclusion>
-              <exclusion>
-                <groupId>org.codehaus.jackson</groupId>
-                <artifactId>jackson-mapper-asl</artifactId>
-              </exclusion>
-              <exclusion>
-                <groupId>org.codehaus.jackson</groupId>
-                <artifactId>jackson-xc</artifactId>
-              </exclusion>
-              <exclusion>
-                <groupId>org.codehaus.jackson</groupId>
-                <artifactId>jackson-jaxrs</artifactId>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-server</artifactId>
               </exclusion>
               <exclusion>
-                <groupId>org.apache.hadoop</groupId>
-                <artifactId>hadoop-core</artifactId>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-servlet</artifactId>
               </exclusion>
             </exclusions>
           </dependency>
           <dependency>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-yarn-client</artifactId>
-            <version>${hadoop.version}</version>
+            <version>2.4.0.2.1.3.0-563</version>
             <scope>compile</scope>
             <exclusions>
               <exclusion>
@@ -3194,94 +3178,179 @@
               </exclusion>
             </exclusions>
           </dependency>
-          <dependency>
-            <groupId>org.apache.hive</groupId>
-            <artifactId>hive-maprdb-json-handler</artifactId>
-            <version>${hive.version}</version>
-            <exclusions>
-              <exclusion>
-                <groupId>org.apache.hive</groupId>
-                <artifactId>hive-exec</artifactId>
-              </exclusion>
-            </exclusions>
-          </dependency>
-          <dependency>
-            <groupId>com.mapr.db</groupId>
-            <artifactId>maprdb-mapreduce</artifactId>
-            <version>${mapr.release.version}</version>
-            <exclusions>
-              <exclusion>
-                <groupId>log4j</groupId>
-                <artifactId>log4j</artifactId>
-              </exclusion>
-              <exclusion>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-log4j12</artifactId>
-              </exclusion>
-              <exclusion>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-reload4j</artifactId>
-              </exclusion>
-              <exclusion>
-                <groupId>commons-logging</groupId>
-                <artifactId>commons-logging</artifactId>
-              </exclusion>
-              <exclusion>
-                <groupId>javax.servlet</groupId>
-                <artifactId>servlet-api</artifactId>
-              </exclusion>
-            </exclusions>
-          </dependency>
-          <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xercesImpl</artifactId>
-            <version>${xerces.version}</version>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.parquet</groupId>
-            <artifactId>parquet-hadoop</artifactId>
-            <version>${parquet.version}</version>
-            <exclusions>
-              <exclusion>
-                <groupId>org.xerial.snappy</groupId>
-                <artifactId>snappy-java</artifactId>
-              </exclusion>
-            </exclusions>
-          </dependency>
-          <!-- Test Dependencies -->
-          <dependency>
-            <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-hdfs</artifactId>
-            <version>${hadoop.version}</version>
-            <scope>test</scope>
-            <exclusions>
-              <exclusion>
-                <groupId>commons-logging</groupId>
-                <artifactId>commons-logging</artifactId>
-              </exclusion>
-              <exclusion>
-                <groupId>javax.servlet</groupId>
-                <artifactId>servlet-api</artifactId>
-              </exclusion>
-              <exclusion>
-                <groupId>org.codehaus.jackson</groupId>
-                <artifactId>jackson-core-asl</artifactId>
-              </exclusion>
-              <exclusion>
-                <groupId>org.codehaus.jackson</groupId>
-                <artifactId>jackson-mapper-asl</artifactId>
-              </exclusion>
-            </exclusions>
-          </dependency>
+        </dependencies>
+      </dependencyManagement>
+      <repositories>
+        <repository>
+          <releases>
+            <enabled>true</enabled>
+            <updatePolicy>always</updatePolicy>
+            <checksumPolicy>fail</checksumPolicy>
+          </releases>
+          <snapshots>
+            <enabled>false</enabled>
+            <updatePolicy>never</updatePolicy>
+            <checksumPolicy>fail</checksumPolicy>
+          </snapshots>
+          <id>HDPReleases</id>
+          <name>HDP Releases</name>
+          <url>https://repo.hortonworks.com/content/repositories/releases</url>
+          <layout>default</layout>
+        </repository>
+      </repositories>
+    </profile>
+    <profile>
+      <id>build-contrib</id>
+      <activation>
+        <property>
+          <name>!skipContrib</name>
+        </property>
+      </activation>
+      <modules>
+        <module>contrib</module>
+      </modules>
+    </profile>
+    <profile>
+      <!--
+        If the IDE is Eclipse, it requires you to install an additional Eclipse plugin available here:
+        http://repo1.maven.org/maven2/kr/motd/maven/os-maven-plugin/1.6.1/os-maven-plugin-1.6.1.jar
+        or from your local maven repository:
+        ~/.m2/repository/kr/motd/maven/os-maven-plugin/1.6.1/os-maven-plugin-1.6.1.jar
+        Note that installing this plugin may require you to start with a new workspace
+      -->
+      <id>openssl</id>
+      <activation>
+        <property>
+          <name>enableOpenSSL</name>
+          <value>true</value>
+        </property>
+      </activation>
+      <properties>
+        <!-- Configure the os-maven-plugin extension to expand the classifier on -->
+        <!-- Fedora-"like" systems. Used for netty-tcnative inclusion -->
+        <os.detection.classifierWithLikes>fedora</os.detection.classifierWithLikes>
+        <netty.tcnative.classifier>${os.detected.classifier}</netty.tcnative.classifier>
+      </properties>
+    </profile>
+    <profile>
+      <id>findbugs</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>findbugs-maven-plugin</artifactId>
+            <version>3.0.0</version>
+            <configuration>
+              <!--
+               Enables analysis which takes more memory but finds more bugs.
+               If you run out of memory, changes the value of the effort element
+               to 'Low'.
+               -->
+              <effort>Normal</effort>
+              <!-- Reports all bugs (other values are medium and max) -->
+              <threshold>Low</threshold>
+              <!-- Build doesn't fail if problems are found -->
+              <failOnError>false</failOnError>
+              <!-- Produces XML report -->
+              <xmlOutput>true</xmlOutput>
+              <!-- Configures the directory in which the XML report is created -->
+              <findbugsXmlOutputDirectory>${project.build.directory}/findbugs
+              </findbugsXmlOutputDirectory>
+            </configuration>
+            <executions>
+              <!--
+                Ensures that FindBugs inspects source code when project is compiled.
+              -->
+              <execution>
+                <phase>verify</phase>
+                <goals>
+                  <goal>check</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>xml-maven-plugin</artifactId>
+            <version>1.0</version>
+            <executions>
+              <execution>
+                <phase>verify</phase>
+                <goals>
+                  <goal>transform</goal>
+                </goals>
+              </execution>
+            </executions>
+            <configuration>
+              <transformationSets>
+                <transformationSet>
+                  <dir>${project.build.directory}/findbugs</dir>
+                  <outputDir>${project.build.directory}/findbugs</outputDir>
+                  <stylesheet>fancy-hist.xsl</stylesheet>
+                  <!--<stylesheet>default.xsl</stylesheet>-->
+                  <!--<stylesheet>plain.xsl</stylesheet>-->
+                  <!--<stylesheet>fancy.xsl</stylesheet>-->
+                  <!--<stylesheet>summary.xsl</stylesheet>-->
+                  <fileMappers>
+                    <fileMapper implementation="org.codehaus.plexus.components.io.filemappers.FileExtensionMapper">
+                      <targetExtension>.html</targetExtension>
+                    </fileMapper>
+                  </fileMappers>
+                </transformationSet>
+              </transformationSets>
+            </configuration>
+            <dependencies>
+              <dependency>
+                <groupId>com.google.code.findbugs</groupId>
+                <artifactId>findbugs</artifactId>
+                <version>2.0.0</version>
+              </dependency>
+            </dependencies>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>jdk9+</id>
+      <activation>
+        <jdk>[9,)</jdk>
+      </activation>
+      <properties>
+        <maven.compiler.release>8</maven.compiler.release>
+        <junit.args>
+          --add-opens java.base/java.lang=ALL-UNNAMED
+          --add-opens java.base/java.net=ALL-UNNAMED
+          --add-opens java.base/java.nio=ALL-UNNAMED
+          --add-opens java.base/java.util=ALL-UNNAMED
+          --add-opens java.base/sun.nio.ch=ALL-UNNAMED
+          --add-opens java.security.jgss/sun.security.krb5=ALL-UNNAMED
+        </junit.args>
+      </properties>
+    </profile>
+    <profile>
+      <id>hadoop-2</id>
+      <activation>
+        <property>
+          <name>hadoop-2</name>
+        </property>
+      </activation>
+      <properties>
+        <hadoop.version>2.10.2</hadoop.version>
+        <hbase.version>2.5.5</hbase.version>
+      </properties>
+      <dependencyManagement>
+        <dependencies>
           <dependency>
             <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-yarn-api</artifactId>
+            <artifactId>hadoop-common</artifactId>
             <version>${hadoop.version}</version>
-            <scope>test</scope>
             <exclusions>
               <exclusion>
-                <groupId>commons-logging</groupId>
                 <artifactId>commons-logging</artifactId>
+                <groupId>commons-logging</groupId>
               </exclusion>
               <exclusion>
                 <groupId>org.eclipse.jetty</groupId>
@@ -3296,31 +3365,32 @@
                 <artifactId>servlet-api</artifactId>
               </exclusion>
               <exclusion>
-                <groupId>log4j</groupId>
-                <artifactId>log4j</artifactId>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-util</artifactId>
               </exclusion>
-            </exclusions>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.hbase</groupId>
-            <artifactId>hbase-client</artifactId>
-            <version>${hbase.version}</version>
-            <exclusions>
               <exclusion>
-                <groupId>javax.servlet</groupId>
-                <artifactId>servlet-api</artifactId>
+                <groupId>com.sun.jersey</groupId>
+                <artifactId>jersey-core</artifactId>
               </exclusion>
               <exclusion>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-server</artifactId>
+                <groupId>com.sun.jersey</groupId>
+                <artifactId>jersey-server</artifactId>
               </exclusion>
               <exclusion>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-servlet</artifactId>
+                <groupId>com.sun.jersey</groupId>
+                <artifactId>jersey-json</artifactId>
               </exclusion>
               <exclusion>
-                <groupId>commons-logging</groupId>
-                <artifactId>commons-logging</artifactId>
+                <groupId>com.sun.jersey</groupId>
+                <artifactId>jersey-client</artifactId>
+              </exclusion>
+              <exclusion>
+                <artifactId>jets3t</artifactId>
+                <groupId>net.java.dev.jets3t</groupId>
+              </exclusion>
+              <exclusion>
+                <artifactId>log4j</artifactId>
+                <groupId>log4j</groupId>
               </exclusion>
               <exclusion>
                 <artifactId>slf4j-log4j12</artifactId>
@@ -3331,83 +3401,87 @@
                 <artifactId>slf4j-reload4j</artifactId>
               </exclusion>
               <exclusion>
-                <artifactId>log4j</artifactId>
-                <groupId>log4j</groupId>
+                <artifactId>reload4j</artifactId>
+                <groupId>ch.qos.reload4j</groupId>
               </exclusion>
               <exclusion>
-                <groupId>com.sun.jersey</groupId>
-                <artifactId>jersey-core</artifactId>
+                <artifactId>slf4j-reload4j</artifactId>
+                <groupId>org.slf4j</groupId>
               </exclusion>
               <exclusion>
-                <groupId>com.sun.jersey</groupId>
-                <artifactId>jersey-server</artifactId>
+                <artifactId>mockito-all</artifactId>
+                <groupId>org.mockito</groupId>
               </exclusion>
               <exclusion>
-                <groupId>com.sun.jersey</groupId>
-                <artifactId>jersey-json</artifactId>
+                <artifactId>commons-logging-api</artifactId>
+                <groupId>commons-logging</groupId>
               </exclusion>
               <exclusion>
-                <groupId>com.sun.jersey</groupId>
-                <artifactId>jersey-client</artifactId>
+                <artifactId>core</artifactId>
+                <groupId>org.eclipse.jdt</groupId>
               </exclusion>
               <exclusion>
-                <groupId>org.codehaus.jackson</groupId>
-                <artifactId>jackson-core-asl</artifactId>
+                <groupId>org.apache.hadoop</groupId>
+                <artifactId>hadoop-core</artifactId>
               </exclusion>
               <exclusion>
-                <groupId>org.codehaus.jackson</groupId>
-                <artifactId>jackson-mapper-asl</artifactId>
+                <groupId>commons-httpclient</groupId>
+                <artifactId>commons-httpclient</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>dnsjava</groupId>
+                <artifactId>dnsjava</artifactId>
               </exclusion>
             </exclusions>
           </dependency>
           <dependency>
-            <groupId>org.apache.hbase</groupId>
-            <artifactId>hbase-server</artifactId>
-            <version>${hbase.version}</version>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-client</artifactId>
+            <version>${hadoop.version}</version>
             <exclusions>
               <exclusion>
-                <groupId>tomcat</groupId>
-                <artifactId>jasper-compiler</artifactId>
+                <artifactId>commons-logging</artifactId>
+                <groupId>commons-logging</groupId>
               </exclusion>
               <exclusion>
-                <groupId>tomcat</groupId>
-                <artifactId>jasper-runtime</artifactId>
-              </exclusion>
-              <exclusion>
-                <groupId>javax.servlet</groupId>
-                <artifactId>servlet-api</artifactId>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-server</artifactId>
               </exclusion>
               <exclusion>
                 <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-server</artifactId>
+                <artifactId>jetty-servlet</artifactId>
               </exclusion>
               <exclusion>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-servlet</artifactId>
+                <groupId>javax.servlet</groupId>
+                <artifactId>servlet-api</artifactId>
               </exclusion>
               <exclusion>
-                <artifactId>jetty-jsp</artifactId>
                 <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-util</artifactId>
               </exclusion>
               <exclusion>
-                <artifactId>jamon-runtime</artifactId>
-                <groupId>org.jamon</groupId>
+                <artifactId>jets3t</artifactId>
+                <groupId>net.java.dev.jets3t</groupId>
               </exclusion>
               <exclusion>
-                <groupId>commons-logging</groupId>
-                <artifactId>commons-logging</artifactId>
+                <artifactId>log4j</artifactId>
+                <groupId>log4j</groupId>
               </exclusion>
               <exclusion>
                 <artifactId>slf4j-log4j12</artifactId>
                 <groupId>org.slf4j</groupId>
               </exclusion>
               <exclusion>
-                <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-reload4j</artifactId>
+                <groupId>org.slf4j</groupId>
               </exclusion>
               <exclusion>
-                <artifactId>log4j</artifactId>
-                <groupId>log4j</groupId>
+                <artifactId>mockito-all</artifactId>
+                <groupId>org.mockito</groupId>
+              </exclusion>
+              <exclusion>
+                <artifactId>commons-logging-api</artifactId>
+                <groupId>commons-logging</groupId>
               </exclusion>
               <exclusion>
                 <groupId>com.sun.jersey</groupId>
@@ -3425,174 +3499,92 @@
                 <groupId>com.sun.jersey</groupId>
                 <artifactId>jersey-client</artifactId>
               </exclusion>
-            </exclusions>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.hbase</groupId>
-            <artifactId>hbase-testing-util</artifactId>
-            <classifier>tests</classifier>
-            <version>${hbase.version}</version>
-            <scope>test</scope>
-            <exclusions>
-              <exclusion>
-                <groupId>javax.servlet</groupId>
-                <artifactId>servlet-api</artifactId>
-              </exclusion>
-              <exclusion>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-server</artifactId>
-              </exclusion>
-              <exclusion>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-servlet</artifactId>
-              </exclusion>
-              <exclusion>
-                <artifactId>commons-logging</artifactId>
-                <groupId>commons-logging</groupId>
-              </exclusion>
-              <exclusion>
-                <artifactId>slf4j-log4j12</artifactId>
-                <groupId>org.slf4j</groupId>
-              </exclusion>
-              <exclusion>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-reload4j</artifactId>
-              </exclusion>
               <exclusion>
-                <artifactId>asm</artifactId>
-                <groupId>asm</groupId>
+                <artifactId>core</artifactId>
+                <groupId>org.eclipse.jdt</groupId>
               </exclusion>
               <exclusion>
-                <groupId>org.apache.hbase</groupId>
-                <artifactId>hbase-annotations</artifactId>
+                <groupId>org.codehaus.jackson</groupId>
+                <artifactId>jackson-core-asl</artifactId>
               </exclusion>
               <exclusion>
-                <groupId>tomcat</groupId>
-                <artifactId>jasper-compiler</artifactId>
+                <groupId>org.codehaus.jackson</groupId>
+                <artifactId>jackson-mapper-asl</artifactId>
               </exclusion>
               <exclusion>
-                <groupId>tomcat</groupId>
-                <artifactId>jasper-runtime</artifactId>
+                <groupId>org.codehaus.jackson</groupId>
+                <artifactId>jackson-xc</artifactId>
               </exclusion>
-            </exclusions>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.curator</groupId>
-            <artifactId>curator-test</artifactId>
-            <version>${curator.test.version}</version>
-            <scope>test</scope>
-            <exclusions>
               <exclusion>
-                <groupId>log4j</groupId>
-                <artifactId>log4j</artifactId>
+                <groupId>org.codehaus.jackson</groupId>
+                <artifactId>jackson-jaxrs</artifactId>
               </exclusion>
-            </exclusions>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.hbase</groupId>
-            <artifactId>hbase-annotations</artifactId>
-            <version>${hbase.version}</version>
-            <exclusions>
               <exclusion>
-                <artifactId>log4j</artifactId>
-                <groupId>log4j</groupId>
+                <groupId>org.apache.hadoop</groupId>
+                <artifactId>hadoop-core</artifactId>
               </exclusion>
               <exclusion>
-                <groupId>jdk.tools</groupId>
-                <artifactId>jdk.tools</artifactId>
+                <groupId>com.zaxxer</groupId>
+                <artifactId>HikariCP-java7</artifactId>
               </exclusion>
             </exclusions>
           </dependency>
           <dependency>
-            <groupId>org.apache.hbase</groupId>
-            <artifactId>hbase-common</artifactId>
-            <version>${hbase.version}</version>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-mapreduce-client-core</artifactId>
+            <version>${hadoop.version}</version>
+            <scope>compile</scope>
             <exclusions>
               <exclusion>
-                <artifactId>log4j</artifactId>
-                <groupId>log4j</groupId>
-              </exclusion>
-              <exclusion>
-                <artifactId>commons-logging</artifactId>
-                <groupId>commons-logging</groupId>
+                <artifactId>reload4j</artifactId>
+                <groupId>ch.qos.reload4j</groupId>
               </exclusion>
-            </exclusions>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.hbase</groupId>
-            <artifactId>hbase-protocol</artifactId>
-            <version>${hbase.version}</version>
-            <exclusions>
               <exclusion>
-                <artifactId>log4j</artifactId>
-                <groupId>log4j</groupId>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-reload4j</artifactId>
               </exclusion>
               <exclusion>
-                <artifactId>commons-logging</artifactId>
-                <groupId>commons-logging</groupId>
+                <groupId>io.netty</groupId>
+                <artifactId>netty</artifactId>
               </exclusion>
             </exclusions>
           </dependency>
-        </dependencies>
-      </dependencyManagement>
-    </profile>
-    <profile>
-      <id>cdh</id>
-      <properties>
-        <alt-hadoop>cdh4</alt-hadoop>
-      </properties>
-      <dependencyManagement>
-        <dependencies>
           <dependency>
             <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-common</artifactId>
-            <version>2.3.0-cdh5.0.3</version>
+            <artifactId>hadoop-auth</artifactId>
+            <version>${hadoop.version}</version>
+            <scope>compile</scope>
             <exclusions>
               <exclusion>
-                <artifactId>commons-logging</artifactId>
-                <groupId>commons-logging</groupId>
-              </exclusion>
-              <exclusion>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-server</artifactId>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-reload4j</artifactId>
               </exclusion>
               <exclusion>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-servlet</artifactId>
+                <artifactId>reload4j</artifactId>
+                <groupId>ch.qos.reload4j</groupId>
               </exclusion>
               <exclusion>
-                <groupId>dnsjava</groupId>
-                <artifactId>dnsjava</artifactId>
+                <groupId>org.ow2.asm</groupId>
+                <artifactId>asm</artifactId>
               </exclusion>
             </exclusions>
           </dependency>
           <dependency>
             <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-client</artifactId>
-            <version>2.3.0-cdh5.0.3</version>
+            <artifactId>hadoop-yarn-common</artifactId>
+            <version>${hadoop.version}</version>
+            <scope>compile</scope>
             <exclusions>
               <exclusion>
-                <groupId>javax.servlet</groupId>
-                <artifactId>servlet-api</artifactId>
-              </exclusion>
-              <exclusion>
-                <artifactId>commons-logging</artifactId>
-                <groupId>commons-logging</groupId>
-              </exclusion>
-              <exclusion>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-server</artifactId>
-              </exclusion>
-              <exclusion>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-servlet</artifactId>
+                <artifactId>reload4j</artifactId>
+                <groupId>ch.qos.reload4j</groupId>
               </exclusion>
             </exclusions>
           </dependency>
           <dependency>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-yarn-client</artifactId>
-            <version>2.3.0-cdh5.0.3</version>
+            <version>${hadoop.version}</version>
             <scope>compile</scope>
             <exclusions>
               <exclusion>
@@ -3643,46 +3635,51 @@
                 <groupId>commons-logging</groupId>
                 <artifactId>commons-logging</artifactId>
               </exclusion>
+              <exclusion>
+                <artifactId>reload4j</artifactId>
+                <groupId>ch.qos.reload4j</groupId>
+              </exclusion>
             </exclusions>
           </dependency>
-        </dependencies>
-      </dependencyManagement>
-      <repositories>
-        <repository>
-          <id>cloudera</id>
-          <url>https://repository.cloudera.com/artifactory/cloudera-repos/</url>
-          <releases>
-            <checksumPolicy>fail</checksumPolicy>
-          </releases>
-          <snapshots>
-            <checksumPolicy>fail</checksumPolicy>
-          </snapshots>
-        </repository>
-      </repositories>
-    </profile>
-    <profile>
-      <id>hdp</id>
-      <properties>
-        <alt-hadoop>hdp</alt-hadoop>
-      </properties>
-      <dependencyManagement>
-        <dependencies>
+          <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+            <version>${xerces.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.parquet</groupId>
+            <artifactId>parquet-hadoop</artifactId>
+            <version>${parquet.version}</version>
+            <exclusions>
+              <exclusion>
+                <groupId>org.xerial.snappy</groupId>
+                <artifactId>snappy-java</artifactId>
+              </exclusion>
+            </exclusions>
+          </dependency>
+          <!-- Test Dependencies -->
           <dependency>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-common</artifactId>
-            <version>2.4.0.2.1.3.0-563</version>
+            <version>${hadoop.version}</version>
+            <classifier>tests</classifier>
+            <scope>test</scope>
             <exclusions>
               <exclusion>
-                <artifactId>commons-logging</artifactId>
                 <groupId>commons-logging</groupId>
+                <artifactId>commons-logging</artifactId>
               </exclusion>
               <exclusion>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-server</artifactId>
+                <artifactId>reload4j</artifactId>
+                <groupId>ch.qos.reload4j</groupId>
               </exclusion>
               <exclusion>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-servlet</artifactId>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-reload4j</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>javax.servlet</groupId>
+                <artifactId>servlet-api</artifactId>
               </exclusion>
               <exclusion>
                 <groupId>dnsjava</groupId>
@@ -3692,16 +3689,73 @@
           </dependency>
           <dependency>
             <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-client</artifactId>
-            <version>2.4.0.2.1.3.0-563</version>
+            <artifactId>hadoop-hdfs</artifactId>
+            <version>${hadoop.version}</version>
+            <scope>test</scope>
             <exclusions>
               <exclusion>
-                <groupId>javax.servlet</groupId>
-                <artifactId>servlet-api</artifactId>
+                <groupId>commons-codec</groupId>
+                <artifactId>commons-codec</artifactId>
               </exclusion>
               <exclusion>
+                <groupId>commons-logging</groupId>
                 <artifactId>commons-logging</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>com.sun.jersey</groupId>
+                <artifactId>jersey-core</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>com.sun.jersey</groupId>
+                <artifactId>jersey-server</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>com.sun.jersey</groupId>
+                <artifactId>jersey-json</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>javax.servlet</groupId>
+                <artifactId>servlet-api</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>org.codehaus.jackson</groupId>
+                <artifactId>jackson-core-asl</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>org.codehaus.jackson</groupId>
+                <artifactId>jackson-mapper-asl</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>log4j</groupId>
+                <artifactId>log4j</artifactId>
+              </exclusion>
+              <exclusion>
+                <artifactId>reload4j</artifactId>
+                <groupId>ch.qos.reload4j</groupId>
+              </exclusion>
+              <exclusion>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-reload4j</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-all</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>io.netty</groupId>
+                <artifactId>netty</artifactId>
+              </exclusion>
+            </exclusions>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-yarn-api</artifactId>
+            <version>${hadoop.version}</version>
+            <scope>test</scope>
+            <exclusions>
+              <exclusion>
                 <groupId>commons-logging</groupId>
+                <artifactId>commons-logging</artifactId>
               </exclusion>
               <exclusion>
                 <groupId>org.eclipse.jetty</groupId>
@@ -3711,14 +3765,41 @@
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-servlet</artifactId>
               </exclusion>
+              <exclusion>
+                <groupId>log4j</groupId>
+                <artifactId>log4j</artifactId>
+              </exclusion>
             </exclusions>
           </dependency>
           <dependency>
-            <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-yarn-client</artifactId>
-            <version>2.4.0.2.1.3.0-563</version>
-            <scope>compile</scope>
+            <groupId>org.apache.hbase</groupId>
+            <artifactId>hbase-client</artifactId>
+            <version>${hbase.version}</version>
             <exclusions>
+              <exclusion>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-server</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-servlet</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>commons-logging</groupId>
+                <artifactId>commons-logging</artifactId>
+              </exclusion>
+              <exclusion>
+                <artifactId>slf4j-log4j12</artifactId>
+                <groupId>org.slf4j</groupId>
+              </exclusion>
+              <exclusion>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-reload4j</artifactId>
+              </exclusion>
+              <exclusion>
+                <artifactId>log4j</artifactId>
+                <groupId>log4j</groupId>
+              </exclusion>
               <exclusion>
                 <groupId>com.sun.jersey</groupId>
                 <artifactId>jersey-core</artifactId>
@@ -3743,194 +3824,201 @@
                 <groupId>org.codehaus.jackson</groupId>
                 <artifactId>jackson-mapper-asl</artifactId>
               </exclusion>
+            </exclusions>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.hbase</groupId>
+            <artifactId>hbase-server</artifactId>
+            <version>${hbase.version}</version>
+            <exclusions>
               <exclusion>
-                <groupId>org.codehaus.jackson</groupId>
-                <artifactId>jackson-xc</artifactId>
+                <groupId>tomcat</groupId>
+                <artifactId>jasper-compiler</artifactId>
               </exclusion>
               <exclusion>
-                <groupId>org.codehaus.jackson</groupId>
-                <artifactId>jackson-jaxrs</artifactId>
+                <groupId>tomcat</groupId>
+                <artifactId>jasper-runtime</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>javax.servlet</groupId>
+                <artifactId>servlet-api</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-server</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-servlet</artifactId>
+              </exclusion>
+              <exclusion>
+                <artifactId>jetty-jsp</artifactId>
+                <groupId>org.eclipse.jetty</groupId>
+              </exclusion>
+              <exclusion>
+                <artifactId>jamon-runtime</artifactId>
+                <groupId>org.jamon</groupId>
+              </exclusion>
+              <exclusion>
+                <groupId>commons-logging</groupId>
+                <artifactId>commons-logging</artifactId>
+              </exclusion>
+              <exclusion>
+                <artifactId>slf4j-log4j12</artifactId>
+                <groupId>org.slf4j</groupId>
+              </exclusion>
+              <exclusion>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-reload4j</artifactId>
               </exclusion>
-
-              <!-- Exclude the following to prevent enforcer failures. YARN uses them,
-                   but Drill forbids them. -->
-
               <exclusion>
-                <groupId>log4j</groupId>
                 <artifactId>log4j</artifactId>
+                <groupId>log4j</groupId>
               </exclusion>
+              <exclusion>
+                <groupId>com.sun.jersey</groupId>
+                <artifactId>jersey-core</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>com.sun.jersey</groupId>
+                <artifactId>jersey-server</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>com.sun.jersey</groupId>
+                <artifactId>jersey-json</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>com.sun.jersey</groupId>
+                <artifactId>jersey-client</artifactId>
+              </exclusion>
+            </exclusions>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.hbase</groupId>
+            <artifactId>hbase-testing-util</artifactId>
+            <classifier>tests</classifier>
+            <version>${hbase.version}</version>
+            <scope>test</scope>
+            <exclusions>
               <exclusion>
                 <groupId>javax.servlet</groupId>
                 <artifactId>servlet-api</artifactId>
               </exclusion>
               <exclusion>
-                <groupId>commons-logging</groupId>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-server</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-servlet</artifactId>
+              </exclusion>
+              <exclusion>
                 <artifactId>commons-logging</artifactId>
+                <groupId>commons-logging</groupId>
+              </exclusion>
+              <exclusion>
+                <artifactId>slf4j-log4j12</artifactId>
+                <groupId>org.slf4j</groupId>
+              </exclusion>
+              <exclusion>
+                <artifactId>slf4j-reload4j</artifactId>
+                <groupId>org.slf4j</groupId>
+              </exclusion>
+              <exclusion>
+                <artifactId>asm</artifactId>
+                <groupId>asm</groupId>
+              </exclusion>
+              <exclusion>
+                <groupId>org.apache.hbase</groupId>
+                <artifactId>hbase-annotations</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>tomcat</groupId>
+                <artifactId>jasper-compiler</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>tomcat</groupId>
+                <artifactId>jasper-runtime</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>commons-httpclient</groupId>
+                <artifactId>commons-httpclient</artifactId>
               </exclusion>
             </exclusions>
           </dependency>
-        </dependencies>
-      </dependencyManagement>
-      <repositories>
-        <repository>
-          <releases>
-            <enabled>true</enabled>
-            <updatePolicy>always</updatePolicy>
-            <checksumPolicy>fail</checksumPolicy>
-          </releases>
-          <snapshots>
-            <enabled>false</enabled>
-            <updatePolicy>never</updatePolicy>
-            <checksumPolicy>fail</checksumPolicy>
-          </snapshots>
-          <id>HDPReleases</id>
-          <name>HDP Releases</name>
-          <url>https://repo.hortonworks.com/content/repositories/releases</url>
-          <layout>default</layout>
-        </repository>
-      </repositories>
-    </profile>
-    <profile>
-      <id>build-contrib</id>
-      <activation>
-        <property>
-          <name>!skipContrib</name>
-        </property>
-      </activation>
-      <modules>
-        <module>contrib</module>
-      </modules>
-    </profile>
-    <profile>
-      <!--
-        If the IDE is Eclipse, it requires you to install an additional Eclipse plugin available here:
-        http://repo1.maven.org/maven2/kr/motd/maven/os-maven-plugin/1.6.1/os-maven-plugin-1.6.1.jar
-        or from your local maven repository:
-        ~/.m2/repository/kr/motd/maven/os-maven-plugin/1.6.1/os-maven-plugin-1.6.1.jar
-        Note that installing this plugin may require you to start with a new workspace
-      -->
-      <id>openssl</id>
-      <activation>
-        <property>
-          <name>enableOpenSSL</name>
-          <value>true</value>
-        </property>
-      </activation>
-      <properties>
-        <!-- Configure the os-maven-plugin extension to expand the classifier on -->
-        <!-- Fedora-"like" systems. Used for netty-tcnative inclusion -->
-        <os.detection.classifierWithLikes>fedora</os.detection.classifierWithLikes>
-        <netty.tcnative.classifier>${os.detected.classifier}</netty.tcnative.classifier>
-      </properties>
-    </profile>
-    <profile>
-      <id>findbugs</id>
-      <activation>
-        <activeByDefault>false</activeByDefault>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>findbugs-maven-plugin</artifactId>
-            <version>3.0.0</version>
-            <configuration>
-              <!--
-               Enables analysis which takes more memory but finds more bugs.
-               If you run out of memory, changes the value of the effort element
-               to 'Low'.
-               -->
-              <effort>Normal</effort>
-              <!-- Reports all bugs (other values are medium and max) -->
-              <threshold>Low</threshold>
-              <!-- Build doesn't fail if problems are found -->
-              <failOnError>false</failOnError>
-              <!-- Produces XML report -->
-              <xmlOutput>true</xmlOutput>
-              <!-- Configures the directory in which the XML report is created -->
-              <findbugsXmlOutputDirectory>${project.build.directory}/findbugs
-              </findbugsXmlOutputDirectory>
-            </configuration>
-            <executions>
-              <!--
-                Ensures that FindBugs inspects source code when project is compiled.
-              -->
-              <execution>
-                <phase>verify</phase>
-                <goals>
-                  <goal>check</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>xml-maven-plugin</artifactId>
-            <version>1.0</version>
-            <executions>
-              <execution>
-                <phase>verify</phase>
-                <goals>
-                  <goal>transform</goal>
-                </goals>
-              </execution>
-            </executions>
-            <configuration>
-              <transformationSets>
-                <transformationSet>
-                  <dir>${project.build.directory}/findbugs</dir>
-                  <outputDir>${project.build.directory}/findbugs</outputDir>
-                  <stylesheet>fancy-hist.xsl</stylesheet>
-                  <!--<stylesheet>default.xsl</stylesheet>-->
-                  <!--<stylesheet>plain.xsl</stylesheet>-->
-                  <!--<stylesheet>fancy.xsl</stylesheet>-->
-                  <!--<stylesheet>summary.xsl</stylesheet>-->
-                  <fileMappers>
-                    <fileMapper implementation="org.codehaus.plexus.components.io.filemappers.FileExtensionMapper">
-                      <targetExtension>.html</targetExtension>
-                    </fileMapper>
-                  </fileMappers>
-                </transformationSet>
-              </transformationSets>
-            </configuration>
-            <dependencies>
-              <dependency>
-                <groupId>com.google.code.findbugs</groupId>
-                <artifactId>findbugs</artifactId>
-                <version>2.0.0</version>
-              </dependency>
-            </dependencies>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
-      <id>jdk9+</id>
-      <activation>
-        <jdk>[9,)</jdk>
-      </activation>
-      <properties>
-        <maven.compiler.release>8</maven.compiler.release>
-        <junit.args>
-          --add-opens java.base/java.lang=ALL-UNNAMED
-          --add-opens java.base/java.net=ALL-UNNAMED
-          --add-opens java.base/java.nio=ALL-UNNAMED
-          --add-opens java.base/java.util=ALL-UNNAMED
-          --add-opens java.base/sun.nio.ch=ALL-UNNAMED
-          --add-opens java.security.jgss/sun.security.krb5=ALL-UNNAMED
-        </junit.args>
-      </properties>
+          <dependency>
+            <groupId>org.apache.curator</groupId>
+            <artifactId>curator-test</artifactId>
+            <version>${curator.version}</version>
+            <scope>test</scope>
+            <exclusions>
+              <exclusion>
+                <groupId>log4j</groupId>
+                <artifactId>log4j</artifactId>
+              </exclusion>
+            </exclusions>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.hbase</groupId>
+            <artifactId>hbase-annotations</artifactId>
+            <version>${hbase.version}</version>
+            <exclusions>
+              <exclusion>
+                <artifactId>log4j</artifactId>
+                <groupId>log4j</groupId>
+              </exclusion>
+              <exclusion>
+                <groupId>jdk.tools</groupId>
+                <artifactId>jdk.tools</artifactId>
+              </exclusion>
+            </exclusions>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.hbase</groupId>
+            <artifactId>hbase-common</artifactId>
+            <version>${hbase.version}</version>
+            <exclusions>
+              <exclusion>
+                <artifactId>log4j</artifactId>
+                <groupId>log4j</groupId>
+              </exclusion>
+              <exclusion>
+                <artifactId>commons-logging</artifactId>
+                <groupId>commons-logging</groupId>
+              </exclusion>
+            </exclusions>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.hbase</groupId>
+            <artifactId>hbase-protocol</artifactId>
+            <version>${hbase.version}</version>
+            <exclusions>
+              <exclusion>
+                <artifactId>log4j</artifactId>
+                <groupId>log4j</groupId>
+              </exclusion>
+              <exclusion>
+                <artifactId>commons-logging</artifactId>
+                <groupId>commons-logging</groupId>
+              </exclusion>
+            </exclusions>
+          </dependency>
+        </dependencies>
+      </dependencyManagement>
     </profile>
+    <!-- Profiles that are no longer supported. -->
+    <!--
     <profile>
-      <id>hadoop-2</id>
-      <activation>
-        <property>
-          <name>hadoop-2</name>
-        </property>
-      </activation>
+      <id>mapr</id>
       <properties>
-        <hadoop.version>2.10.2</hadoop.version>
-        <hbase.version>2.5.5</hbase.version>
+        <alt-hadoop>mapr</alt-hadoop>
+        <hive.version>2.3.3-mapr-1808</hive.version>
+        <hbase.version>1.1.1-mapr-1602-m7-5.2.0</hbase.version>
+        <hadoop.version>2.7.0-mapr-1808</hadoop.version>
+        <zookeeper.version>3.4.11-mapr-1808</zookeeper.version>
+        <!== TODO: Remove this property and use a common dependency of curator-test after ZooKeeper 3.5+
+        for MapR profile is released. See problem description in https://issues.apache.org/jira/browse/CURATOR-428 ==>
+        <curator.test.version>2.13.0</curator.test.version>
       </properties>
       <dependencyManagement>
         <dependencies>
@@ -3987,14 +4075,6 @@
                 <artifactId>slf4j-log4j12</artifactId>
                 <groupId>org.slf4j</groupId>
               </exclusion>
-              <exclusion>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-reload4j</artifactId>
-              </exclusion>
-              <exclusion>
-                <artifactId>reload4j</artifactId>
-                <groupId>ch.qos.reload4j</groupId>
-              </exclusion>
               <exclusion>
                 <artifactId>slf4j-reload4j</artifactId>
                 <groupId>org.slf4j</groupId>
@@ -4011,6 +4091,22 @@
                 <artifactId>core</artifactId>
                 <groupId>org.eclipse.jdt</groupId>
               </exclusion>
+              <exclusion>
+                <groupId>org.codehaus.jackson</groupId>
+                <artifactId>jackson-core-asl</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>org.codehaus.jackson</groupId>
+                <artifactId>jackson-mapper-asl</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>org.codehaus.jackson</groupId>
+                <artifactId>jackson-xc</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>org.codehaus.jackson</groupId>
+                <artifactId>jackson-jaxrs</artifactId>
+              </exclusion>
               <exclusion>
                 <groupId>org.apache.hadoop</groupId>
                 <artifactId>hadoop-core</artifactId>
@@ -4063,8 +4159,8 @@
                 <groupId>org.slf4j</groupId>
               </exclusion>
               <exclusion>
-                <artifactId>slf4j-reload4j</artifactId>
                 <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-reload4j</artifactId>
               </exclusion>
               <exclusion>
                 <artifactId>mockito-all</artifactId>
@@ -4114,62 +4210,6 @@
                 <groupId>org.apache.hadoop</groupId>
                 <artifactId>hadoop-core</artifactId>
               </exclusion>
-              <exclusion>
-                <groupId>com.zaxxer</groupId>
-                <artifactId>HikariCP-java7</artifactId>
-              </exclusion>
-            </exclusions>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-mapreduce-client-core</artifactId>
-            <version>${hadoop.version}</version>
-            <scope>compile</scope>
-            <exclusions>
-              <exclusion>
-                <artifactId>reload4j</artifactId>
-                <groupId>ch.qos.reload4j</groupId>
-              </exclusion>
-              <exclusion>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-reload4j</artifactId>
-              </exclusion>
-              <exclusion>
-                <groupId>io.netty</groupId>
-                <artifactId>netty</artifactId>
-              </exclusion>
-            </exclusions>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-auth</artifactId>
-            <version>${hadoop.version}</version>
-            <scope>compile</scope>
-            <exclusions>
-              <exclusion>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-reload4j</artifactId>
-              </exclusion>
-              <exclusion>
-                <artifactId>reload4j</artifactId>
-                <groupId>ch.qos.reload4j</groupId>
-              </exclusion>
-              <exclusion>
-                <groupId>org.ow2.asm</groupId>
-                <artifactId>asm</artifactId>
-              </exclusion>
-            </exclusions>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-yarn-common</artifactId>
-            <version>${hadoop.version}</version>
-            <scope>compile</scope>
-            <exclusions>
-              <exclusion>
-                <artifactId>reload4j</artifactId>
-                <groupId>ch.qos.reload4j</groupId>
-              </exclusion>
             </exclusions>
           </dependency>
           <dependency>
@@ -4211,8 +4251,8 @@
                 <artifactId>jackson-jaxrs</artifactId>
               </exclusion>
 
-              <!-- Exclude the following to prevent enforcer failures. YARN uses them,
-                   but Drill forbids them. -->
+              <!== Exclude the following to prevent enforcer failures. YARN uses them,
+                   but Drill forbids them. ==>
 
               <exclusion>
                 <groupId>log4j</groupId>
@@ -4226,84 +4266,73 @@
                 <groupId>commons-logging</groupId>
                 <artifactId>commons-logging</artifactId>
               </exclusion>
-              <exclusion>
-                <artifactId>reload4j</artifactId>
-                <groupId>ch.qos.reload4j</groupId>
-              </exclusion>
             </exclusions>
           </dependency>
           <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xercesImpl</artifactId>
-            <version>${xerces.version}</version>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.parquet</groupId>
-            <artifactId>parquet-hadoop</artifactId>
-            <version>${parquet.version}</version>
+            <groupId>org.apache.hive</groupId>
+            <artifactId>hive-maprdb-json-handler</artifactId>
+            <version>${hive.version}</version>
             <exclusions>
               <exclusion>
-                <groupId>org.xerial.snappy</groupId>
-                <artifactId>snappy-java</artifactId>
+                <groupId>org.apache.hive</groupId>
+                <artifactId>hive-exec</artifactId>
               </exclusion>
             </exclusions>
           </dependency>
-          <!-- Test Dependencies -->
           <dependency>
-            <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-common</artifactId>
-            <version>${hadoop.version}</version>
-            <classifier>tests</classifier>
-            <scope>test</scope>
+            <groupId>com.mapr.db</groupId>
+            <artifactId>maprdb-mapreduce</artifactId>
+            <version>${mapr.release.version}</version>
             <exclusions>
               <exclusion>
-                <groupId>commons-logging</groupId>
-                <artifactId>commons-logging</artifactId>
+                <groupId>log4j</groupId>
+                <artifactId>log4j</artifactId>
               </exclusion>
               <exclusion>
-                <artifactId>reload4j</artifactId>
-                <groupId>ch.qos.reload4j</groupId>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-log4j12</artifactId>
               </exclusion>
               <exclusion>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-reload4j</artifactId>
               </exclusion>
+              <exclusion>
+                <groupId>commons-logging</groupId>
+                <artifactId>commons-logging</artifactId>
+              </exclusion>
               <exclusion>
                 <groupId>javax.servlet</groupId>
                 <artifactId>servlet-api</artifactId>
               </exclusion>
+            </exclusions>
+          </dependency>
+          <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+            <version>${xerces.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.parquet</groupId>
+            <artifactId>parquet-hadoop</artifactId>
+            <version>${parquet.version}</version>
+            <exclusions>
               <exclusion>
-                <groupId>dnsjava</groupId>
-                <artifactId>dnsjava</artifactId>
+                <groupId>org.xerial.snappy</groupId>
+                <artifactId>snappy-java</artifactId>
               </exclusion>
             </exclusions>
           </dependency>
+          <!== Test Dependencies ==>
           <dependency>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-hdfs</artifactId>
             <version>${hadoop.version}</version>
             <scope>test</scope>
             <exclusions>
-              <exclusion>
-                <groupId>commons-codec</groupId>
-                <artifactId>commons-codec</artifactId>
-              </exclusion>
               <exclusion>
                 <groupId>commons-logging</groupId>
                 <artifactId>commons-logging</artifactId>
               </exclusion>
-              <exclusion>
-                <groupId>com.sun.jersey</groupId>
-                <artifactId>jersey-core</artifactId>
-              </exclusion>
-              <exclusion>
-                <groupId>com.sun.jersey</groupId>
-                <artifactId>jersey-server</artifactId>
-              </exclusion>
-              <exclusion>
-                <groupId>com.sun.jersey</groupId>
-                <artifactId>jersey-json</artifactId>
-              </exclusion>
               <exclusion>
                 <groupId>javax.servlet</groupId>
                 <artifactId>servlet-api</artifactId>
@@ -4316,26 +4345,6 @@
                 <groupId>org.codehaus.jackson</groupId>
                 <artifactId>jackson-mapper-asl</artifactId>
               </exclusion>
-              <exclusion>
-                <groupId>log4j</groupId>
-                <artifactId>log4j</artifactId>
-              </exclusion>
-              <exclusion>
-                <artifactId>reload4j</artifactId>
-                <groupId>ch.qos.reload4j</groupId>
-              </exclusion>
-              <exclusion>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-reload4j</artifactId>
-              </exclusion>
-              <exclusion>
-                <groupId>io.netty</groupId>
-                <artifactId>netty-all</artifactId>
-              </exclusion>
-              <exclusion>
-                <groupId>io.netty</groupId>
-                <artifactId>netty</artifactId>
-              </exclusion>
             </exclusions>
           </dependency>
           <dependency>
@@ -4356,6 +4365,10 @@
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-servlet</artifactId>
               </exclusion>
+              <exclusion>
+                <groupId>javax.servlet</groupId>
+                <artifactId>servlet-api</artifactId>
+              </exclusion>
               <exclusion>
                 <groupId>log4j</groupId>
                 <artifactId>log4j</artifactId>
@@ -4367,6 +4380,10 @@
             <artifactId>hbase-client</artifactId>
             <version>${hbase.version}</version>
             <exclusions>
+              <exclusion>
+                <groupId>javax.servlet</groupId>
+                <artifactId>servlet-api</artifactId>
+              </exclusion>
               <exclusion>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-server</artifactId>
@@ -4512,8 +4529,8 @@
                 <groupId>org.slf4j</groupId>
               </exclusion>
               <exclusion>
-                <artifactId>slf4j-reload4j</artifactId>
                 <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-reload4j</artifactId>
               </exclusion>
               <exclusion>
                 <artifactId>asm</artifactId>
@@ -4531,16 +4548,12 @@
                 <groupId>tomcat</groupId>
                 <artifactId>jasper-runtime</artifactId>
               </exclusion>
-              <exclusion>
-                <groupId>commons-httpclient</groupId>
-                <artifactId>commons-httpclient</artifactId>
-              </exclusion>
             </exclusions>
           </dependency>
           <dependency>
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-test</artifactId>
-            <version>${curator.version}</version>
+            <version>${curator.test.version}</version>
             <scope>test</scope>
             <exclusions>
               <exclusion>
@@ -4597,6 +4610,7 @@
         </dependencies>
       </dependencyManagement>
     </profile>
+    -->
   </profiles>
   <modules>
     <module>tools</module>