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 0ea0fbb1c58..ba73405171a 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 72ae9f8d299..95670faf856 100644 --- a/contrib/pom.xml +++ b/contrib/pom.xml @@ -73,7 +73,8 @@ storage-splunk udfs - + 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 @@ + + diff --git a/contrib/storage-hive/core/pom.xml b/contrib/storage-hive/core/pom.xml index a1d9e09a2ef..227bf60570b 100644 --- a/contrib/storage-hive/core/pom.xml +++ b/contrib/storage-hive/core/pom.xml @@ -326,6 +326,8 @@ + + diff --git a/distribution/pom.xml b/distribution/pom.xml index 26c331356ba..df247a5a929 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -489,7 +489,8 @@ ${project.version} - + + diff --git a/distribution/src/assemble/component.xml b/distribution/src/assemble/component.xml index 992fc9a92e9..335c37b6d5d 100644 --- a/distribution/src/assemble/component.xml +++ b/distribution/src/assemble/component.xml @@ -72,7 +72,8 @@ org.apache.drill.metastore:drill-mongo-metastore:jar org.apache.drill.metastore:drill-rdbms-metastore:jar - + diff --git a/exec/java-exec/pom.xml b/exec/java-exec/pom.xml index 6d0a06d4fd6..88ced1f4ba2 100644 --- a/exec/java-exec/pom.xml +++ b/exec/java-exec/pom.xml @@ -716,46 +716,6 @@ - - mapr - - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-mapr-sources - generate-sources - - add-source - - - - srcMapr/main/java - - - - - - - - - - com.mapr.hadoop - maprfs - runtime - - - com.tdunning - json - - - com.mapr.security - mapr-security-web - - - hdp @@ -858,6 +818,49 @@ + + 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 659b3d3c073..233d04f0c6d 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 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 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 map = Arrays.stream(definitions) 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 getPropertyMethod, - BiFunction getPasswordPropertyMethod, SSLConfig.Mode mode, boolean useMapRSSLConfig) { - return useMapRSSLConfig ? getMaprCredentialsProvider(mode) - .orElseGet(() -> new SSLCredentialsProviderImpl(getPropertyMethod, getPasswordPropertyMethod)) : - new SSLCredentialsProviderImpl(getPropertyMethod, getPasswordPropertyMethod); - } - - private static Optional 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 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 d66822b0fc8..f90b061f94e 100644 --- a/exec/jdbc-all/pom.xml +++ b/exec/jdbc-all/pom.xml @@ -756,7 +756,6 @@ org/apache/directory/** org/apache/drill/metastore/** com/jcraft/** - **/mapr/** org/yaml/** hello/** webapps/** @@ -814,6 +813,73 @@ + + apache-release + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + attach-javadocs + + aggregate-jar + + false + + true + + org.apache.drill.exec:drill-jdbc + + + org.apache.drill.jdbc.impl + + + + Apache Drill JDBC Driver v. ${project.version} + + + +
Apache Drill JDBC Driver v. ${project.version}
+
Apache Drill JDBC Driver v. ${project.version}
+ + + + Apache Drill JDBC Driver version ${project.version} + + + + Drill JDBC Driver + org.apache.drill.jdbc + + + Tracing Proxy JDBC Driver + org.apache.drill.jdbc.proxy + + + + + + + + + + + + hadoop-2 + + 51000000 + + + + - - - + only when trying to run the maven release goal) ==> + ${project.build.directory}/dependency-reduced-pom.xml + + ${project.build.directory}/generated/shade/dependency-reduced-pom.xml false - + *:* @@ -899,7 +965,7 @@ - + org.apache.drill.exec. oadd.org.apache.drill.exec. @@ -909,7 +975,7 @@ oadd.org.apache.drill.common. - + antlr. oadd.antlr. @@ -1129,7 +1195,7 @@ - + *:* @@ -1204,13 +1270,13 @@ webapps/** - + org.apache.calcite.avatica:* META-INF/services/java.sql.Driver - + org/slf4j/** @@ -1221,71 +1287,7 @@ - - apache-release - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - attach-javadocs - - aggregate-jar - - false - - true - - org.apache.drill.exec:drill-jdbc - - - org.apache.drill.jdbc.impl - - - - Apache Drill JDBC Driver v. ${project.version} - - - -
Apache Drill JDBC Driver v. ${project.version}
-
Apache Drill JDBC Driver v. ${project.version}
- - - - Apache Drill JDBC Driver version ${project.version} - - - - Drill JDBC Driver - org.apache.drill.jdbc - - - Tracing Proxy JDBC Driver - org.apache.drill.jdbc.proxy - - - - - - - - - - - - hadoop-2 - - 51000000 - - + --> 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 @@ - mapr + cdh4 org.apache.hadoop hadoop-common test - - - commons-logging - commons-logging - - - org.eclipse.jetty - jetty-server - - - org.eclipse.jetty - jetty-servlet - - - cdh4 + hdp org.apache.hadoop @@ -157,15 +143,32 @@ + + 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 @@ + + diff --git a/pom.xml b/pom.xml index 5f25bef7f8b..fe047d6fa5d 100644 --- a/pom.xml +++ b/pom.xml @@ -60,8 +60,6 @@ 1.12.0 2.14.3 3.5.7 - 6.1.0-mapr - 3.0-mapr-1808 1.0.0 3.0.5 @@ -135,6 +133,11 @@ 4.3.3 2.1.12 + + @@ -175,18 +178,6 @@ - - mapr-releases - https://repository.mapr.com/maven/ - - true - fail - - - false - - - sonatype-nexus-snapshots https://oss.sonatype.org/content/repositories/snapshots @@ -203,6 +194,21 @@ jitpack.io https://jitpack.io + + + @@ -1661,109 +1667,6 @@ jackson-dataformat-hocon 1.1.1 - - com.mapr.db - maprdb - ${mapr.release.version} - - - com.mapr.fs - mapr-hbase - ${mapr.release.version} - - - log4j - log4j - - - slf4j-log4j12 - org.slf4j - - - org.slf4j - slf4j-reload4j - - - com.sun.jersey - jersey-core - - - com.sun.jersey - jersey-server - - - com.sun.jersey - jersey-json - - - commons-logging - commons-logging - - - asm - asm - - - org.eclipse.jetty - jetty-server - - - org.eclipse.jetty - jetty-servlet - - - org.json - json - - - - - com.mapr.hadoop - maprfs - ${mapr.release.version} - - - org.yaml - snakeyaml - - - commons-logging - commons-logging - - - log4j - log4j - - - slf4j-log4j12 - org.slf4j - - - org.slf4j - slf4j-reload4j - - - org.json - json - - - - - com.mapr.security - mapr-security-web - ${mapr.release.version} - - - org.ojai - ojai - ${ojai.version} - - - org.apache.hadoop - hadoop-common - - - io.netty netty-tcnative @@ -2045,6 +1948,114 @@ pom import + + + + @@ -2933,23 +2944,16 @@ - mapr + cdh - mapr - 2.3.3-mapr-1808 - 1.1.1-mapr-1602-m7-5.2.0 - 2.7.0-mapr-1808 - 3.4.11-mapr-1808 - - 2.13.0 + cdh4 org.apache.hadoop hadoop-common - ${hadoop.version} + 2.3.0-cdh5.0.3 commons-logging @@ -2964,13 +2968,40 @@ jetty-servlet - javax.servlet - servlet-api - + dnsjava + dnsjava + + + + + org.apache.hadoop + hadoop-client + 2.3.0-cdh5.0.3 + + + javax.servlet + servlet-api + + + commons-logging + commons-logging + org.eclipse.jetty - jetty-util + jetty-server + + + org.eclipse.jetty + jetty-servlet + + + + org.apache.hadoop + hadoop-yarn-client + 2.3.0-cdh5.0.3 + compile + com.sun.jersey jersey-core @@ -2987,34 +3018,6 @@ com.sun.jersey jersey-client - - jets3t - net.java.dev.jets3t - - - log4j - log4j - - - slf4j-log4j12 - org.slf4j - - - slf4j-reload4j - org.slf4j - - - mockito-all - org.mockito - - - commons-logging-api - commons-logging - - - core - org.eclipse.jdt - org.codehaus.jackson jackson-core-asl @@ -3031,24 +3034,50 @@ org.codehaus.jackson jackson-jaxrs + + + - org.apache.hadoop - hadoop-core + log4j + log4j - commons-httpclient - commons-httpclient + javax.servlet + servlet-api - dnsjava - dnsjava + commons-logging + commons-logging + + + + + cloudera + https://repository.cloudera.com/artifactory/cloudera-repos/ + + fail + + + fail + + + + + + hdp + + hdp + + + org.apache.hadoop - hadoop-client - ${hadoop.version} + hadoop-common + 2.4.0.2.1.3.0-563 commons-logging @@ -3063,83 +3092,38 @@ jetty-servlet - javax.servlet - servlet-api - - - org.eclipse.jetty - jetty-util - - - jets3t - net.java.dev.jets3t - - - log4j - log4j - - - slf4j-log4j12 - org.slf4j - - - org.slf4j - slf4j-reload4j + dnsjava + dnsjava + + + + org.apache.hadoop + hadoop-client + 2.4.0.2.1.3.0-563 + - mockito-all - org.mockito + javax.servlet + servlet-api - commons-logging-api + commons-logging commons-logging - com.sun.jersey - jersey-core - - - com.sun.jersey - jersey-server - - - com.sun.jersey - jersey-json - - - com.sun.jersey - jersey-client - - - core - org.eclipse.jdt - - - org.codehaus.jackson - jackson-core-asl - - - org.codehaus.jackson - jackson-mapper-asl - - - org.codehaus.jackson - jackson-xc - - - org.codehaus.jackson - jackson-jaxrs + org.eclipse.jetty + jetty-server - org.apache.hadoop - hadoop-core + org.eclipse.jetty + jetty-servlet org.apache.hadoop hadoop-yarn-client - ${hadoop.version} + 2.4.0.2.1.3.0-563 compile @@ -3192,94 +3176,179 @@ - - org.apache.hive - hive-maprdb-json-handler - ${hive.version} - - - org.apache.hive - hive-exec - - - - - com.mapr.db - maprdb-mapreduce - ${mapr.release.version} - - - log4j - log4j - - - org.slf4j - slf4j-log4j12 - - - org.slf4j - slf4j-reload4j - - - commons-logging - commons-logging - - - javax.servlet - servlet-api - - - - - xerces - xercesImpl - ${xerces.version} - - - org.apache.parquet - parquet-hadoop - ${parquet.version} - - - org.xerial.snappy - snappy-java - - - - - - org.apache.hadoop - hadoop-hdfs - ${hadoop.version} - test - - - commons-logging - commons-logging - - - javax.servlet - servlet-api - - - org.codehaus.jackson - jackson-core-asl - - - org.codehaus.jackson - jackson-mapper-asl - - - + + + + + + true + always + fail + + + false + never + fail + + HDPReleases + HDP Releases + https://repo.hortonworks.com/content/repositories/releases + default + + + + + build-contrib + + + !skipContrib + + + + contrib + + + + + openssl + + + enableOpenSSL + true + + + + + + fedora + ${os.detected.classifier} + + + + findbugs + + false + + + + + org.codehaus.mojo + findbugs-maven-plugin + 3.0.0 + + + Normal + + Low + + false + + true + + ${project.build.directory}/findbugs + + + + + + verify + + check + + + + + + org.codehaus.mojo + xml-maven-plugin + 1.0 + + + verify + + transform + + + + + + + ${project.build.directory}/findbugs + ${project.build.directory}/findbugs + fancy-hist.xsl + + + + + + + .html + + + + + + + + com.google.code.findbugs + findbugs + 2.0.0 + + + + + + + + jdk9+ + + [9,) + + + 8 + + --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 + + + + + hadoop-2 + + + hadoop-2 + + + + 2.10.2 + 2.5.5 + + + org.apache.hadoop - hadoop-yarn-api + hadoop-common ${hadoop.version} - test - commons-logging commons-logging + commons-logging org.eclipse.jetty @@ -3294,31 +3363,32 @@ servlet-api - log4j - log4j + org.eclipse.jetty + jetty-util - - - - org.apache.hbase - hbase-client - ${hbase.version} - - javax.servlet - servlet-api + com.sun.jersey + jersey-core - org.eclipse.jetty - jetty-server + com.sun.jersey + jersey-server - org.eclipse.jetty - jetty-servlet + com.sun.jersey + jersey-json - commons-logging - commons-logging + com.sun.jersey + jersey-client + + + jets3t + net.java.dev.jets3t + + + log4j + log4j slf4j-log4j12 @@ -3329,83 +3399,87 @@ slf4j-reload4j - log4j - log4j + reload4j + ch.qos.reload4j - com.sun.jersey - jersey-core + slf4j-reload4j + org.slf4j - com.sun.jersey - jersey-server + mockito-all + org.mockito - com.sun.jersey - jersey-json + commons-logging-api + commons-logging - com.sun.jersey - jersey-client + core + org.eclipse.jdt - org.codehaus.jackson - jackson-core-asl + org.apache.hadoop + hadoop-core - org.codehaus.jackson - jackson-mapper-asl + commons-httpclient + commons-httpclient + + + dnsjava + dnsjava - org.apache.hbase - hbase-server - ${hbase.version} + org.apache.hadoop + hadoop-client + ${hadoop.version} - tomcat - jasper-compiler + commons-logging + commons-logging - tomcat - jasper-runtime - - - javax.servlet - servlet-api + org.eclipse.jetty + jetty-server org.eclipse.jetty - jetty-server + jetty-servlet - org.eclipse.jetty - jetty-servlet + javax.servlet + servlet-api - jetty-jsp org.eclipse.jetty + jetty-util - jamon-runtime - org.jamon + jets3t + net.java.dev.jets3t - commons-logging - commons-logging + log4j + log4j slf4j-log4j12 org.slf4j - org.slf4j slf4j-reload4j + org.slf4j - log4j - log4j + mockito-all + org.mockito + + + commons-logging-api + commons-logging com.sun.jersey @@ -3423,174 +3497,92 @@ com.sun.jersey jersey-client - - - - org.apache.hbase - hbase-testing-util - tests - ${hbase.version} - test - - - javax.servlet - servlet-api - - - org.eclipse.jetty - jetty-server - - - org.eclipse.jetty - jetty-servlet - - - commons-logging - commons-logging - - - slf4j-log4j12 - org.slf4j - - - org.slf4j - slf4j-reload4j - - asm - asm + core + org.eclipse.jdt - org.apache.hbase - hbase-annotations + org.codehaus.jackson + jackson-core-asl - tomcat - jasper-compiler + org.codehaus.jackson + jackson-mapper-asl - tomcat - jasper-runtime + org.codehaus.jackson + jackson-xc - - - - org.apache.curator - curator-test - ${curator.test.version} - test - - log4j - log4j + org.codehaus.jackson + jackson-jaxrs - - - - org.apache.hbase - hbase-annotations - ${hbase.version} - - log4j - log4j + org.apache.hadoop + hadoop-core - jdk.tools - jdk.tools + com.zaxxer + HikariCP-java7 - org.apache.hbase - hbase-common - ${hbase.version} + org.apache.hadoop + hadoop-mapreduce-client-core + ${hadoop.version} + compile - log4j - log4j - - - commons-logging - commons-logging + reload4j + ch.qos.reload4j - - - - org.apache.hbase - hbase-protocol - ${hbase.version} - - log4j - log4j + org.slf4j + slf4j-reload4j - commons-logging - commons-logging + io.netty + netty - - - - - cdh - - cdh4 - - - org.apache.hadoop - hadoop-common - 2.3.0-cdh5.0.3 + hadoop-auth + ${hadoop.version} + compile - commons-logging - commons-logging - - - org.eclipse.jetty - jetty-server + org.slf4j + slf4j-reload4j - org.eclipse.jetty - jetty-servlet + reload4j + ch.qos.reload4j - dnsjava - dnsjava + org.ow2.asm + asm org.apache.hadoop - hadoop-client - 2.3.0-cdh5.0.3 + hadoop-yarn-common + ${hadoop.version} + compile - javax.servlet - servlet-api - - - commons-logging - commons-logging - - - org.eclipse.jetty - jetty-server - - - org.eclipse.jetty - jetty-servlet + reload4j + ch.qos.reload4j org.apache.hadoop hadoop-yarn-client - 2.3.0-cdh5.0.3 + ${hadoop.version} compile @@ -3641,46 +3633,51 @@ commons-logging commons-logging + + reload4j + ch.qos.reload4j + - - - - - cloudera - https://repository.cloudera.com/artifactory/cloudera-repos/ - - fail - - - fail - - - - - - hdp - - hdp - - - + + xerces + xercesImpl + ${xerces.version} + + + org.apache.parquet + parquet-hadoop + ${parquet.version} + + + org.xerial.snappy + snappy-java + + + + org.apache.hadoop hadoop-common - 2.4.0.2.1.3.0-563 + ${hadoop.version} + tests + test - commons-logging commons-logging + commons-logging - org.eclipse.jetty - jetty-server + reload4j + ch.qos.reload4j - org.eclipse.jetty - jetty-servlet + org.slf4j + slf4j-reload4j + + + javax.servlet + servlet-api dnsjava @@ -3690,16 +3687,57 @@ org.apache.hadoop - hadoop-client - 2.4.0.2.1.3.0-563 + hadoop-hdfs + ${hadoop.version} + test - javax.servlet + commons-logging + commons-logging + + + javax.servlet servlet-api - commons-logging + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + + log4j + log4j + + + reload4j + ch.qos.reload4j + + + org.slf4j + slf4j-reload4j + + + io.netty + netty-all + + + io.netty + netty + + + + + org.apache.hadoop + hadoop-yarn-api + ${hadoop.version} + test + + commons-logging + commons-logging org.eclipse.jetty @@ -3709,14 +3747,41 @@ org.eclipse.jetty jetty-servlet + + log4j + log4j + - org.apache.hadoop - hadoop-yarn-client - 2.4.0.2.1.3.0-563 - compile + org.apache.hbase + hbase-client + ${hbase.version} + + org.eclipse.jetty + jetty-server + + + org.eclipse.jetty + jetty-servlet + + + commons-logging + commons-logging + + + slf4j-log4j12 + org.slf4j + + + org.slf4j + slf4j-reload4j + + + log4j + log4j + com.sun.jersey jersey-core @@ -3741,194 +3806,201 @@ org.codehaus.jackson jackson-mapper-asl + + + + org.apache.hbase + hbase-server + ${hbase.version} + - org.codehaus.jackson - jackson-xc - - - org.codehaus.jackson - jackson-jaxrs + tomcat + jasper-compiler - - - - log4j - log4j + tomcat + jasper-runtime javax.servlet servlet-api + + org.eclipse.jetty + jetty-server + + + org.eclipse.jetty + jetty-servlet + + + jetty-jsp + org.eclipse.jetty + + + jamon-runtime + org.jamon + commons-logging commons-logging + + slf4j-log4j12 + org.slf4j + + + org.slf4j + slf4j-reload4j + + + log4j + log4j + + + com.sun.jersey + jersey-core + + + com.sun.jersey + jersey-server + + + com.sun.jersey + jersey-json + + + com.sun.jersey + jersey-client + - - - - - - true - always - fail - - - false - never - fail - - HDPReleases - HDP Releases - https://repo.hortonworks.com/content/repositories/releases - default - - - - - build-contrib - - - !skipContrib - - - - contrib - - - - - openssl - - - enableOpenSSL - true - - - - - - fedora - ${os.detected.classifier} - - - - findbugs - - false - - - - - org.codehaus.mojo - findbugs-maven-plugin - 3.0.0 - - - Normal - - Low - - false - - true - - ${project.build.directory}/findbugs - - - - - - verify - - check - - - - - - org.codehaus.mojo - xml-maven-plugin - 1.0 - - - verify - - transform - - - - - - - ${project.build.directory}/findbugs - ${project.build.directory}/findbugs - fancy-hist.xsl - - - - - - - .html - - - - - - - - com.google.code.findbugs - findbugs - 2.0.0 - - - - - - - - jdk9+ - - [9,) - - - 8 - - --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 - - + + org.apache.hbase + hbase-testing-util + tests + ${hbase.version} + test + + + javax.servlet + servlet-api + + + org.eclipse.jetty + jetty-server + + + org.eclipse.jetty + jetty-servlet + + + commons-logging + commons-logging + + + slf4j-log4j12 + org.slf4j + + + slf4j-reload4j + org.slf4j + + + asm + asm + + + org.apache.hbase + hbase-annotations + + + tomcat + jasper-compiler + + + tomcat + jasper-runtime + + + commons-httpclient + commons-httpclient + + + + + org.apache.curator + curator-test + ${curator.version} + test + + + log4j + log4j + + + + + org.apache.hbase + hbase-annotations + ${hbase.version} + + + log4j + log4j + + + jdk.tools + jdk.tools + + + + + org.apache.hbase + hbase-common + ${hbase.version} + + + log4j + log4j + + + commons-logging + commons-logging + + + + + org.apache.hbase + hbase-protocol + ${hbase.version} + + + log4j + log4j + + + commons-logging + commons-logging + + + + + + + + log4j @@ -4224,58 +4248,63 @@ commons-logging commons-logging - - reload4j - ch.qos.reload4j - - xerces - xercesImpl - ${xerces.version} - - - org.apache.parquet - parquet-hadoop - ${parquet.version} + org.apache.hive + hive-maprdb-json-handler + ${hive.version} - org.xerial.snappy - snappy-java + org.apache.hive + hive-exec - - org.apache.hadoop - hadoop-common - ${hadoop.version} - tests - test + com.mapr.db + maprdb-mapreduce + ${mapr.release.version} - commons-logging - commons-logging + log4j + log4j - reload4j - ch.qos.reload4j + org.slf4j + slf4j-log4j12 org.slf4j slf4j-reload4j + + commons-logging + commons-logging + javax.servlet servlet-api + + + + xerces + xercesImpl + ${xerces.version} + + + org.apache.parquet + parquet-hadoop + ${parquet.version} + - dnsjava - dnsjava + org.xerial.snappy + snappy-java + org.apache.hadoop hadoop-hdfs @@ -4298,26 +4327,6 @@ org.codehaus.jackson jackson-mapper-asl - - log4j - log4j - - - reload4j - ch.qos.reload4j - - - org.slf4j - slf4j-reload4j - - - io.netty - netty-all - - - io.netty - netty - @@ -4338,6 +4347,10 @@ org.eclipse.jetty jetty-servlet + + javax.servlet + servlet-api + log4j log4j @@ -4349,6 +4362,10 @@ hbase-client ${hbase.version} + + javax.servlet + servlet-api + org.eclipse.jetty jetty-server @@ -4494,8 +4511,8 @@ org.slf4j - slf4j-reload4j org.slf4j + slf4j-reload4j asm @@ -4513,16 +4530,12 @@ tomcat jasper-runtime - - commons-httpclient - commons-httpclient - org.apache.curator curator-test - ${curator.version} + ${curator.test.version} test @@ -4579,6 +4592,7 @@ + --> tools