DRILL-5917: Ban org.json:json library in Drill

closes apache#1031
arina-ielchiieva · Nov 13, 2017 · 08f9955 · 08f9955
1 parent 99e4504
commit 08f9955
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 4 deletions.
diff --git a/contrib/format-maprdb/pom.xml b/contrib/format-maprdb/pom.xml
@@ -133,7 +133,10 @@
         </exclusion>
       </exclusions>
     </dependency>
-
+    <dependency>
+      <groupId>com.tdunning</groupId>
+      <artifactId>json</artifactId>
+    </dependency>
     <!-- Test dependencies -->
     <dependency>
       <groupId>com.mapr</groupId>

diff --git a/contrib/storage-hbase/pom.xml b/contrib/storage-hbase/pom.xml
@@ -275,6 +275,10 @@
             </exclusion>
           </exclusions>
         </dependency>
+        <dependency>
+          <groupId>com.tdunning</groupId>
+          <artifactId>json</artifactId>
+        </dependency>
       </dependencies>
     </profile>
   </profiles>

diff --git a/contrib/storage-hive/core/pom.xml b/contrib/storage-hive/core/pom.xml
@@ -170,4 +170,15 @@
       </plugin>
     </plugins>
   </build>
+  <profiles>
+    <profile>
+      <id>mapr</id>
+      <dependencies>
+        <dependency>
+          <groupId>com.tdunning</groupId>
+          <artifactId>json</artifactId>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
 </project>
diff --git a/contrib/storage-hive/hive-exec-shade/pom.xml b/contrib/storage-hive/hive-exec-shade/pom.xml
@@ -102,6 +102,14 @@
                   <shadedPattern>hive.org.apache.calcite.</shadedPattern>
                 </relocation>
               </relocations>
+              <filters>
+                <filter>
+                  <artifact>org.apache.hive:hive-exec</artifact>
+                  <excludes>
+                    <exclude>org/json/*</exclude>
+                  </excludes>
+                </filter>
+              </filters>
             </configuration>
           </execution>
         </executions>

diff --git a/pom.xml b/pom.xml
@@ -40,7 +40,7 @@
     <janino.version>2.7.6</janino.version>
     <sqlline.version>1.1.9-drill-r7</sqlline.version>
     <jackson.version>2.7.8</jackson.version>
-    <mapr.release.version>5.2.1-mapr</mapr.release.version>
+    <mapr.release.version>5.2.2-mapr</mapr.release.version>
     <ojai.version>1.1</ojai.version>
     <kerby.version>1.0.0-RC2</kerby.version>
     <findbugs.version>3.0.0</findbugs.version>
@@ -361,6 +361,7 @@
                     <exclude>org.mortbay.jetty:servlet-api-2.5</exclude>
                     <exclude>log4j:log4j</exclude>
                     <exclude>jdk.tools:jdk.tools</exclude>
+                    <exclude>org.json:json</exclude>
                   </excludes>
                 </bannedDependencies>
               </rules>
@@ -982,6 +983,10 @@
             <groupId>io.netty</groupId>
             <artifactId>netty-all</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
       <dependency>
@@ -1013,6 +1018,10 @@
             <groupId>io.netty</groupId>
             <artifactId>netty-all</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
       <dependency>
@@ -1042,6 +1051,12 @@
         <scope>runtime</scope>
         <optional>true</optional>
       </dependency>
+      <dependency>
+        <groupId>com.tdunning</groupId>
+        <artifactId>json</artifactId>
+        <version>1.8</version>
+        <scope>runtime</scope>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -1775,8 +1790,8 @@
         <alt-hadoop>mapr</alt-hadoop>
         <rat.excludeSubprojects>true</rat.excludeSubprojects>
         <hive.version>1.2.0-mapr-1707</hive.version>
-        <hbase.version>1.1.1-mapr-1602-m7-5.2.0</hbase.version>
-        <hadoop.version>2.7.0-mapr-1607</hadoop.version>
+        <hbase.version>1.1.1-mapr-1602-m7-5.2.1</hbase.version>
+        <hadoop.version>2.7.0-mapr-1707</hadoop.version>
       </properties>
       <dependencyManagement>
         <dependencies>