From 718f948999055adffca17d61fbe1832761f54427 Mon Sep 17 00:00:00 2001
From: Egor Krivokon <ekrivokon@mapr.com>
Date: Wed, 21 Mar 2018 16:37:02 +0200
Subject: [PATCH] Spark 186 (#237)

* MapR [SPARK-186] Update OJAI versions to the latest for Spark-2.2.1 OJAI Connector
---
 external/maprdb/pom.xml     | 177 ++++++++++++++++++------------------
 external/maprdb/pom.xml.6.0 | 145 -----------------------------
 2 files changed, 90 insertions(+), 232 deletions(-)
 delete mode 100644 external/maprdb/pom.xml.6.0

diff --git a/external/maprdb/pom.xml b/external/maprdb/pom.xml
index a1d4493432f2a..cfaedd5d771ca 100644
--- a/external/maprdb/pom.xml
+++ b/external/maprdb/pom.xml
@@ -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>
@@ -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>
diff --git a/external/maprdb/pom.xml.6.0 b/external/maprdb/pom.xml.6.0
deleted file mode 100644
index dca25026c9222..0000000000000
--- a/external/maprdb/pom.xml.6.0
+++ /dev/null
@@ -1,145 +0,0 @@
-<?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>
-
-   <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>
-
-  <name>MapR-DB Spark Library</name>
-  <url>http://www.mapr.com/</url>
-
-  <dependencies>
-    <dependency>
-      <groupId>com.mapr.db</groupId>
-      <artifactId>maprdb</artifactId>
-      <version>6.0.0-mapr-SNAPSHOT</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>6.0.0-mapr-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.ojai</groupId>
-      <artifactId>ojai</artifactId>
-      <version>2.0-mapr-1707-beta</version>
-    </dependency>
-    <dependency>
-      <groupId>org.ojai</groupId>
-      <artifactId>ojai-scala</artifactId>
-      <version>2.0-mapr-1707-beta</version>
-    </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>
-
-  <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.8</source>
-          <target>1.8</target>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>