Override class names in hadoop-common's core-default.xml for relocati…

…on to oadd.

exec/jdbc-all/pom.xml

@@ -343,7 +343,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>3.0.0-M3</version>
+        <version>3.1.2</version>
         <executions>
           <execution>
             <goals>

exec/jdbc-all/src/main/resources/core-site.xml

@@ -0,0 +1,37 @@
+<?xml version="1.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.
+-->
+
+<!--
+This file is bundled with the Drill JDBC driver in order to accommodate the
+relocation of org.apache.hadoop to oadd.org.apache.hadoop that is specified
+in exec/jdbc-all/pom.xml. The fully qualified class names in core-default.xml
+in hadoop-common.jar are not updated by the Maven shade plugin so we override
+them here.
+-->
+
+<configuration>
+<property>
+  <name>hadoop.security.group.mapping</name>
+  <value>oadd.org.apache.hadoop.security.JniBasedUnixGroupsMappingWithFallback</value>
+</property>
+
+<property>
+  <name>hadoop.security.resolver.impl</name>
+  <value>oadd.org.apache.hadoop.net.DNSDomainNameResolver</value>
+</property>
+</configuration>

exec/jdbc-all/src/test/java/org/apache/drill/jdbc/ITTestShadedJar.java

@@ -45,6 +45,9 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
+// Note: this test cannot be run under surefire (or in IDEs). Execute
+// `mvn integration-test` in this module's directory to run it locally. See the
+// maven-failsafe-plugin config in this module's pom.xml for more information.
 public class ITTestShadedJar extends BaseTest {
   private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(ITTestShadedJar.class);
 

exec/jdbc-all/src/test/resources/core-site.xml

@@ -0,0 +1,34 @@
+<?xml version="1.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.
+-->
+
+<!--
+Reverts the relocated class names in src/main/resources/core-site.xml for the
+ITTestShadedJar.java test.
+-->
+
+<configuration>
+<property>
+  <name>hadoop.security.group.mapping</name>
+  <value>org.apache.hadoop.security.JniBasedUnixGroupsMappingWithFallback</value>
+</property>
+
+<property>
+  <name>hadoop.security.resolver.impl</name>
+  <value>org.apache.hadoop.net.DNSDomainNameResolver</value>
+</property>
+</configuration>