Skip to content

Commit

Permalink
Fixed maprdb connector dependencies. (apache#160)
Browse files Browse the repository at this point in the history 
(cherry picked from commit cd7cf14)
  • Loading branch information
@mgorbov
mgorbov authored and Mikhail Gorbov committed Jan 2, 2018
1 parent 1e105aa commit 8783da4
Show file tree
Hide file tree
Showing 2 changed files with 112 additions and 137 deletions.
16 changes: 15 additions & 1 deletion assembly/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</parent>

<artifactId>spark-assembly_2.11</artifactId>
<name>Spark Project Assembly</name>
<name>Spark Integration for MapR-DB</name>
<url>http://spark.apache.org/</url>
<packaging>pom</packaging>

Expand Down Expand Up @@ -183,6 +183,20 @@
</dependency>
</dependencies>
</profile>
<profile>
<id>include-maprdb</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<dependencies>
<dependency>
<groupId>com.mapr.db</groupId>
<artifactId>maprdb-spark</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</profile>

<profile>
<id>spark-ganglia-lgpl</id>
<dependencies>
Expand Down
233 changes: 97 additions & 136 deletions external/maprdb/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,145 +1,106 @@
<?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>
<relativePath>../../pom.xml</relativePath>
</parent>
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.11</artifactId>
<version>2.1.0-mapr-SNAPSHOT</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>
<groupId>com.mapr.db</groupId>
<artifactId>maprdb</artifactId>
<version>5.2.2-mapr</version>
</dependency>
<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-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-mapreduce</artifactId>
<version>5.2.2-mapr</version>
</dependency>
<dependency>
<groupId>org.ojai</groupId>
<artifactId>ojai</artifactId>
<version>1.1-mapr-1703</version>
</dependency>
<dependency>
<groupId>org.ojai</groupId>
<artifactId>ojai-scala</artifactId>
<version>1.1-mapr-1703</version>
</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>
<dependencies>
<dependency>
<groupId>com.mapr.db</groupId>
<artifactId>maprdb</artifactId>
<version>5.2.2-mapr</version>
<scope>provided</scope>
</dependency>
<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-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>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.specs2</groupId>
<artifactId>specs2-core_${scala.binary.version}</artifactId>
<version>2.4.17</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.specs2</groupId>
<artifactId>specs2-junit_${scala.binary.version}</artifactId>
<version>2.4.17</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_${scala.binary.version}</artifactId>
<scope>test</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>

<build>
<sourceDirectory>src/main/scala</sourceDirectory>
<testSourceDirectory>src/test/scala</testSourceDirectory>
<plugins>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
<configuration>
<recompileMode>incremental</recompileMode>
<args>
<arg>-explaintypes</arg>
</args>
</configuration>
<executions>
<execution>
<id>scala-compile-first</id>
<phase>process-resources</phase>
<goals>
<goal>add-source</goal>
<goal>compile</goal>
</goals>
</execution>
<execution>
<id>scala-test-compile</id>
<phase>process-test-resources</phase>
<goals>
<goal>add-source</goal>
<goal>testCompile</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<includes>
<include>**/*Tests*.*</include>
</includes>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
</plugins>
</build>
<build>
<outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory>
<testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory>
</build>
</project>

0 comments on commit 8783da4

Please sign in to comment.