DRILL-5917: Ban org.json:json library in Drill
This closes #1031
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/23e65657
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/23e65657
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/23e65657
Branch: refs/heads/master
Commit: 23e65657db964522de5eec69283dc697071a225c
Parents: b1f0739
Author: Vlad Rozov <vrozov@apache.org>
Authored: Tue Nov 7 17:07:38 2017 -0800
Committer: Parth Chandra <parthc@apache.org>
Committed: Wed Nov 22 10:33:19 2017 -0800
----------------------------------------------------------------------
contrib/format-maprdb/pom.xml | 5 ++-
contrib/storage-hbase/pom.xml | 4 +++
contrib/storage-hive/core/pom.xml | 11 +++++++
contrib/storage-hive/hive-exec-shade/pom.xml | 8 +++++
exec/java-exec/pom.xml | 14 +++++++++
exec/vector/pom.xml | 37 ++++++++---------------
pom.xml | 17 ++++++++++-
7 files changed, 70 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/23e65657/contrib/format-maprdb/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/format-maprdb/pom.xml b/contrib/format-maprdb/pom.xml
index c4204f8..a330f8d 100644
--- 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>
http://git-wip-us.apache.org/repos/asf/drill/blob/23e65657/contrib/storage-hbase/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/storage-hbase/pom.xml b/contrib/storage-hbase/pom.xml
index 46ca150..11ef3c5 100644
--- 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>
http://git-wip-us.apache.org/repos/asf/drill/blob/23e65657/contrib/storage-hive/core/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/storage-hive/core/pom.xml b/contrib/storage-hive/core/pom.xml
index 14830ff..b35ae39 100644
--- 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>
http://git-wip-us.apache.org/repos/asf/drill/blob/23e65657/contrib/storage-hive/hive-exec-shade/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/storage-hive/hive-exec-shade/pom.xml b/contrib/storage-hive/hive-exec-shade/pom.xml
index b2eece2..d8913d5 100644
--- 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>
http://git-wip-us.apache.org/repos/asf/drill/blob/23e65657/exec/java-exec/pom.xml
----------------------------------------------------------------------
diff --git a/exec/java-exec/pom.xml b/exec/java-exec/pom.xml
index 2ac5c1e..f534b34 100644
--- a/exec/java-exec/pom.xml
+++ b/exec/java-exec/pom.xml
@@ -647,6 +647,20 @@
</dependencies>
</profile>
<profile>
+ <id>mapr</id>
+ <dependencies>
+ <dependency>
+ <groupId>com.mapr.hadoop</groupId>
+ <artifactId>maprfs</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.tdunning</groupId>
+ <artifactId>json</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
<id>hdp</id>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/drill/blob/23e65657/exec/vector/pom.xml
----------------------------------------------------------------------
diff --git a/exec/vector/pom.xml b/exec/vector/pom.xml
index bb541a3..ce604e0 100644
--- a/exec/vector/pom.xml
+++ b/exec/vector/pom.xml
@@ -1,13 +1,13 @@
<?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
+<!-- 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. -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -54,18 +54,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
- <version>2.7.1</version>
<scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
@@ -83,16 +72,16 @@
<build>
-
+
<resources>
<resource>
- <!-- Copy freemarker template and fmpp configuration files of Vector's
+ <!-- Copy freemarker template and fmpp configuration files of Vector's
to allow clients to leverage definitions. -->
<directory>${basedir}/src/main/codegen</directory>
<targetPath>codegen</targetPath>
</resource>
</resources>
-
+
<plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
@@ -133,7 +122,7 @@
</plugins>
<pluginManagement>
<plugins>
- <!--This plugin's configuration is used to store Eclipse m2e settings
+ <!--This plugin's configuration is used to store Eclipse m2e settings
only. It has no influence on the Maven build itself. -->
<plugin>
<groupId>org.eclipse.m2e</groupId>
http://git-wip-us.apache.org/repos/asf/drill/blob/23e65657/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 31f0f69..b5e4fff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
@@ -1776,7 +1791,7 @@
<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>
+ <hadoop.version>2.7.0-mapr-1707</hadoop.version>
</properties>
<dependencyManagement>
<dependencies>
|