Skip to content

Commit

Permalink
Disable unsupported MapR profile and plugins.
Browse files Browse the repository at this point in the history
  • Loading branch information
@jnturton
jnturton committed Aug 24, 2023
1 parent 0afcadd commit ea68c28
Show file tree
Hide file tree
Showing 17 changed files with 1,116 additions and 1,225 deletions.
7 changes: 5 additions & 2 deletions common/src/main/java/org/apache/drill/common/config/DrillProperties.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
3 changes: 2 additions & 1 deletion contrib/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@
<module>storage-splunk</module>
<module>udfs</module>

<!-- Modules that are no longer supported
<!-- Modules that are no longer supported. -->
<!--
<module>format-maprdb</module>
-->
</modules>
Expand Down
3 changes: 3 additions & 0 deletions contrib/storage-hbase/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,8 @@
</dependencies>
</profile>

<!-- Profiles that are no longer supported. -->
<!--
<profile>
<id>mapr</id>
<properties>
Expand Down Expand Up @@ -313,5 +315,6 @@
</dependency>
</dependencies>
</profile>
-->
</profiles>
</project>
3 changes: 3 additions & 0 deletions contrib/storage-hive/core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,8 @@
</plugins>
</build>
<profiles>
<!-- Profiles that are no longer supported. -->
<!--
<profile>
<id>mapr</id>
<properties>
Expand Down Expand Up @@ -369,5 +371,6 @@
</dependency>
</dependencies>
</profile>
-->
</profiles>
</project>
175 changes: 90 additions & 85 deletions distribution/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,8 @@
<version>${project.version}</version>
</dependency>

<!-- Modules that are no longer supported
<!-- Modules that are no longer supported. -->
<!--
<dependency>
<groupId>org.apache.drill.contrib</groupId>
<artifactId>drill-format-mapr</artifactId>
Expand Down Expand Up @@ -532,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.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>
<profile>
<id>rpm</id>
<build>
Expand Down Expand Up @@ -865,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>
3 changes: 2 additions & 1 deletion distribution/src/assemble/component.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@
<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
<!-- Modules that are no longer supported. -->
<!--
<include>org.apache.drill.contrib:drill-format-mapr:jar</include>
-->
</includes>
Expand Down
83 changes: 43 additions & 40 deletions exec/java-exec/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -716,46 +716,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>
Expand Down Expand Up @@ -858,6 +818,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>
Expand Down

0 comments on commit ea68c28

Please sign in to comment.