mirror of
https://github.com/apache/zeppelin
synced 2026-05-24 09:38:26 +00:00
Missed a couple of resolved conflicts
This commit is contained in:
Rajat Venkatesh
parent
afd50bc551
commit
b8b52ba7d4
2 changed files with 2 additions and 219 deletions
|
|
@ -23,13 +23,13 @@
|
|||
<parent>
|
||||
<artifactId>zeppelin</artifactId>
|
||||
<groupId>org.apache.zeppelin</groupId>
|
||||
<version>0.5.0-incubating-SNAPSHOT</version>
|
||||
<version>0.6.0-incubating-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<groupId>org.apache.zeppelin</groupId>
|
||||
<artifactId>zeppelin-hbase</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
<version>0.5.0-incubating-SNAPSHOT</version>
|
||||
<version>0.6.0-incubating-SNAPSHOT</version>
|
||||
<name>Zeppelin: HBase interpreter</name>
|
||||
<url>http://www.apache.org</url>
|
||||
|
||||
|
|
|
|||
217
pom.xml
217
pom.xml
|
|
@ -641,222 +641,5 @@
|
|||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
<<<<<<< HEAD
|
||||
|
||||
<profile>
|
||||
<id>spark-1.1</id>
|
||||
<dependencies>
|
||||
|
||||
</dependencies>
|
||||
<properties>
|
||||
<spark.version>1.1.1</spark.version>
|
||||
</properties>
|
||||
</profile>
|
||||
|
||||
<profile>
|
||||
<id>spark-1.2</id>
|
||||
<dependencies>
|
||||
</dependencies>
|
||||
<properties>
|
||||
<akka.version>2.3.4-spark</akka.version>
|
||||
<spark.version>1.2.1</spark.version>
|
||||
<hive.version>0.13.1a</hive.version>
|
||||
<derby.version>10.10.1.1</derby.version>
|
||||
<parquet.version>1.6.0rc3</parquet.version>
|
||||
<chill.version>0.5.0</chill.version>
|
||||
<commons.httpclient.version>4.2.6</commons.httpclient.version>
|
||||
<commons.math3.version>3.1.1</commons.math3.version>
|
||||
<io.netty.version>4.0.23.Final</io.netty.version>
|
||||
</properties>
|
||||
</profile>
|
||||
|
||||
<profile>
|
||||
<id>spark-1.3</id>
|
||||
<dependencies>
|
||||
</dependencies>
|
||||
<properties>
|
||||
<akka.version>2.3.4-spark</akka.version>
|
||||
<spark.version>1.3.0</spark.version>
|
||||
<mesos.version>0.21.0</mesos.version>
|
||||
<hbase.version>0.98.7</hbase.version>
|
||||
<hbase.artifact>hbase</hbase.artifact>
|
||||
<hive.group>org.spark-project.hive</hive.group>
|
||||
<hive.version>0.13.1a</hive.version>
|
||||
<derby.version>10.10.1.1</derby.version>
|
||||
<orbit.version>3.0.0.v201112011016</orbit.version>
|
||||
<parquet.version>1.6.0rc3</parquet.version>
|
||||
<chill.version>0.5.0</chill.version>
|
||||
<ivy.version>2.4.0</ivy.version>
|
||||
<oro.version>2.0.8</oro.version>
|
||||
<avro.mapred.classifier></avro.mapred.classifier>
|
||||
<codahale.metrics.version>3.1.0</codahale.metrics.version>
|
||||
<commons.httpclient.version>4.2.6</commons.httpclient.version>
|
||||
<commons.math3.version>3.1.1</commons.math3.version>
|
||||
<io.netty.version>4.0.23.Final</io.netty.version>
|
||||
<codehaus.jackson.version>1.9.13</codehaus.jackson.version>
|
||||
<fasterxml.jackson.version>2.4.4</fasterxml.jackson.version>
|
||||
<snappy.version>1.1.1.6</snappy.version>
|
||||
<mesos.version>0.21.0</mesos.version>
|
||||
</properties>
|
||||
</profile>
|
||||
|
||||
<profile>
|
||||
<id>hadoop-0.23</id>
|
||||
<!-- SPARK-1121: Adds an explicit dependency on Avro to work around a
|
||||
Hadoop 0.23.X issue -->
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.apache.avro</groupId>
|
||||
<artifactId>avro</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<properties>
|
||||
<hadoop.version>0.23.10</hadoop.version>
|
||||
</properties>
|
||||
</profile>
|
||||
|
||||
<profile>
|
||||
<id>hadoop-2.2</id>
|
||||
<properties>
|
||||
<hadoop.version>2.2.0</hadoop.version>
|
||||
<protobuf.version>2.5.0</protobuf.version>
|
||||
</properties>
|
||||
</profile>
|
||||
|
||||
<profile>
|
||||
<id>hadoop-2.3</id>
|
||||
<properties>
|
||||
<hadoop.version>2.3.0</hadoop.version>
|
||||
<protobuf.version>2.5.0</protobuf.version>
|
||||
<jets3t.version>0.9.0</jets3t.version>
|
||||
</properties>
|
||||
</profile>
|
||||
|
||||
<profile>
|
||||
<id>hadoop-2.4</id>
|
||||
<properties>
|
||||
<hadoop.version>2.4.0</hadoop.version>
|
||||
<protobuf.version>2.5.0</protobuf.version>
|
||||
<jets3t.version>0.9.3</jets3t.version>
|
||||
</properties>
|
||||
</profile>
|
||||
|
||||
<profile>
|
||||
<id>hadoop-2.6</id>
|
||||
<properties>
|
||||
<hadoop.version>2.6.0</hadoop.version>
|
||||
<protobuf.version>2.5.0</protobuf.version>
|
||||
<jets3t.version>0.9.3</jets3t.version>
|
||||
<codehaus.jackson.version>1.9.13</codehaus.jackson.version>
|
||||
</properties>
|
||||
</profile>
|
||||
|
||||
<profile>
|
||||
<id>hbase-1.0</id>
|
||||
<properties>
|
||||
<hbase.version>1.0.0</hbase.version>
|
||||
<hadoop.version>2.6.0</hadoop.version>
|
||||
<protobuf.version>2.5.0</protobuf.version>
|
||||
<jets3t.version>0.9.3</jets3t.version>
|
||||
<codehaus.jackson.version>1.9.13</codehaus.jackson.version>
|
||||
</properties>
|
||||
</profile>
|
||||
|
||||
<profile>
|
||||
<id>mapr3</id>
|
||||
<activation>
|
||||
<activeByDefault>false</activeByDefault>
|
||||
</activation>
|
||||
<properties>
|
||||
<hadoop.version>1.0.3-mapr-3.0.3</hadoop.version>
|
||||
<yarn.version>2.3.0-mapr-4.0.0-FCS</yarn.version>
|
||||
<hbase.version>0.94.17-mapr-1405</hbase.version>
|
||||
<zookeeper.version>3.4.5-mapr-1406</zookeeper.version>
|
||||
</properties>
|
||||
</profile>
|
||||
|
||||
<profile>
|
||||
<id>mapr4</id>
|
||||
<activation>
|
||||
<activeByDefault>false</activeByDefault>
|
||||
</activation>
|
||||
<properties>
|
||||
<hadoop.version>2.3.0-mapr-4.0.0-FCS</hadoop.version>
|
||||
<yarn.version>2.3.0-mapr-4.0.0-FCS</yarn.version>
|
||||
<hbase.version>0.94.17-mapr-1405-4.0.0-FCS</hbase.version>
|
||||
<zookeeper.version>3.4.5-mapr-1406</zookeeper.version>
|
||||
</properties>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.apache.curator</groupId>
|
||||
<artifactId>curator-recipes</artifactId>
|
||||
<version>2.4.0</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>org.apache.zookeeper</groupId>
|
||||
<artifactId>zookeeper</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.zookeeper</groupId>
|
||||
<artifactId>zookeeper</artifactId>
|
||||
<version>3.4.5-mapr-1406</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</profile>
|
||||
|
||||
<!-- Build without Hadoop dependencies that are included in some runtime environments. -->
|
||||
<profile>
|
||||
<id>hadoop-provided</id>
|
||||
<activation>
|
||||
<activeByDefault>false</activeByDefault>
|
||||
</activation>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.apache.hadoop</groupId>
|
||||
<artifactId>hadoop-client</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.hadoop</groupId>
|
||||
<artifactId>hadoop-yarn-api</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.hadoop</groupId>
|
||||
<artifactId>hadoop-yarn-common</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.hadoop</groupId>
|
||||
<artifactId>hadoop-yarn-server-web-proxy</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.hadoop</groupId>
|
||||
<artifactId>hadoop-yarn-client</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.avro</groupId>
|
||||
<artifactId>avro</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.avro</groupId>
|
||||
<artifactId>avro-ipc</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.zookeeper</groupId>
|
||||
<artifactId>zookeeper</artifactId>
|
||||
<version>${zookeeper.version}</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</profile>
|
||||
=======
|
||||
>>>>>>> master
|
||||
</profiles>
|
||||
</project>
|
||||
|
|
|
|||
Loading…
Reference in a new issue