Skip to content

Commit 861dd1f

Browse files
Mikhail Gorbovekrivokonmapr
Mikhail Gorbov
authored and
ekrivokonmapr
committed
Fixed maprdb connector dependencies. (apache#160)
1 parent d114c88 commit 861dd1f

File tree

2 files changed

+112
-137
lines changed

2 files changed

+112
-137
lines changed

‎assembly/pom.xml‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
</parent>
2727

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

@@ -193,6 +193,20 @@
193193
</dependency>
194194
</dependencies>
195195
</profile>
196+
<profile>
197+
<id>include-maprdb</id>
198+
<activation>
199+
<activeByDefault>true</activeByDefault>
200+
</activation>
201+
<dependencies>
202+
<dependency>
203+
<groupId>com.mapr.db</groupId>
204+
<artifactId>maprdb-spark</artifactId>
205+
<version>${project.version}</version>
206+
</dependency>
207+
</dependencies>
208+
</profile>
209+
196210
<profile>
197211
<id>spark-ganglia-lgpl</id>
198212
<dependencies>

‎external/maprdb/pom.xml‎

Lines changed: 97 additions & 136 deletions
Original file line numberDiff line numberDiff line change
@@ -1,145 +1,106 @@
11
<?xml version="1.0"?>
22
<!-- Copyright (c) 2015 MapR, Inc. -->
33
<project
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
5-
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
6-
<modelVersion>4.0.0</modelVersion>
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
5+
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
6+
<modelVersion>4.0.0</modelVersion>
77

8-
<parent>
9-
<groupId>org.apache.spark</groupId>
10-
<artifactId>spark-parent_2.11</artifactId>
11-
<version>2.1.0-mapr-SNAPSHOT</version>
12-
<relativePath>../../pom.xml</relativePath>
13-
</parent>
8+
<parent>
9+
<groupId>org.apache.spark</groupId>
10+
<artifactId>spark-parent_2.11</artifactId>
11+
<version>2.1.0-mapr-SNAPSHOT</version>
12+
<relativePath>../../pom.xml</relativePath>
13+
</parent>
1414

15-
<groupId>com.mapr.db</groupId>
16-
<artifactId>maprdb-spark</artifactId>
17-
<packaging>jar</packaging>
15+
<groupId>com.mapr.db</groupId>
16+
<artifactId>maprdb-spark</artifactId>
17+
<packaging>jar</packaging>
1818

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

22-
<dependencies>
23-
<dependency>
24-
<groupId>com.mapr.db</groupId>
25-
<artifactId>maprdb</artifactId>
26-
<version>5.2.2-mapr</version>
27-
</dependency>
28-
<dependency>
29-
<groupId>org.apache.spark</groupId>
30-
<artifactId>spark-core_${scala.binary.version}</artifactId>
31-
<version>${project.version}</version>
32-
<scope>provided</scope>
33-
</dependency>
34-
<dependency>
35-
<groupId>org.apache.spark</groupId>
36-
<artifactId>spark-streaming_${scala.binary.version}</artifactId>
37-
<version>${project.version}</version>
38-
<scope>provided</scope>
39-
</dependency>
40-
<dependency>
41-
<groupId>org.apache.spark</groupId>
42-
<artifactId>spark-sql_${scala.binary.version}</artifactId>
43-
<version>${project.version}</version>
44-
<scope>provided</scope>
45-
</dependency>
46-
<dependency>
47-
<groupId>org.scala-lang</groupId>
48-
<artifactId>scala-library</artifactId>
49-
<scope>provided</scope>
50-
</dependency>
51-
<dependency>
52-
<groupId>com.fasterxml.jackson.module</groupId>
53-
<artifactId>jackson-module-scala_${scala.binary.version}</artifactId>
54-
<version>${fasterxml.jackson.version}</version>
55-
</dependency>
56-
<dependency>
57-
<groupId>org.specs2</groupId>
58-
<artifactId>specs2-core_${scala.binary.version}</artifactId>
59-
<version>2.4.17</version>
60-
</dependency>
61-
<dependency>
62-
<groupId>org.specs2</groupId>
63-
<artifactId>specs2-junit_${scala.binary.version}</artifactId>
64-
<version>2.4.17</version>
65-
</dependency>
66-
<dependency>
67-
<groupId>org.scalatest</groupId>
68-
<artifactId>scalatest_${scala.binary.version}</artifactId>
69-
</dependency>
70-
<dependency>
71-
<groupId>com.mapr.db</groupId>
72-
<artifactId>maprdb-mapreduce</artifactId>
73-
<version>5.2.2-mapr</version>
74-
</dependency>
75-
<dependency>
76-
<groupId>org.ojai</groupId>
77-
<artifactId>ojai</artifactId>
78-
<version>1.1-mapr-1703</version>
79-
</dependency>
80-
<dependency>
81-
<groupId>org.ojai</groupId>
82-
<artifactId>ojai-scala</artifactId>
83-
<version>1.1-mapr-1703</version>
84-
</dependency>
85-
<dependency>
86-
<groupId>com.mapr</groupId>
87-
<artifactId>mapr-java-utils</artifactId>
88-
<version>5.2.2-mapr</version>
89-
<classifier>tests</classifier>
90-
<scope>test</scope>
91-
</dependency>
92-
</dependencies>
22+
<dependencies>
23+
<dependency>
24+
<groupId>com.mapr.db</groupId>
25+
<artifactId>maprdb</artifactId>
26+
<version>5.2.2-mapr</version>
27+
<scope>provided</scope>
28+
</dependency>
29+
<dependency>
30+
<groupId>org.apache.spark</groupId>
31+
<artifactId>spark-core_${scala.binary.version}</artifactId>
32+
<version>${project.version}</version>
33+
<scope>provided</scope>
34+
</dependency>
35+
<dependency>
36+
<groupId>org.apache.spark</groupId>
37+
<artifactId>spark-streaming_${scala.binary.version}</artifactId>
38+
<version>${project.version}</version>
39+
<scope>provided</scope>
40+
</dependency>
41+
<dependency>
42+
<groupId>org.apache.spark</groupId>
43+
<artifactId>spark-sql_${scala.binary.version}</artifactId>
44+
<version>${project.version}</version>
45+
<scope>provided</scope>
46+
</dependency>
47+
<dependency>
48+
<groupId>org.scala-lang</groupId>
49+
<artifactId>scala-library</artifactId>
50+
<scope>provided</scope>
51+
</dependency>
52+
<dependency>
53+
<groupId>com.fasterxml.jackson.module</groupId>
54+
<artifactId>jackson-module-scala_${scala.binary.version}</artifactId>
55+
<version>${fasterxml.jackson.version}</version>
56+
<scope>provided</scope>
57+
</dependency>
58+
<dependency>
59+
<groupId>org.specs2</groupId>
60+
<artifactId>specs2-core_${scala.binary.version}</artifactId>
61+
<version>2.4.17</version>
62+
<scope>provided</scope>
63+
</dependency>
64+
<dependency>
65+
<groupId>org.specs2</groupId>
66+
<artifactId>specs2-junit_${scala.binary.version}</artifactId>
67+
<version>2.4.17</version>
68+
<scope>test</scope>
69+
</dependency>
70+
<dependency>
71+
<groupId>org.scalatest</groupId>
72+
<artifactId>scalatest_${scala.binary.version}</artifactId>
73+
<scope>test</scope>
74+
</dependency>
75+
<dependency>
76+
<groupId>com.mapr.db</groupId>
77+
<artifactId>maprdb-mapreduce</artifactId>
78+
<version>5.2.2-mapr</version>
79+
<scope>provided</scope>
80+
</dependency>
81+
<dependency>
82+
<groupId>org.ojai</groupId>
83+
<artifactId>ojai</artifactId>
84+
<version>1.1-mapr-1703</version>
85+
<scope>provided</scope>
86+
</dependency>
87+
<dependency>
88+
<groupId>org.ojai</groupId>
89+
<artifactId>ojai-scala</artifactId>
90+
<version>1.1-mapr-1703</version>
91+
<scope>provided</scope>
92+
</dependency>
93+
<dependency>
94+
<groupId>com.mapr</groupId>
95+
<artifactId>mapr-java-utils</artifactId>
96+
<version>5.2.2-mapr</version>
97+
<classifier>tests</classifier>
98+
<scope>test</scope>
99+
</dependency>
100+
</dependencies>
93101

94-
<build>
95-
<sourceDirectory>src/main/scala</sourceDirectory>
96-
<testSourceDirectory>src/test/scala</testSourceDirectory>
97-
<plugins>
98-
<plugin>
99-
<groupId>net.alchim31.maven</groupId>
100-
<artifactId>scala-maven-plugin</artifactId>
101-
<configuration>
102-
<recompileMode>incremental</recompileMode>
103-
<args>
104-
<arg>-explaintypes</arg>
105-
</args>
106-
</configuration>
107-
<executions>
108-
<execution>
109-
<id>scala-compile-first</id>
110-
<phase>process-resources</phase>
111-
<goals>
112-
<goal>add-source</goal>
113-
<goal>compile</goal>
114-
</goals>
115-
</execution>
116-
<execution>
117-
<id>scala-test-compile</id>
118-
<phase>process-test-resources</phase>
119-
<goals>
120-
<goal>add-source</goal>
121-
<goal>testCompile</goal>
122-
</goals>
123-
</execution>
124-
</executions>
125-
</plugin>
126-
<plugin>
127-
<groupId>org.apache.maven.plugins</groupId>
128-
<artifactId>maven-surefire-plugin</artifactId>
129-
<configuration>
130-
<includes>
131-
<include>**/*Tests*.*</include>
132-
</includes>
133-
</configuration>
134-
</plugin>
135-
<plugin>
136-
<groupId>org.apache.maven.plugins</groupId>
137-
<artifactId>maven-compiler-plugin</artifactId>
138-
<configuration>
139-
<source>1.7</source>
140-
<target>1.7</target>
141-
</configuration>
142-
</plugin>
143-
</plugins>
144-
</build>
102+
<build>
103+
<outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory>
104+
<testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory>
105+
</build>
145106
</project>

0 commit comments

Comments
 (0)