drill-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject [50/50] [abbrv] drill git commit: DRILL-4886: Modifying projects POMs to align with Drill's build and distribution.
Date Tue, 13 Sep 2016 01:32:37 GMT
DRILL-4886: Modifying projects POMs to align with Drill's build and distribution.

The default build/test/packaging behavior for mapr-format-plugin module are

1. BUILD of mapr-format-plugin is ENABLED.
2. Unit tests of mapr-format-plugin module are DISABLED (use `-Pmapr` to enable).
3. Packaging of mapr-format-plugin is DISABLED (use `-Pmapr` to enable).

Please see LEGAL-251 for discussion/conclusion regarding inclusion of source code with non-open-source
dependency.


Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/5a4ad2a8
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/5a4ad2a8
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/5a4ad2a8

Branch: refs/heads/master
Commit: 5a4ad2a88331dfe7561ee76fc87e882afe170681
Parents: 373272c
Author: Aditya Kishore <adi@apache.org>
Authored: Sun Sep 11 13:23:23 2016 -0700
Committer: Aditya Kishore <adi@apache.org>
Committed: Sun Sep 11 13:23:23 2016 -0700

----------------------------------------------------------------------
 contrib/format-maprdb/pom.xml     | 246 ++++++++++++++++-------------
 contrib/pom.xml                   |   1 +
 distribution/pom.xml              |  18 +--
 distribution/src/assemble/bin.xml |   1 +
 pom.xml                           | 280 ++++++++++++++++++++++-----------
 5 files changed, 332 insertions(+), 214 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/5a4ad2a8/contrib/format-maprdb/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/format-maprdb/pom.xml b/contrib/format-maprdb/pom.xml
index db1c55f..3a5499a 100644
--- a/contrib/format-maprdb/pom.xml
+++ b/contrib/format-maprdb/pom.xml
@@ -21,63 +21,26 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <artifactId>drill-root</artifactId>
-    <groupId>org.apache.drill</groupId>
+    <artifactId>drill-contrib-parent</artifactId>
+    <groupId>org.apache.drill.contrib</groupId>
     <version>1.9.0-SNAPSHOT</version>
-    <relativePath/>
   </parent>
 
-  <artifactId>drill-storage-maprdb</artifactId>
-  <name>maprdb-storage-plugin</name>
+  <artifactId>drill-format-mapr</artifactId>
+  <name>contrib/mapr-format-plugin</name>
 
   <properties>
