From b478e34f5f34d25b8ea925bbf0edfaad42cf58f3 Mon Sep 17 00:00:00 2001 From: Paul Curtis Date: Wed, 3 Jun 2015 13:53:47 +0000 Subject: [PATCH 01/10] Added MapR Release information for building Zeppelin for a MapR Hadoop cluster. --- pom.xml | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index fcd1a2511ef..807c9dafbb8 100644 --- a/pom.xml +++ b/pom.xml @@ -142,6 +142,15 @@ 0.9.0 + + + + mapr-releases + http://repository.mapr.com/maven/ + false + true + + @@ -1568,16 +1577,21 @@ + mapr4 false - 2.3.0-mapr-4.0.0-FCS - 2.3.0-mapr-4.0.0-FCS - 0.94.17-mapr-1405-4.0.0-FCS - 3.4.5-mapr-1406 + 2.4.1-mapr-1408 + 2.4.1-mapr-1408 + 0.98.9-mapr-1503 + 3.4.5-mapr-1503 @@ -1594,7 +1608,7 @@ org.apache.zookeeper zookeeper - 3.4.5-mapr-1406 + 3.4.5-mapr-1503 From 680e3fa7881bf147773ba6b7b177b7caf9c41fe2 Mon Sep 17 00:00:00 2001 From: Paul Curtis Date: Thu, 18 Jun 2015 19:30:28 +0000 Subject: [PATCH 02/10] Updated the MapR4 profile in the spark/pom.xml --- spark/pom.xml | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/spark/pom.xml b/spark/pom.xml index 46101671b84..ad4939240a0 100644 --- a/spark/pom.xml +++ b/spark/pom.xml @@ -538,27 +538,21 @@ - - mapr3 - - false - - - 1.0.3-mapr-3.0.3 - 2.3.0-mapr-4.0.0-FCS - 0.7.1 - - - + mapr4 false - 2.3.0-mapr-4.0.0-FCS - 2.3.0-mapr-4.0.0-FCS - 0.7.1 + 2.4.1-mapr-1408 + 2.4.1-mapr-1408 + 0.98.9-mapr-1503 + 3.4.5-mapr-1503 @@ -575,7 +569,7 @@ org.apache.zookeeper zookeeper - 3.4.5-mapr-1406 + 3.4.5-mapr-1503 From f0bb85638980338a66c528677a15727b43f4f8ed Mon Sep 17 00:00:00 2001 From: Paul Curtis Date: Thu, 18 Jun 2015 20:10:42 +0000 Subject: [PATCH 03/10] Initial commit of Drill Interpreter. This is built on the Hive JDBC Interpreter code --- drill/pom.xml | 141 ++++++++++++ .../zeppelin/drill/DrillInterpreter.java | 203 ++++++++++++++++++ pom.xml | 1 + 3 files changed, 345 insertions(+) create mode 100644 drill/pom.xml create mode 100644 drill/src/main/java/org/apache/zeppelin/drill/DrillInterpreter.java diff --git a/drill/pom.xml b/drill/pom.xml new file mode 100644 index 00000000000..6fd77d055b3 --- /dev/null +++ b/drill/pom.xml @@ -0,0 +1,141 @@ + + + + + 4.0.0 + + + zeppelin + org.apache.zeppelin + 0.5.0-incubating-SNAPSHOT + + + org.apache.zeppelin + zeppelin-drill + jar + 0.5.0-incubating-SNAPSHOT + Zeppelin: Hive interpreter + http://www.apache.org + + + 1.0.0 + + + + org.apache.zeppelin + zeppelin-interpreter + ${project.version} + provided + + + + org.apache.commons + commons-exec + 1.1 + + + + org.slf4j + slf4j-api + + + + org.slf4j + slf4j-log4j12 + + + + org.apache.drill + drill-jdbc + ${drill.version} + + + junit + junit + test + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + 2.7 + + true + + + + + maven-enforcer-plugin + 1.3.1 + + + enforce + none + + + + + + maven-dependency-plugin + 2.8 + + + copy-dependencies + package + + copy-dependencies + + + ${project.build.directory}/../../interpreter/drill + false + false + true + runtime + + + + copy-artifact + package + + copy + + + ${project.build.directory}/../../interpreter/drill + false + false + true + runtime + + + ${project.groupId} + ${project.artifactId} + ${project.version} + ${project.packaging} + + + + + + + + + + diff --git a/drill/src/main/java/org/apache/zeppelin/drill/DrillInterpreter.java b/drill/src/main/java/org/apache/zeppelin/drill/DrillInterpreter.java new file mode 100644 index 00000000000..e4a4c0fd10b --- /dev/null +++ b/drill/src/main/java/org/apache/zeppelin/drill/DrillInterpreter.java @@ -0,0 +1,203 @@ +/** + * 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. + */ +package org.apache.zeppelin.drill; + +import java.sql.*; +import java.util.List; +import java.util.Properties; + +import org.apache.zeppelin.interpreter.*; +import org.apache.commons.lang.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.apache.zeppelin.interpreter.InterpreterResult.Code; +import org.apache.zeppelin.scheduler.Scheduler; +import org.apache.zeppelin.scheduler.SchedulerFactory; + +/** + * Drill interpreter for Zeppelin. + */ +public class DrillInterpreter extends Interpreter { + Logger logger = LoggerFactory.getLogger(DrillInterpreter.class); + int commandTimeOut = 600000; + + static final String DRILL_URL = "drill.url"; + static final String DRILL_USER = "drill.user"; + static final String DRILL_PASSWORD = "drill.password"; + + static { + Interpreter.register( + "drill", + "drill", + DrillInterpreter.class.getName(), + new InterpreterPropertyBuilder() + .add(DRILL_URL, "jdbc:drill:zk=localhost:5181/drill/drillbits", "The URL for Drill Instance.") + .add(DRILL_USER, "mapr", "The Drill user") + .add(DRILL_PASSWORD, "", "The password for the Drill user").build()); + } + + public DrillInterpreter(Properties property) { + super(property); + } + + Connection jdbcConnection; + Exception exceptionOnConnect; + + //Test only method + public Connection getJdbcConnection() + throws SQLException { + String url = getProperty(DRILL_URL); + String user = getProperty(DRILL_USER); + String password = getProperty(DRILL_PASSWORD); + + return DriverManager.getConnection(url, user, password); + } + + @Override + public void open() { + logger.info("Jdbc open connection called!"); + try { + String driverName = "org.apache.drill.jdbc.Driver"; + Class.forName(driverName); + } catch (ClassNotFoundException e) { + logger.error("Cannot load JDBC driver class", e); + exceptionOnConnect = e; + return; + } + try { + jdbcConnection = getJdbcConnection(); + exceptionOnConnect = null; + logger.info("Successfully created JDBC connection"); + } + catch (SQLException e) { + logger.error("Cannot open JDBC connection", e); + exceptionOnConnect = e; + } + } + + @Override + public void close() { + try { + if (jdbcConnection != null) { + jdbcConnection.close(); + } + } + catch (SQLException e) { + logger.error("Cannot close connection", e); + } + finally { + jdbcConnection = null; + exceptionOnConnect = null; + } + } + + Statement currentStatement; + private InterpreterResult executeSql(String sql) { + try { + if (exceptionOnConnect != null) { + return new InterpreterResult(Code.ERROR, exceptionOnConnect.getMessage()); + } + currentStatement = jdbcConnection.createStatement(); + StringBuilder msg = null; + if (StringUtils.containsIgnoreCase(sql, "EXPLAIN ")) { + //return the explain as text, make this visual explain later + msg = new StringBuilder(); + } + else { + msg = new StringBuilder("%table "); + } + ResultSet res = currentStatement.executeQuery(sql); + try { + ResultSetMetaData md = res.getMetaData(); + for (int i = 1; i < md.getColumnCount() + 1; i++) { + if (i == 1) { + msg.append(md.getColumnName(i)); + } else { + msg.append("\t" + md.getColumnName(i)); + } + } + msg.append("\n"); + while (res.next()) { + for (int i = 1; i < md.getColumnCount() + 1; i++) { + msg.append(res.getString(i) + "\t"); + } + msg.append("\n"); + } + } + finally { + try { + res.close(); + currentStatement.close(); + } + finally { + currentStatement = null; + } + } + + InterpreterResult rett = new InterpreterResult(Code.SUCCESS, msg.toString()); + return rett; + } + catch (SQLException ex) { + logger.error("Can not run " + sql, ex); + return new InterpreterResult(Code.ERROR, ex.getMessage()); + } + } + + @Override + public InterpreterResult interpret(String cmd, InterpreterContext contextInterpreter) { + logger.info("Run SQL command '" + cmd + "'"); + return executeSql(cmd); + } + + @Override + public void cancel(InterpreterContext context) { + if (currentStatement != null) { + try { + currentStatement.cancel(); + } + catch (SQLException ex) { + } + finally { + currentStatement = null; + } + } + } + + @Override + public FormType getFormType() { + return FormType.SIMPLE; + } + + @Override + public int getProgress(InterpreterContext context) { + return 0; + } + + @Override + public Scheduler getScheduler() { + return SchedulerFactory.singleton().createOrGetFIFOScheduler( + DrillInterpreter.class.getName() + this.hashCode()); + } + + @Override + public List completion(String buf, int cursor) { + return null; + } + +} diff --git a/pom.xml b/pom.xml index 917e7d90f92..9f89364a7ec 100644 --- a/pom.xml +++ b/pom.xml @@ -93,6 +93,7 @@ hive tajo flink + drill zeppelin-web zeppelin-server zeppelin-distribution From cfac4e2f37c67c8a3363e7e7e879423931b9a72e Mon Sep 17 00:00:00 2001 From: Paul Curtis Date: Fri, 19 Jun 2015 11:00:02 +0000 Subject: [PATCH 04/10] Added Apache Drill interpreter. The Drill JDBC driver is not in any Maven repo, so it must be add to the local repo before building like so: mvn install:install-file -Dfile=/drill-jdbc-all-1.0.0-mapr-r1.jar -DgroupId=org.apache.drill -DartifactId=drill-jdbc-all -Dversion=1.0.0-mapr-r1 -Dpackaging=jar --- drill/pom.xml | 8 ++++---- .../java/org/apache/zeppelin/drill/DrillInterpreter.java | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drill/pom.xml b/drill/pom.xml index 6fd77d055b3..97fbc0225f5 100644 --- a/drill/pom.xml +++ b/drill/pom.xml @@ -29,11 +29,11 @@ zeppelin-drill jar 0.5.0-incubating-SNAPSHOT - Zeppelin: Hive interpreter + Zeppelin: Drill interpreter http://www.apache.org - 1.0.0 + 1.0.0-mapr-r1 @@ -61,8 +61,8 @@ org.apache.drill - drill-jdbc - ${drill.version} + drill-jdbc-all + ${drill.drill.version} junit diff --git a/drill/src/main/java/org/apache/zeppelin/drill/DrillInterpreter.java b/drill/src/main/java/org/apache/zeppelin/drill/DrillInterpreter.java index e4a4c0fd10b..f7fed768499 100644 --- a/drill/src/main/java/org/apache/zeppelin/drill/DrillInterpreter.java +++ b/drill/src/main/java/org/apache/zeppelin/drill/DrillInterpreter.java @@ -37,9 +37,9 @@ public class DrillInterpreter extends Interpreter { Logger logger = LoggerFactory.getLogger(DrillInterpreter.class); int commandTimeOut = 600000; - static final String DRILL_URL = "drill.url"; - static final String DRILL_USER = "drill.user"; - static final String DRILL_PASSWORD = "drill.password"; + static final String DRILL_URL = "drill.drill.url"; + static final String DRILL_USER = "drill.drill.user"; + static final String DRILL_PASSWORD = "drill.drill.password"; static { Interpreter.register( @@ -47,7 +47,7 @@ public class DrillInterpreter extends Interpreter { "drill", DrillInterpreter.class.getName(), new InterpreterPropertyBuilder() - .add(DRILL_URL, "jdbc:drill:zk=localhost:5181/drill/drillbits", "The URL for Drill Instance.") + .add(DRILL_URL, "jdbc:drill:", "The URL for Drill Instance.") .add(DRILL_USER, "mapr", "The Drill user") .add(DRILL_PASSWORD, "", "The password for the Drill user").build()); } From 43db2f4435653089825f035da149f66ce9669cee Mon Sep 17 00:00:00 2001 From: Paul Curtis Date: Fri, 19 Jun 2015 13:07:21 +0000 Subject: [PATCH 05/10] Added spark dependancy --- spark/dependency-reduced-pom.xml | 531 +++++++++++++++++++++++++++++++ 1 file changed, 531 insertions(+) create mode 100644 spark/dependency-reduced-pom.xml diff --git a/spark/dependency-reduced-pom.xml b/spark/dependency-reduced-pom.xml new file mode 100644 index 00000000000..c08a386528f --- /dev/null +++ b/spark/dependency-reduced-pom.xml @@ -0,0 +1,531 @@ + + + + zeppelin + org.apache.zeppelin + 0.5.0-incubating-SNAPSHOT + + 4.0.0 + org.apache.zeppelin + zeppelin-spark + Zeppelin: Spark + 0.5.0-incubating-SNAPSHOT + Zeppelin spark support + http://zeppelin.incubator.apache.org + + + + org.apache.rat + apache-rat-plugin + + + **/.idea/ + **/*.iml + .gitignore + **/.settings/* + **/.classpath + **/.project + **/target/** + **/derby.log + **/metastore_db/ + **/README.md + dependency-reduced-pom.xml + + + + + maven-deploy-plugin + 2.7 + + true + + + + maven-enforcer-plugin + 1.3.1 + + + enforce + none + + + + + maven-surefire-plugin + 2.17 + + 1 + false + -Xmx1024m -XX:MaxPermSize=256m + + + + maven-shade-plugin + 2.3 + + + package + + shade + + + + + + + *:* + + org/datanucleus/** + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + + + + reference.conf + + + + + + maven-dependency-plugin + 2.8 + + + copy-dependencies + package + + copy-dependencies + + + ${project.build.directory}/../../interpreter/spark + false + false + true + org.datanucleus + + + + package + + copy + + + ${project.build.directory}/../../interpreter/spark + false + false + true + + + ${project.groupId} + ${project.artifactId} + ${project.version} + ${project.packaging} + + + + + + + + + + + spark-1.1 + + 1.1.1 + + + + cassandra-spark-1.1 + + + com.datastax.spark + spark-cassandra-connector_${scala.binary.version} + 1.1.1 + + + joda-convert + org.joda + + + + + + 1.1.1 + + + + spark-1.2 + + 1.2.1 + + + + cassandra-spark-1.2 + + + com.datastax.spark + spark-cassandra-connector_${scala.binary.version} + 1.2.1 + + + joda-convert + org.joda + + + + + + 1.2.1 + + + + spark-1.3 + + 1.3.1 + + + + cassandra-spark-1.3 + + + com.datastax.spark + spark-cassandra-connector_${scala.binary.version} + 1.3.0-SNAPSHOT + + + joda-convert + org.joda + + + + + + 1.3.0 + + + + spark-1.4 + + 1.4.0 + + + + hadoop-0.23 + + + org.apache.avro + avro + + + + 0.7.1 + 0.23.10 + + + + hadoop-2.2 + + 0.7.1 + 2.2.0 + + + + hadoop-2.3 + + 2.3.0 + + + + hadoop-2.4 + + 2.4.0 + + + + hadoop-2.6 + + 2.6.0 + + + + mapr4 + + + org.apache.curator + curator-recipes + 2.4.0 + compile + + + zookeeper + org.apache.zookeeper + + + + + org.apache.zookeeper + zookeeper + 3.4.5-mapr-1503 + compile + + + + 3.4.5-mapr-1503 + 0.98.9-mapr-1503 + 2.4.1-mapr-1408 + 2.4.1-mapr-1408 + + + + yarn + + + org.apache.spark + spark-yarn_2.10 + 1.2.1 + compile + + + org.apache.hadoop + hadoop-yarn-api + 2.4.1-mapr-1408 + compile + + + asm + asm + + + asm + org.ow2.asm + + + netty + org.jboss.netty + + + commons-logging + commons-logging + + + + + + + hadoop-provided + + + org.apache.hadoop + hadoop-client + provided + + + org.apache.hadoop + hadoop-yarn-api + provided + + + org.apache.hadoop + hadoop-yarn-common + provided + + + org.apache.hadoop + hadoop-yarn-server-web-proxy + provided + + + org.apache.hadoop + hadoop-yarn-client + provided + + + org.apache.avro + avro + provided + + + org.apache.avro + avro-ipc + provided + + + org.apache.zookeeper + zookeeper + ${zookeeper.version} + provided + + + + + + + cloudera + https://repository.cloudera.com/artifactory/cloudera-repos/ + + + + + org.apache.zeppelin + zeppelin-interpreter + 0.5.0-incubating-SNAPSHOT + provided + + + gson + com.google.code.gson + + + commons-pool2 + org.apache.commons + + + + + junit + junit + 4.11 + test + + + hamcrest-core + org.hamcrest + + + + + + + + net.java.dev.jets3t + jets3t + ${jets3t.version} + runtime + + + commons-logging + commons-logging + + + + + org.apache.hadoop + hadoop-yarn-api + ${yarn.version} + + + asm + asm + + + asm + org.ow2.asm + + + netty + org.jboss.netty + + + commons-logging + commons-logging + + + + + org.apache.hadoop + hadoop-yarn-common + ${yarn.version} + + + asm + asm + + + asm + org.ow2.asm + + + netty + org.jboss.netty + + + servlet-api + javax.servlet + + + commons-logging + commons-logging + + + + + org.apache.hadoop + hadoop-yarn-server-web-proxy + ${yarn.version} + + + asm + asm + + + asm + org.ow2.asm + + + netty + org.jboss.netty + + + servlet-api + javax.servlet + + + commons-logging + commons-logging + + + + + org.apache.hadoop + hadoop-yarn-client + ${yarn.version} + + + asm + asm + + + asm + org.ow2.asm + + + netty + org.jboss.netty + + + servlet-api + javax.servlet + + + commons-logging + commons-logging + + + + + + + 2.10.4 + 2.10 + 0.9.3 + 2.3.0 + ${hadoop.version} + 1.3.1 + + + From 389b887bd19c6f997fb505243a2c2710fb22d17f Mon Sep 17 00:00:00 2001 From: Paul Curtis Date: Thu, 2 Jul 2015 14:08:01 +0000 Subject: [PATCH 06/10] Removed reduced POM file --- spark/dependency-reduced-pom.xml | 531 ------------------------------- 1 file changed, 531 deletions(-) delete mode 100644 spark/dependency-reduced-pom.xml diff --git a/spark/dependency-reduced-pom.xml b/spark/dependency-reduced-pom.xml deleted file mode 100644 index c08a386528f..00000000000 --- a/spark/dependency-reduced-pom.xml +++ /dev/null @@ -1,531 +0,0 @@ - - - - zeppelin - org.apache.zeppelin - 0.5.0-incubating-SNAPSHOT - - 4.0.0 - org.apache.zeppelin - zeppelin-spark - Zeppelin: Spark - 0.5.0-incubating-SNAPSHOT - Zeppelin spark support - http://zeppelin.incubator.apache.org - - - - org.apache.rat - apache-rat-plugin - - - **/.idea/ - **/*.iml - .gitignore - **/.settings/* - **/.classpath - **/.project - **/target/** - **/derby.log - **/metastore_db/ - **/README.md - dependency-reduced-pom.xml - - - - - maven-deploy-plugin - 2.7 - - true - - - - maven-enforcer-plugin - 1.3.1 - - - enforce - none - - - - - maven-surefire-plugin - 2.17 - - 1 - false - -Xmx1024m -XX:MaxPermSize=256m - - - - maven-shade-plugin - 2.3 - - - package - - shade - - - - - - - *:* - - org/datanucleus/** - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - - - - reference.conf - - - - - - maven-dependency-plugin - 2.8 - - - copy-dependencies - package - - copy-dependencies - - - ${project.build.directory}/../../interpreter/spark - false - false - true - org.datanucleus - - - - package - - copy - - - ${project.build.directory}/../../interpreter/spark - false - false - true - - - ${project.groupId} - ${project.artifactId} - ${project.version} - ${project.packaging} - - - - - - - - - - - spark-1.1 - - 1.1.1 - - - - cassandra-spark-1.1 - - - com.datastax.spark - spark-cassandra-connector_${scala.binary.version} - 1.1.1 - - - joda-convert - org.joda - - - - - - 1.1.1 - - - - spark-1.2 - - 1.2.1 - - - - cassandra-spark-1.2 - - - com.datastax.spark - spark-cassandra-connector_${scala.binary.version} - 1.2.1 - - - joda-convert - org.joda - - - - - - 1.2.1 - - - - spark-1.3 - - 1.3.1 - - - - cassandra-spark-1.3 - - - com.datastax.spark - spark-cassandra-connector_${scala.binary.version} - 1.3.0-SNAPSHOT - - - joda-convert - org.joda - - - - - - 1.3.0 - - - - spark-1.4 - - 1.4.0 - - - - hadoop-0.23 - - - org.apache.avro - avro - - - - 0.7.1 - 0.23.10 - - - - hadoop-2.2 - - 0.7.1 - 2.2.0 - - - - hadoop-2.3 - - 2.3.0 - - - - hadoop-2.4 - - 2.4.0 - - - - hadoop-2.6 - - 2.6.0 - - - - mapr4 - - - org.apache.curator - curator-recipes - 2.4.0 - compile - - - zookeeper - org.apache.zookeeper - - - - - org.apache.zookeeper - zookeeper - 3.4.5-mapr-1503 - compile - - - - 3.4.5-mapr-1503 - 0.98.9-mapr-1503 - 2.4.1-mapr-1408 - 2.4.1-mapr-1408 - - - - yarn - - - org.apache.spark - spark-yarn_2.10 - 1.2.1 - compile - - - org.apache.hadoop - hadoop-yarn-api - 2.4.1-mapr-1408 - compile - - - asm - asm - - - asm - org.ow2.asm - - - netty - org.jboss.netty - - - commons-logging - commons-logging - - - - - - - hadoop-provided - - - org.apache.hadoop - hadoop-client - provided - - - org.apache.hadoop - hadoop-yarn-api - provided - - - org.apache.hadoop - hadoop-yarn-common - provided - - - org.apache.hadoop - hadoop-yarn-server-web-proxy - provided - - - org.apache.hadoop - hadoop-yarn-client - provided - - - org.apache.avro - avro - provided - - - org.apache.avro - avro-ipc - provided - - - org.apache.zookeeper - zookeeper - ${zookeeper.version} - provided - - - - - - - cloudera - https://repository.cloudera.com/artifactory/cloudera-repos/ - - - - - org.apache.zeppelin - zeppelin-interpreter - 0.5.0-incubating-SNAPSHOT - provided - - - gson - com.google.code.gson - - - commons-pool2 - org.apache.commons - - - - - junit - junit - 4.11 - test - - - hamcrest-core - org.hamcrest - - - - - - - - net.java.dev.jets3t - jets3t - ${jets3t.version} - runtime - - - commons-logging - commons-logging - - - - - org.apache.hadoop - hadoop-yarn-api - ${yarn.version} - - - asm - asm - - - asm - org.ow2.asm - - - netty - org.jboss.netty - - - commons-logging - commons-logging - - - - - org.apache.hadoop - hadoop-yarn-common - ${yarn.version} - - - asm - asm - - - asm - org.ow2.asm - - - netty - org.jboss.netty - - - servlet-api - javax.servlet - - - commons-logging - commons-logging - - - - - org.apache.hadoop - hadoop-yarn-server-web-proxy - ${yarn.version} - - - asm - asm - - - asm - org.ow2.asm - - - netty - org.jboss.netty - - - servlet-api - javax.servlet - - - commons-logging - commons-logging - - - - - org.apache.hadoop - hadoop-yarn-client - ${yarn.version} - - - asm - asm - - - asm - org.ow2.asm - - - netty - org.jboss.netty - - - servlet-api - javax.servlet - - - commons-logging - commons-logging - - - - - - - 2.10.4 - 2.10 - 0.9.3 - 2.3.0 - ${hadoop.version} - 1.3.1 - - - From 8cd01520555ad423a8478f1aa542c206f8d2864b Mon Sep 17 00:00:00 2001 From: Paul Curtis Date: Tue, 7 Jul 2015 14:14:59 +0000 Subject: [PATCH 07/10] Updated Drill POM with proper version numbers and MapR repository. --- drill/pom.xml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/drill/pom.xml b/drill/pom.xml index 97fbc0225f5..bf044ea962b 100644 --- a/drill/pom.xml +++ b/drill/pom.xml @@ -22,7 +22,7 @@ zeppelin org.apache.zeppelin - 0.5.0-incubating-SNAPSHOT + 0.6.0-incubating-SNAPSHOT org.apache.zeppelin @@ -35,6 +35,17 @@ 1.0.0-mapr-r1 + + + + + mapr-releases + http://repository.mapr.com/maven/ + false + true + + + org.apache.zeppelin From d7325eb26575d51d6e15d02d15ade0c21fea9fb2 Mon Sep 17 00:00:00 2001 From: Paul Curtis Date: Thu, 9 Jul 2015 13:32:33 +0000 Subject: [PATCH 08/10] Changed the Apache Drill POM to reflect the mavne repo for the JDBC driver. --- drill/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drill/pom.xml b/drill/pom.xml index bf044ea962b..2e2eb53d963 100644 --- a/drill/pom.xml +++ b/drill/pom.xml @@ -33,7 +33,7 @@ http://www.apache.org - 1.0.0-mapr-r1 + 1.1.0 @@ -71,8 +71,8 @@ - org.apache.drill - drill-jdbc-all + org.apache.drill.exec + drill-jdbc ${drill.drill.version} From aeadeaede85801eb931adf75b9d303717d8d143e Mon Sep 17 00:00:00 2001 From: Paul Curtis Date: Mon, 3 Aug 2015 13:45:41 +0000 Subject: [PATCH 09/10] Added a MapR 5.0 profile and proper versioning. --- spark/pom.xml | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/spark/pom.xml b/spark/pom.xml index 9b8e3e37a29..6091a1069eb 100644 --- a/spark/pom.xml +++ b/spark/pom.xml @@ -667,11 +667,51 @@ + + hadoop-2.7 + + 2.7.0 + 2.5.0 + 0.9.3 + hadoop2 + + + + mapr5 + + false + + + 2.7.0-mapr-1506 + 2.7.0-mapr-1506 + 0.98.12-mapr-1506 + 3.4.5-mapr-1503 + + + + org.apache.curator + curator-recipes + 2.4.0 + + + org.apache.zookeeper + zookeeper + + + + + org.apache.zookeeper + zookeeper + 3.4.5-mapr-1503 + + + + mapr4 From 8544dea50c97e5e6b88f93a4a3194bd90860fde4 Mon Sep 17 00:00:00 2001 From: Paul Curtis Date: Mon, 3 Aug 2015 23:38:24 +0000 Subject: [PATCH 10/10] Changed the version number to "0.6.0" --- drill/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drill/pom.xml b/drill/pom.xml index 2e2eb53d963..61f8afed21f 100644 --- a/drill/pom.xml +++ b/drill/pom.xml @@ -28,7 +28,7 @@ org.apache.zeppelin zeppelin-drill jar - 0.5.0-incubating-SNAPSHOT + 0.6.0-incubating-SNAPSHOT Zeppelin: Drill interpreter http://www.apache.org