Skip to content

Commit bc6afee

Browse files
ekrivokonmaprmgorbov
ekrivokonmapr
authored and
mgorbov
committed
Spark 186 (apache#237)
* MapR [SPARK-186] Update OJAI versions to the latest for Spark-2.2.1 OJAI Connector
1 parent 3725eed commit bc6afee

File tree

2 files changed

+96
-288
lines changed

2 files changed

+96
-288
lines changed

‎external/maprdb/pom.xml

Lines changed: 96 additions & 143 deletions
Original file line numberDiff line numberDiff line change
@@ -1,153 +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.2.1-mapr-SNAPSHOT</version>
12-
<relativePath>../../pom.xml</relativePath>
13-
</parent>
14-
15-
<groupId>com.mapr.db</groupId>
16-
<artifactId>maprdb-spark</artifactId>
17-
<packaging>jar</packaging>
8+
<parent>
9+
<groupId>org.apache.spark</groupId>
10+
<artifactId>spark-parent_2.11</artifactId>
11+
<version>2.2.1-mapr-SNAPSHOT</version>
12+
<relativePath>../../pom.xml</relativePath>
13+
</parent>
1814

19-
<name>MapR-DB Spark Library</name>
20-
<url>http://www.mapr.com/</url>
15+
<groupId>com.mapr.db</groupId>
16+
<artifactId>maprdb-spark</artifactId>
17+
<packaging>jar</packaging>
2118

22-
<dependencies>
23-
<dependency>
24-
<groupId>org.apache.spark</groupId>
25-
<artifactId>spark-core_${scala.binary.version}</artifactId>
26-
<version>${project.version}</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-
<type>test-jar</type>
34-
<scope>test</scope>
35-
</dependency>
36-
<dependency>
37-
<groupId>org.apache.spark</groupId>
38-
<artifactId>spark-streaming_${scala.binary.version}</artifactId>
39-
<version>${project.version}</version>
40-
<scope>provided</scope>
41-
</dependency>
42-
<dependency>
43-
<groupId>org.apache.spark</groupId>
44-
<artifactId>spark-sql_${scala.binary.version}</artifactId>
45-
<version>${project.version}</version>
46-
<scope>provided</scope>
47-
</dependency>
48-
<dependency>
49-
<groupId>org.scala-lang</groupId>
50-
<artifactId>scala-library</artifactId>
51-
<scope>provided</scope>
52-
</dependency>
53-
<dependency>
54-
<groupId>com.fasterxml.jackson.module</groupId>
55-
<artifactId>jackson-module-scala_${scala.binary.version}</artifactId>
56-
<version>${fasterxml.jackson.version}</version>
57-
</dependency>
58-
<dependency>
59-
<groupId>org.specs2</groupId>
60-
<artifactId>specs2-core_${scala.binary.version}</artifactId>
61-
<version>2.4.17</version>
62-
</dependency>
63-
<dependency>
64-
<groupId>org.specs2</groupId>
65-
<artifactId>specs2-junit_${scala.binary.version}</artifactId>
66-
<version>2.4.17</version>
67-
</dependency>
68-
<dependency>
69-
<groupId>org.scalatest</groupId>
70-
<artifactId>scalatest_${scala.binary.version}</artifactId>
71-
</dependency>
72-
</dependencies>
19+
<name>MapR-DB Spark Library</name>
20+
<url>http://www.mapr.com/</url>
7321

74-
<profiles>
75-
<profile>
76-
<id>maprdb-5.2.2</id>
77-
<activation>
78-
<activeByDefault>true</activeByDefault>
79-
</activation>
80-
<dependencies>
81-
<dependency>
82-
<groupId>com.mapr.db</groupId>
83-
<artifactId>maprdb</artifactId>
84-
<version>5.2.2-mapr</version>
85-
<scope>provided</scope>
86-
</dependency>
87-
<dependency>
88-
<groupId>com.mapr.db</groupId>
89-
<artifactId>maprdb-mapreduce</artifactId>
90-
<version>5.2.2-mapr</version>
91-
<scope>provided</scope>
92-
</dependency>
93-
<dependency>
94-
<groupId>org.ojai</groupId>
95-
<artifactId>ojai</artifactId>
96-
<version>1.1-mapr-1703</version>
97-
<scope>provided</scope>
98-
</dependency>
99-
<dependency>
100-
<groupId>org.ojai</groupId>
101-
<artifactId>ojai-scala</artifactId>
102-
<version>1.1-mapr-1703</version>
103-
<scope>provided</scope>
104-
</dependency>
105-
<dependency>
106-
<groupId>com.mapr</groupId>
107-
<artifactId>mapr-java-utils</artifactId>
108-
<version>5.2.2-mapr</version>
109-
<classifier>tests</classifier>
110-
<scope>test</scope>
111-
</dependency>
112-
</dependencies>
113-
</profile>
114-
<profile>
115-
<id>maprdb-6.0.0</id>
116-
<dependencies>
117-
<dependency>
118-
<groupId>com.mapr.db</groupId>
119-
<artifactId>maprdb</artifactId>
120-
<version>6.0.0-mapr</version>
121-
<scope>provided</scope>
122-
</dependency>
123-
<dependency>
124-
<groupId>com.mapr.db</groupId>
125-
<artifactId>maprdb-mapreduce</artifactId>
126-
<version>6.0.0-mapr</version>
127-
<scope>provided</scope>
128-
</dependency>
129-
<dependency>
130-
<groupId>org.ojai</groupId>
131-
<artifactId>ojai</artifactId>
132-
<version>2.0-mapr-1707-beta</version>
133-
<scope>provided</scope>
134-
</dependency>
135-
<dependency>
136-
<groupId>org.ojai</groupId>
137-
<artifactId>ojai-scala</artifactId>
138-
<version>2.0-mapr-1707-beta</version>
139-
<scope>provided</scope>
140-
</dependency>
141-
<dependency>
142-
<groupId>com.mapr</groupId>
143-
<artifactId>mapr-java-utils</artifactId>
144-
<version>6.0.0-mapr</version>
145-
<classifier>tests</classifier>
146-
<scope>test</scope>
147-
</dependency>
148-
</dependencies>
149-
</profile>
150-
</profiles>
22+
<dependencies>
23+
<dependency>
24+
<groupId>org.apache.spark</groupId>
25+
<artifactId>spark-core_${scala.binary.version}</artifactId>
26+
<version>${project.version}</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+
<type>test-jar</type>
34+
<scope>test</scope>
35+
</dependency>
36+
<dependency>
37+
<groupId>org.apache.spark</groupId>
38+
<artifactId>spark-streaming_${scala.binary.version}</artifactId>
39+
<version>${project.version}</version>
40+
<scope>provided</scope>
41+
</dependency>
42+
<dependency>
43+
<groupId>org.apache.spark</groupId>
44+
<artifactId>spark-sql_${scala.binary.version}</artifactId>
45+
<version>${project.version}</version>
46+
<scope>provided</scope>
47+
</dependency>
48+
<dependency>
49+
<groupId>org.scala-lang</groupId>
50+
<artifactId>scala-library</artifactId>
51+
<scope>provided</scope>
52+
</dependency>
53+
<dependency>
54+
<groupId>com.fasterxml.jackson.module</groupId>
55+
<artifactId>jackson-module-scala_${scala.binary.version}</artifactId>
56+
<version>${fasterxml.jackson.version}</version>
57+
</dependency>
58+
<dependency>
59+
<groupId>org.specs2</groupId>
60+
<artifactId>specs2-core_${scala.binary.version}</artifactId>
61+
<version>2.4.17</version>
62+
</dependency>
63+
<dependency>
64+
<groupId>org.specs2</groupId>
65+
<artifactId>specs2-junit_${scala.binary.version}</artifactId>
66+
<version>2.4.17</version>
67+
</dependency>
68+
<dependency>
69+
<groupId>org.scalatest</groupId>
70+
<artifactId>scalatest_${scala.binary.version}</artifactId>
71+
</dependency>
72+
<dependency>
73+
<groupId>com.mapr.db</groupId>
74+
<artifactId>maprdb</artifactId>
75+
<version>6.0.1-mapr</version>
76+
<scope>provided</scope>
77+
</dependency>
78+
<dependency>
79+
<groupId>com.mapr.db</groupId>
80+
<artifactId>maprdb-mapreduce</artifactId>
81+
<version>6.0.1-mapr</version>
82+
<scope>provided</scope>
83+
</dependency>
84+
<dependency>
85+
<groupId>org.ojai</groupId>
86+
<artifactId>ojai</artifactId>
87+
<version>2.0-mapr-1710</version>
88+
<scope>provided</scope>
89+
</dependency>
90+
<dependency>
91+
<groupId>org.ojai</groupId>
92+
<artifactId>ojai-scala</artifactId>
93+
<version>2.0-mapr-1710</version>
94+
<scope>provided</scope>
95+
</dependency>
96+
<dependency>
97+
<groupId>com.mapr</groupId>
98+
<artifactId>mapr-java-utils</artifactId>
99+
<version>6.0.1-mapr</version>
100+
<classifier>tests</classifier>
101+
<scope>test</scope>
102+
</dependency>
103+
</dependencies>
151104

152105
<build>
153106
<outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory>

‎external/maprdb/pom.xml.6.0

Lines changed: 0 additions & 145 deletions
This file was deleted.

0 commit comments

Comments
 (0)