diff --git a/common/pom.xml b/common/pom.xml
index 487544a1a23..4f7088c050c 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -100,6 +100,46 @@
 
   </dependencies>
 
+  <profiles>
+    <profile>
+      <id>default-hadoop</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <version>3.11.0</version>
+            <configuration>
+              <excludes>
+                <!-- Guava is only patched for Hadoop 2 -->
+                <exclude>org/apache/drill/common/util/GuavaPatcher.java</exclude>
+              </excludes>
+              <testExcludes>
+                <!-- Guava is only patched for Hadoop 2 -->
+                <testExclude>org/apache/drill/common/util/TestGuavaPatcher.java</testExclude>
+              </testExcludes>
+            </configuration>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+              <configuration>
+                <excludes>
+                  <exclude>org/apache/drill/common/util/TestGuavaPatcher.java</exclude>
+                </excludes>
+              </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>hadoop-2</id>
+    </profile>
+  </profiles>
+
   <build>
     <plugins>
       <plugin>
diff --git a/common/src/main/java/org/apache/drill/common/util/GuavaPatcher.java b/common/src/main/java/org/apache/drill/common/util/GuavaPatcher.java
index b6a7d47a15b..ec6c1cabfc8 100644
--- a/common/src/main/java/org/apache/drill/common/util/GuavaPatcher.java
+++ b/common/src/main/java/org/apache/drill/common/util/GuavaPatcher.java
@@ -19,7 +19,7 @@
 
 import java.lang.reflect.Modifier;
 
-import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting;
+import com.google.common.annotations.VisibleForTesting;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/contrib/storage-hbase/pom.xml b/contrib/storage-hbase/pom.xml
index c1edbb177ef..ad61edc9c09 100644
--- a/contrib/storage-hbase/pom.xml
+++ b/contrib/storage-hbase/pom.xml
@@ -164,9 +164,7 @@
     <profile>
       <id>default-hadoop</id>
       <activation>
-        <property>
-          <name>!alt-hadoop</name>
-        </property>
+        <activeByDefault>true</activeByDefault>
       </activation>
       <dependencies>
         <dependency>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index d4c8e4ee4bc..3447bb78261 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -505,9 +505,7 @@
     <profile>
       <id>default-hadoop</id>
       <activation>
-        <property>
-          <name>!alt-hadoop</name>
-        </property>
+        <activeByDefault>true</activeByDefault>
       </activation>
       <build>
         <plugins>
diff --git a/exec/java-exec/pom.xml b/exec/java-exec/pom.xml
index b2f4e1fae4b..181fdfefec2 100644
--- a/exec/java-exec/pom.xml
+++ b/exec/java-exec/pom.xml
@@ -663,9 +663,7 @@
     <profile>
       <id>default-hadoop</id>
       <activation>
-        <property>
-          <name>!alt-hadoop</name>
-        </property>
+        <activeByDefault>true</activeByDefault>
       </activation>
     </profile>
     <profile>
diff --git a/exec/java-exec/src/test/resources/drill-udf/pom.xml b/exec/java-exec/src/test/resources/drill-udf/pom.xml
index 0d6372e25cb..7fce655a1ec 100644
--- a/exec/java-exec/src/test/resources/drill-udf/pom.xml
+++ b/exec/java-exec/src/test/resources/drill-udf/pom.xml
@@ -60,7 +60,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.8.0</version>
+        <version>3.11.0</version>
         <configuration>
           <includes>
             <include>${include.files}</include>
diff --git a/pom.xml b/pom.xml
index 14e0fdef7a6..edbe37e6c9c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -819,7 +819,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.8.1</version>
+          <version>3.11.0</version>
         </plugin>
         <plugin>
           <artifactId>maven-enforcer-plugin</artifactId>
@@ -2072,9 +2072,7 @@
     <profile>
       <id>default-hadoop</id>
       <activation>
-        <property>
-          <name>!alt-hadoop</name>
-        </property>
+        <activeByDefault>true</activeByDefault>
       </activation>
       <dependencyManagement>
         <dependencies>
@@ -3884,13 +3882,9 @@
     </profile>
     <profile>
       <id>hadoop-2</id>
-      <activation>
-        <property>
-          <name>hadoop-2</name>
-        </property>
-      </activation>
       <properties>
         <hadoop.version>2.10.2</hadoop.version>
+        <alt-hadoop>hadoop-2</alt-hadoop>
       </properties>
       <dependencyManagement>
         <dependencies>