Skip to content

Commit

Permalink
Spark 186 (apache#237)
Browse files Browse the repository at this point in the history 
* MapR [SPARK-186] Update OJAI versions to the latest for Spark-2.2.1 OJAI Connector
  • Loading branch information
@ekrivokonmapr
ekrivokonmapr committed Sep 19, 2019
1 parent 8a049c1 commit 718f948
Show file tree
Hide file tree
Showing 2 changed files with 90 additions and 232 deletions.
177 changes: 90 additions & 87 deletions external/maprdb/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
<?xml version="1.0"?>
<!-- Copyright (c) 2015 MapR, Inc. -->
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.11</artifactId>
<version>2.1.0-mapr-SNAPSHOT</version>
<version>2.3.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<groupId>com.mapr.db</groupId>
<artifactId>maprdb-spark</artifactId>
<packaging>jar</packaging>
<groupId>com.mapr.db</groupId>
<artifactId>maprdb-spark</artifactId>
<packaging>jar</packaging>

<name>MapR-DB Spark Library</name>
<url>http://www.mapr.com/</url>
<name>MapR-DB Spark Library</name>
<url>http://www.mapr.com/</url>

<dependencies>
<dependency>
Expand Down Expand Up @@ -69,85 +69,88 @@
<groupId>org.scalatest</groupId>
<artifactId>scalatest_${scala.binary.version}</artifactId>
</dependency>
</dependencies>

<profiles>
<profile>
<id>maprdb-5.2.2</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<dependencies>
<dependency>
<groupId>com.mapr.db</groupId>
<artifactId>maprdb</artifactId>
<version>5.2.2-mapr</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.mapr.db</groupId>
<artifactId>maprdb-mapreduce</artifactId>
<version>5.2.2-mapr</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.ojai</groupId>
<artifactId>ojai</artifactId>
<version>1.1-mapr-1703</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.ojai</groupId>
<artifactId>ojai-scala</artifactId>
<version>1.1-mapr-1703</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.mapr</groupId>
<artifactId>mapr-java-utils</artifactId>
<version>5.2.2-mapr</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
</dependencies>
</profile>
<profile>
<id>maprdb-6.0.0</id>
<dependencies>
<dependency>
<groupId>com.mapr.db</groupId>
<artifactId>maprdb</artifactId>
<version>6.0.0-mapr-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.mapr.db</groupId>
<artifactId>maprdb-mapreduce</artifactId>
<version>6.0.0-mapr-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.ojai</groupId>
<artifactId>ojai</artifactId>
<version>2.0-mapr-1707-beta</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.ojai</groupId>
<artifactId>ojai-scala</artifactId>
<version>2.0-mapr-1707-beta</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.mapr</groupId>
<artifactId>mapr-java-utils</artifactId>
<version>6.0.0-mapr-SNAPSHOT</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
</dependencies>
</profile>
</profiles>
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-core_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-core_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-streaming_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-sql_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-scala_${scala.binary.version}</artifactId>
<version>${fasterxml.jackson.version}</version>
</dependency>
<dependency>
<groupId>org.specs2</groupId>
<artifactId>specs2-core_${scala.binary.version}</artifactId>
<version>2.4.17</version>
</dependency>
<dependency>
<groupId>org.specs2</groupId>
<artifactId>specs2-junit_${scala.binary.version}</artifactId>
<version>2.4.17</version>
</dependency>
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_${scala.binary.version}</artifactId>
</dependency>
<dependency>
<groupId>com.mapr.db</groupId>
<artifactId>maprdb</artifactId>
<version>6.0.1-mapr</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.mapr.db</groupId>
<artifactId>maprdb-mapreduce</artifactId>
<version>6.0.1-mapr</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.ojai</groupId>
<artifactId>ojai</artifactId>
<version>2.0-mapr-1710</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.ojai</groupId>
<artifactId>ojai-scala</artifactId>
<version>2.0-mapr-1710</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.mapr</groupId>
<artifactId>mapr-java-utils</artifactId>
<version>6.0.1-mapr</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory>
Expand Down
145 changes: 0 additions & 145 deletions external/maprdb/pom.xml.6.0
View file

This file was deleted.

0 comments on commit 718f948

Please sign in to comment.