-    <maprdb-storage-plugin.mapr.version>5.1.0.37817-mapr</maprdb-storage-plugin.mapr.version>
-    <maprdb-storage-plugin.hbase.version>1.1.1-mapr-1602-m7-5.1.0</maprdb-storage-plugin.hbase.version>
-    <maprdb-storage-plugin.hadoop.version>2.7.0-mapr-1602</maprdb-storage-plugin.hadoop.version>
-    <maprdb.TestSuite>**/MaprDBTestsSuite.class</maprdb.TestSuite>
+    <mapr-format-plugin.hbase.version>1.1.1-mapr-1602-m7-5.2.0</mapr-format-plugin.hbase.version>
+    <mapr.TestSuite>**/MaprDBTestsSuite.class</mapr.TestSuite>
+    <mapr.skip.tests>true</mapr.skip.tests>
   </properties>
 
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>com.mapr.hadoop</groupId>
-        <artifactId>maprfs</artifactId>
-        <version>${maprdb-storage-plugin.mapr.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.mapr.fs</groupId>
-        <artifactId>mapr-hbase</artifactId>
-        <version>${maprdb-storage-plugin.mapr.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.mapr.db</groupId>
-        <artifactId>maprdb</artifactId>
-        <version>${maprdb-storage-plugin.mapr.version}</version>
-      </dependency>
-      <dependency>
         <groupId>org.apache.hbase</groupId>
         <artifactId>hbase-client</artifactId>
-        <version>${maprdb-storage-plugin.hbase.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.hbase</groupId>
-        <artifactId>hbase-server</artifactId>
-        <version>${maprdb-storage-plugin.hbase.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-annotations</artifactId>
-        <version>${maprdb-storage-plugin.hadoop.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-client</artifactId>
-        <version>${maprdb-storage-plugin.hadoop.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-common</artifactId>
-        <version>${maprdb-storage-plugin.hadoop.version}</version>
+        <version>${mapr-format-plugin.hbase.version}</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -88,8 +51,9 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
+          <skipTests>${mapr.skip.tests}</skipTests>
           <includes>
-            <include>${maprdb.TestSuite}</include>
+            <include>${mapr.TestSuite}</include>
           </includes>
           <systemProperties>
             <property>
@@ -107,38 +71,10 @@
     <dependency>
       <groupId>com.mapr.hadoop</groupId>
       <artifactId>maprfs</artifactId>
-      <exclusions>
-        <exclusion>
-          <artifactId>commons-logging</artifactId>
-          <groupId>commons-logging</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>log4j</artifactId>
-          <groupId>log4j</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>slf4j-log4j12</artifactId>
-          <groupId>org.slf4j</groupId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.mapr.fs</groupId>
       <artifactId>mapr-hbase</artifactId>
-      <exclusions>
-        <exclusion>
-          <artifactId>commons-logging</artifactId>
-          <groupId>commons-logging</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>log4j</artifactId>
-          <groupId>log4j</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>servlet-api-2.5</artifactId>
-          <groupId>org.mortbay.jetty</groupId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.mapr.db</groupId>
@@ -171,13 +107,14 @@
     <dependency>
       <groupId>com.mapr</groupId>
       <artifactId>mapr-java-utils</artifactId>
-      <version>${maprdb-storage-plugin.mapr.version}</version>
+      <version>${mapr.release.version}</version>
+      <scope>test</scope>
       <classifier>tests</classifier>
     </dependency>
     <dependency>
       <groupId>com.mapr</groupId>
       <artifactId>mapr-test-annotations</artifactId>
-      <version>${maprdb-storage-plugin.mapr.version}</version>
+      <version>${mapr.release.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.drill.exec</groupId>
@@ -206,45 +143,128 @@
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.hbase</groupId>
-      <artifactId>hbase-server</artifactId>
-      <version>${maprdb-storage-plugin.hbase.version}</version>
-      <scope>test</scope>
-      <classifier>tests</classifier>
-      <exclusions>
-        <exclusion>
-          <artifactId>commons-logging</artifactId>
-          <groupId>commons-logging</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>servlet-api-2.5</artifactId>
-          <groupId>org.mortbay.jetty</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>servlet-api</artifactId>
-          <groupId>javax.servlet</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>slf4j-log4j12</artifactId>
-          <groupId>org.slf4j</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>log4j</artifactId>
-          <groupId>log4j</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
 
   </dependencies>
 
-  <repositories>
-    <repository>
-      <id>mapr-releases</id>
-      <url>http://repository.mapr.com/nexus/content/repositories/releases</url>
-      <snapshots><enabled>true</enabled></snapshots>
-      <releases><enabled>true</enabled></releases>
-    </repository>
-  </repositories>
+  <profiles>
+    <profile>
+      <id>mapr</id>
+      <properties>
+        <mapr.skip.tests>false</mapr.skip.tests>
+      </properties>
+    </profile>
+
+    <!-- #### BEGIN ##### TEST PROFILES -->
+    <profile>
+      <!-- this is the default test mode -->
+      <id>simple-tests-default</id>
+      <activation>
+        <property><name>!tests</name></property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <excludedGroups>com.mapr.tests.annotations.ClusterTest</excludedGroups>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <profile>
+      <id>simple-tests</id>
+      <activation>
+        <property><name>tests</name><value>simple</value></property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <excludedGroups>com.mapr.tests.annotations.ClusterTest</excludedGroups>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <profile>
+      <id>cluster-tests</id>
+      <activation>
+        <property><name>tests</name><value>cluster</value></property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <excludedGroups>com.mapr.tests.annotations.StressTest</excludedGroups>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <profile>
+      <id>stress-tests</id>
+      <activation>
+        <property><name>tests</name><value>stress</value></property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <excludedGroups>com.mapr.tests.annotations.IntegrationTest</excludedGroups>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <profile>
+      <id>all-tests</id>
+      <activation>
+        <property><name>tests</name><value>all</value></property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <profile>
+      <id>selected-tests</id>
+      <activation>
+        <!-- if a specific test has been requested, set an unused category as
+             excludedGroups, so that the requested test can be looked up in all categories.
+             This must be the last profile to override the surefire configuration. -->
+        <property><name>test</name></property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <excludedGroups>com.mapr.tests.annotations.AlwaysExclude</excludedGroups>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <!-- #### END ##### TEST PROFILES -->
+
+  </profiles>
 
 </project>

http://git-wip-us.apache.org/repos/asf/drill/blob/5a4ad2a8/contrib/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/pom.xml b/contrib/pom.xml
index eb09da9..d5485e3 100644
--- a/contrib/pom.xml
+++ b/contrib/pom.xml
@@ -33,6 +33,7 @@
 
   <modules>
     <module>storage-hbase</module>
+    <module>format-maprdb</module>
     <module>storage-hive</module>
     <module>storage-mongo</module>
     <module>storage-jdbc</module>

http://git-wip-us.apache.org/repos/asf/drill/blob/5a4ad2a8/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 3733055..fbadb28 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -225,26 +225,18 @@
     <profile>
       <id>mapr</id>
       <dependencies>
-
-        <dependency>
-          <groupId>com.mapr.hadoop</groupId>
-          <artifactId>maprfs</artifactId>
-        </dependency>
         <dependency>
-          <groupId>com.mapr.fs</groupId>
-          <artifactId>mapr-hbase</artifactId>
+          <groupId>org.apache.drill.contrib</groupId>
+          <artifactId>drill-format-mapr</artifactId>
+          <version>${project.version}</version>
           <exclusions>
             <exclusion>
-              <artifactId>log4j</artifactId>
-              <groupId>log4j</groupId>
+              <groupId>com.mapr</groupId>
+              <artifactId>mapr-test-annotations</artifactId>
             </exclusion>
           </exclusions>
         </dependency>
         <dependency>
-          <groupId>com.mapr.db</groupId>
-          <artifactId>maprdb</artifactId>
-        </dependency>
-        <dependency>
           <groupId>org.apache.hadoop</groupId>
           <artifactId>hadoop-winutils</artifactId>
           <version>2.7.0-mapr-1506</version>

http://git-wip-us.apache.org/repos/asf/drill/blob/5a4ad2a8/distribution/src/assemble/bin.xml
----------------------------------------------------------------------
diff --git a/distribution/src/assemble/bin.xml b/distribution/src/assemble/bin.xml
index a9be086..e428e6c 100644
--- a/distribution/src/assemble/bin.xml
+++ b/distribution/src/assemble/bin.xml
@@ -96,6 +96,7 @@
         <include>org.apache.drill.contrib.data:tpch-sample-data:jar</include>
         <include>org.apache.drill.contrib:drill-mongo-storage</include>
         <include>org.apache.drill.contrib:drill-storage-hbase</include>
+        <include>org.apache.drill.contrib:drill-format-mapr</include>
         <include>org.apache.drill.contrib:drill-jdbc-storage</include>
         <include>org.apache.drill.contrib:drill-kudu-storage</include>
         <include>org.apache.drill.contrib:drill-gis</include>

http://git-wip-us.apache.org/repos/asf/drill/blob/5a4ad2a8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3108528..decfcbc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,6 +37,8 @@
     <parquet.version>1.8.1-drill-r0</parquet.version>
     <sqlline.version>1.1.9-drill-r7</sqlline.version>
     <jackson.version>2.7.1</jackson.version>
+    <mapr.release.version>5.2.0-mapr</mapr.release.version>
+    <ojai.version>1.1</ojai.version>
 
     <!--
       Currently Hive storage plugin only supports Apache Hive 1.2 or vendor specific variants
of the
@@ -44,6 +46,7 @@
     -->
     <hive.version>1.2.1</hive.version>
     <hadoop.version>2.7.1</hadoop.version>
+    <hbase.version>1.1.3</hbase.version>
     <fmpp.version>0.9.15</fmpp.version>
     <freemarker.version>2.3.21</freemarker.version>
   </properties>
@@ -102,6 +105,17 @@
     </repository>
 
     <repository>
+      <id>mapr-releases</id>
+      <url>http://repository.mapr.com/maven/</url>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
+
+    <repository>
       <!-- Keep until we move back to released calcite versions. -->
       <id>mapr-drill-optiq-snapshots</id>
       <name>MapR Drill Optiq Snapshots</name>
@@ -787,6 +801,88 @@
           </exclusion>
         </exclusions>
       </dependency>
+      <dependency>
+        <groupId>com.mapr.db</groupId>
+        <artifactId>maprdb</artifactId>
+        <version>${mapr.release.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.mapr.fs</groupId>
+        <artifactId>mapr-hbase</artifactId>
+        <version>${mapr.release.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-all</artifactId>
+          </exclusion>
+          <exclusion>
+            <artifactId>log4j</artifactId>
+            <groupId>log4j</groupId>
+          </exclusion>
+          <exclusion>
+            <artifactId>slf4j-log4j12</artifactId>
+            <groupId>org.slf4j</groupId>
+          </exclusion>
+          <exclusion>
+            <groupId>com.sun.jersey</groupId>
+            <artifactId>jersey-core</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>com.sun.jersey</groupId>
+            <artifactId>jersey-server</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>com.sun.jersey</groupId>
+            <artifactId>jersey-json</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>asm</groupId>
+            <artifactId>asm</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>servlet-api-2.5</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>com.mapr.hadoop</groupId>
+        <artifactId>maprfs</artifactId>
+        <version>${mapr.release.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+          </exclusion>
+          <exclusion>
+            <artifactId>commons-logging</artifactId>
+            <groupId>commons-logging</groupId>
+          </exclusion>
+          <exclusion>
+            <artifactId>log4j</artifactId>
+            <groupId>log4j</groupId>
+          </exclusion>
+          <exclusion>
+            <artifactId>slf4j-log4j12</artifactId>
+            <groupId>org.slf4j</groupId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>org.ojai</groupId>
+        <artifactId>ojai</artifactId>
+        <version>${ojai.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-common</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -1127,7 +1223,7 @@
           <dependency>
             <groupId>org.apache.hbase</groupId>
             <artifactId>hbase-client</artifactId>
-            <version>1.1.3</version>
+            <version>${hbase.version}</version>
             <exclusions>
               <exclusion>
                 <artifactId>netty-all</artifactId>
@@ -1226,6 +1322,37 @@
                 <groupId>org.apache.zookeeper</groupId>
               </exclusion>
               <exclusion>
+                <artifactId>stax-api</artifactId>
+                <groupId>stax</groupId>
+              </exclusion>
+            </exclusions>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.hbase</groupId>
+            <artifactId>hbase-server</artifactId>
+            <version>${hbase.version}</version>
+            <exclusions>
+              <exclusion>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-all</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>tomcat</groupId>
+                <artifactId>jasper-compiler</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>tomcat</groupId>
+                <artifactId>jasper-runtime</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>javax.servlet</groupId>
+                <artifactId>servlet-api</artifactId>
+              </exclusion>
+              <exclusion>
+                <artifactId>servlet-api-2.5</artifactId>
+                <groupId>org.mortbay.jetty</groupId>
+              </exclusion>
+              <exclusion>
                 <artifactId>jsp-2.1</artifactId>
                 <groupId>org.mortbay.jetty</groupId>
               </exclusion>
@@ -1234,8 +1361,40 @@
                 <groupId>org.mortbay.jetty</groupId>
               </exclusion>
               <exclusion>
-                <artifactId>stax-api</artifactId>
-                <groupId>stax</groupId>
+                <artifactId>jetty-sslengine</artifactId>
+                <groupId>org.mortbay.jetty</groupId>
+              </exclusion>
+              <exclusion>
+                <artifactId>jamon-runtime</artifactId>
+                <groupId>org.jamon</groupId>
+              </exclusion>
+              <exclusion>
+                <groupId>commons-logging</groupId>
+                <artifactId>commons-logging</artifactId>
+              </exclusion>
+              <exclusion>
+                <artifactId>slf4j-log4j12</artifactId>
+                <groupId>org.slf4j</groupId>
+              </exclusion>
+              <exclusion>
+                <artifactId>log4j</artifactId>
+                <groupId>log4j</groupId>
+              </exclusion>
+              <exclusion>
+                <groupId>com.sun.jersey</groupId>
+                <artifactId>jersey-core</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>com.sun.jersey</groupId>
+                <artifactId>jersey-server</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>com.sun.jersey</groupId>
+                <artifactId>jersey-json</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>com.sun.jersey</groupId>
+                <artifactId>jersey-client</artifactId>
               </exclusion>
             </exclusions>
           </dependency>
@@ -1243,7 +1402,7 @@
             <groupId>org.apache.hbase</groupId>
             <artifactId>hbase-testing-util</artifactId>
             <classifier>tests</classifier>
-            <version>1.1.3</version>
+            <version>${hbase.version}</version>
             <scope>test</scope>
             <exclusions>
               <exclusion>
@@ -1398,9 +1557,8 @@
         <alt-hadoop>mapr</alt-hadoop>
         <rat.excludeSubprojects>true</rat.excludeSubprojects>
         <hive.version>1.2.0-mapr-1608</hive.version>
-        <hbase.version>1.1.1-mapr-1602-m7-5.1.0</hbase.version>
+        <hbase.version>1.1.1-mapr-1602-m7-5.2.0</hbase.version>
         <hadoop.version>2.7.0-mapr-1607</hadoop.version>
-        <mapr.core.version>5.2.0-mapr</mapr.core.version>
       </properties>
       <dependencyManagement>
         <dependencies>
@@ -1592,76 +1750,6 @@
             </exclusions>
           </dependency>
           <dependency>
-            <groupId>com.mapr.fs</groupId>
-            <artifactId>mapr-hbase</artifactId>
-            <version>${mapr.core.version}</version>
-            <exclusions>
-              <exclusion>
-                <groupId>io.netty</groupId>
-                <artifactId>netty-all</artifactId>
-              </exclusion>
-              <exclusion>
-                <artifactId>log4j</artifactId>
-                <groupId>log4j</groupId>
-              </exclusion>
-              <exclusion>
-                <artifactId>slf4j-log4j12</artifactId>
-                <groupId>org.slf4j</groupId>
-              </exclusion>
-              <exclusion>
-                <groupId>com.sun.jersey</groupId>
-                <artifactId>jersey-core</artifactId>
-              </exclusion>
-              <exclusion>
-                <groupId>com.sun.jersey</groupId>
-                <artifactId>jersey-server</artifactId>
-              </exclusion>
-              <exclusion>
-                <groupId>com.sun.jersey</groupId>
-                <artifactId>jersey-json</artifactId>
-              </exclusion>
-              <exclusion>
-                <groupId>commons-logging</groupId>
-                <artifactId>commons-logging</artifactId>
-              </exclusion>
-              <exclusion>
-                <groupId>asm</groupId>
-                <artifactId>asm</artifactId>
-              </exclusion>
-              <exclusion>
-                <groupId>org.mortbay.jetty</groupId>
-                <artifactId>servlet-api-2.5</artifactId>
-              </exclusion>
-            </exclusions>
-          </dependency>
-          <dependency>
-            <groupId>com.mapr.hadoop</groupId>
-            <artifactId>maprfs</artifactId>
-            <version>${mapr.core.version}</version>
-          </dependency>
-          <dependency>
-            <groupId>com.mapr.db</groupId>
-            <artifactId>maprdb</artifactId>
-            <version>${mapr.core.version}</version>
-            <exclusions>
-              <exclusion>
-                <groupId>com.mapr</groupId>
-                <artifactId>mapr-java-utils</artifactId>
-              </exclusion>
-            </exclusions>
-          </dependency>
-          <dependency>
-            <groupId>org.ojai</groupId>
-            <artifactId>ojai</artifactId>
-            <version>1.0</version>
-            <exclusions>
-              <exclusion>
-                <groupId>org.apache.hadoop</groupId>
-                <artifactId>hadoop-common</artifactId>
-              </exclusion>
-            </exclusions>
-          </dependency>
-          <dependency>
             <groupId>org.antlr</groupId>
             <artifactId>antlr4-runtime</artifactId>
             <version>4.5</version>
@@ -1779,6 +1867,18 @@
             <version>${hbase.version}</version>
             <exclusions>
               <exclusion>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-all</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>tomcat</groupId>
+                <artifactId>jasper-compiler</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>tomcat</groupId>
+                <artifactId>jasper-runtime</artifactId>
+              </exclusion>
+              <exclusion>
                 <groupId>javax.servlet</groupId>
                 <artifactId>servlet-api</artifactId>
               </exclusion>
@@ -1787,6 +1887,22 @@
                 <groupId>org.mortbay.jetty</groupId>
               </exclusion>
               <exclusion>
+                <artifactId>jsp-2.1</artifactId>
+                <groupId>org.mortbay.jetty</groupId>
+              </exclusion>
+              <exclusion>
+                <artifactId>jsp-api-2.1</artifactId>
+                <groupId>org.mortbay.jetty</groupId>
+              </exclusion>
+              <exclusion>
+                <artifactId>jetty-sslengine</artifactId>
+                <groupId>org.mortbay.jetty</groupId>
+              </exclusion>
+              <exclusion>
+                <artifactId>jamon-runtime</artifactId>
+                <groupId>org.jamon</groupId>
+              </exclusion>
+              <exclusion>
                 <groupId>commons-logging</groupId>
                 <artifactId>commons-logging</artifactId>
               </exclusion>
@@ -1888,18 +2004,6 @@
           </dependency>
         </dependencies>
       </dependencyManagement>
-      <repositories>
-        <repository>
-          <id>mapr-releases</id>
-          <url>http://repository.mapr.com/maven/</url>
-          <snapshots>
-            <enabled>true</enabled>
-          </snapshots>
-          <releases>
-            <enabled>true</enabled>
-          </releases>
-        </repository>
-      </repositories>
     </profile>
     <profile>
       <id>cdh</id>


Mime
View raw message