diff --git a/druid-handler/pom.xml b/druid-handler/pom.xml
index 9d163c61c65a..1029138fa559 100644
--- a/druid-handler/pom.xml
+++ b/druid-handler/pom.xml
@@ -328,7 +328,6 @@
                   <include>it.unimi.dsi:*</include>
                   <include>org.jdbi:*</include>
                   <include>net.jpountz.lz4:*</include>
-                  <include>org.apache.commons:*</include>
                 </includes>
               </artifactSet>
               <filters>
diff --git a/hbase-handler/pom.xml b/hbase-handler/pom.xml
index e56ef535c555..9f0831bd78da 100644
--- a/hbase-handler/pom.xml
+++ b/hbase-handler/pom.xml
@@ -38,6 +38,7 @@
       <groupId>org.apache.hive</groupId>
       <artifactId>hive-exec</artifactId>
       <version>${project.version}</version>
+      <classifier>core</classifier>
     </dependency>
     <!-- inter-project -->
     <dependency>
diff --git a/itests/hive-blobstore/pom.xml b/itests/hive-blobstore/pom.xml
index f67af9b05e3c..f0495924c4b0 100644
--- a/itests/hive-blobstore/pom.xml
+++ b/itests/hive-blobstore/pom.xml
@@ -57,6 +57,7 @@
       <groupId>org.apache.hive</groupId>
       <artifactId>hive-exec</artifactId>
       <version>${project.version}</version>
+      <classifier>core</classifier>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/itests/hive-jmh/pom.xml b/itests/hive-jmh/pom.xml
index d6b81e70ab51..511cc4db6309 100644
--- a/itests/hive-jmh/pom.xml
+++ b/itests/hive-jmh/pom.xml
@@ -57,6 +57,7 @@
       <groupId>org.apache.hive</groupId>
       <artifactId>hive-exec</artifactId>
       <version>${project.version}</version>
+      <classifier>core</classifier>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
diff --git a/itests/hive-minikdc/pom.xml b/itests/hive-minikdc/pom.xml
index d63c8ca7c6f0..032bc9ea29e7 100644
--- a/itests/hive-minikdc/pom.xml
+++ b/itests/hive-minikdc/pom.xml
@@ -108,6 +108,7 @@
       <groupId>org.apache.hive</groupId>
       <artifactId>hive-exec</artifactId>
       <version>${project.version}</version>
+      <classifier>core</classifier>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/itests/hive-unit-hadoop2/pom.xml b/itests/hive-unit-hadoop2/pom.xml
index a3df7c1237df..d1fca4e6ae2c 100644
--- a/itests/hive-unit-hadoop2/pom.xml
+++ b/itests/hive-unit-hadoop2/pom.xml
@@ -52,6 +52,7 @@
       <groupId>org.apache.hive</groupId>
       <artifactId>hive-exec</artifactId>
       <version>${project.version}</version>
+      <classifier>core</classifier>
     </dependency>
 
     <!-- dependencies are always listed in sorted order by groupId, artifectId -->
diff --git a/itests/hive-unit/pom.xml b/itests/hive-unit/pom.xml
index 4d16668449dd..24a113f63277 100644
--- a/itests/hive-unit/pom.xml
+++ b/itests/hive-unit/pom.xml
@@ -43,6 +43,7 @@
       <groupId>org.apache.hive</groupId>
       <artifactId>hive-exec</artifactId>
       <version>${project.version}</version>
+      <classifier>core</classifier>
     </dependency>
     <dependency>
       <groupId>org.apache.hive</groupId>
diff --git a/itests/qtest-accumulo/pom.xml b/itests/qtest-accumulo/pom.xml
index e67dc5542f7b..e77edbefd482 100644
--- a/itests/qtest-accumulo/pom.xml
+++ b/itests/qtest-accumulo/pom.xml
@@ -61,8 +61,8 @@
       <groupId>org.apache.hive</groupId>
       <artifactId>hive-exec</artifactId>
       <version>${project.version}</version>
-      <scope>test</scope>
       <classifier>core</classifier>
+      <scope>test</scope>
       <exclusions>
         <exclusion>
           <groupId>org.apache.calcite</groupId>
diff --git a/llap-server/pom.xml b/llap-server/pom.xml
index d9ae1ad33b7e..bdb3ec0383d6 100644
--- a/llap-server/pom.xml
+++ b/llap-server/pom.xml
@@ -38,6 +38,7 @@
       <groupId>org.apache.hive</groupId>
       <artifactId>hive-exec</artifactId>
       <version>${project.version}</version>
+      <classifier>core</classifier>
     </dependency>
     <dependency>
       <groupId>org.apache.hive</groupId>
diff --git a/ql/pom.xml b/ql/pom.xml
index 4085de3292e4..2bb18c0c6dde 100644
--- a/ql/pom.xml
+++ b/ql/pom.xml
@@ -884,6 +884,38 @@
                 </includes>
               </artifactSet>
               <relocations>
+                <relocation>
+                  <pattern>org.apache.calcite</pattern>
+                  <shadedPattern>org.apache.hive.org.apache.calcite</shadedPattern>
+                </relocation>
+                <relocation>
+                  <pattern>org.apache.orc</pattern>
+                  <shadedPattern>org.apache.hive.org.apache.orc</shadedPattern>
+                </relocation>
+                <relocation>
+                  <pattern>org.apache.commons</pattern>
+                  <shadedPattern>org.apache.hive.org.apache.commons</shadedPattern>
+                </relocation>
+                <relocation>
+                  <pattern>org.apache.parquet</pattern>
+                  <shadedPattern>org.apache.hive.org.apache.parquet</shadedPattern>
+                </relocation>
+                <relocation>
+                  <pattern>joda-time</pattern>
+                  <shadedPattern>org.apache.hive.joda-time</shadedPattern>
+                </relocation>
+                <relocation>
+                  <pattern>commons-lang</pattern>
+                  <shadedPattern>org.apache.hive.commons-lang</shadedPattern>
+                </relocation>
+                <relocation>
+                  <pattern>org.jodd</pattern>
+                  <shadedPattern>org.apache.hive.org.jodd</shadedPattern>
+                </relocation>
+                <relocation>
+                  <pattern>org.codehaus.jackson</pattern>
+                  <shadedPattern>org.apache.hive.org.codehaus.jackson</shadedPattern>
+                </relocation>
                 <relocation>
                   <pattern>com.esotericsoftware</pattern>
                   <shadedPattern>org.apache.hive.com.esotericsoftware</shadedPattern>
diff --git a/service/pom.xml b/service/pom.xml
index 40ef75b7401e..ff99424d96ae 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -38,6 +38,7 @@
       <groupId>org.apache.hive</groupId>
       <artifactId>hive-exec</artifactId>
       <version>${project.version}</version>
+      <classifier>core</classifier>
     </dependency>
     <dependency>
       <groupId>org.apache.hive</groupId>