From 9b6d8f6a38deb207dd0206de9a419ac6f6eae78f Mon Sep 17 00:00:00 2001
From: Sergio Gomez <sgomez@stratio.com>
Date: Tue, 29 Dec 2015 15:00:33 +0100
Subject: [PATCH] Mongo and Elastic fix. SPARKTA-273

---
 plugins/output-elasticsearch/pom.xml | 18 ------------------
 plugins/output-mongodb/pom.xml       | 18 ------------------
 pom.xml                              |  4 ++++
 test-at/pom.xml                      |  2 +-
 4 files changed, 5 insertions(+), 37 deletions(-)

diff --git a/plugins/output-elasticsearch/pom.xml b/plugins/output-elasticsearch/pom.xml
index 211c690a57..f08a91ac76 100644
--- a/plugins/output-elasticsearch/pom.xml
+++ b/plugins/output-elasticsearch/pom.xml
@@ -26,24 +26,6 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>output-elasticsearch</artifactId>
 
-    <profiles>
-        <profile>
-            <id>spark-1.4</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <properties>
-                <elastic.spark.version>2.1.2</elastic.spark.version>
-            </properties>
-        </profile>
-        <profile>
-            <id>spark-1.5</id>
-            <properties>
-                <elastic.spark.version>2.2.0-beta1</elastic.spark.version>
-            </properties>
-        </profile>
-    </profiles>
-
     <dependencies>
         <dependency>
             <groupId>org.elasticsearch</groupId>
diff --git a/plugins/output-mongodb/pom.xml b/plugins/output-mongodb/pom.xml
index c13891a0a5..9182af66ad 100644
--- a/plugins/output-mongodb/pom.xml
+++ b/plugins/output-mongodb/pom.xml
@@ -26,24 +26,6 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>output-mongodb</artifactId>
 
-    <profiles>
-        <profile>
-            <id>spark-1.4</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <properties>
-                <mongodb.spark.version>0.9.2</mongodb.spark.version>
-            </properties>
-        </profile>
-        <profile>
-            <id>spark-1.5</id>
-            <properties>
-                <mongodb.spark.version>0.10.1</mongodb.spark.version>
-            </properties>
-        </profile>
-    </profiles>
-
     <dependencies>
         <dependency>
             <groupId>org.mongodb</groupId>
diff --git a/pom.xml b/pom.xml
index 2b30eb706a..2facb49a71 100644
--- a/pom.xml
+++ b/pom.xml
@@ -523,6 +523,8 @@
             <properties>
                 <spark.version>1.4.1</spark.version>
                 <spark.version.folder>1.4</spark.version.folder>
+                <mongodb.spark.version>0.9.2</mongodb.spark.version>
+                <elastic.spark.version>2.1.2</elastic.spark.version>
             </properties>
         </profile>
         <profile>
@@ -533,6 +535,8 @@
             <properties>
                 <spark.version.folder>1.5</spark.version.folder>
                 <spark.version>1.5.2</spark.version>
+                <mongodb.spark.version>0.10.1</mongodb.spark.version>
+                <elastic.spark.version>2.2.0-beta1</elastic.spark.version>
             </properties>
         </profile>
     </profiles>
diff --git a/test-at/pom.xml b/test-at/pom.xml
index 9205eaa03a..9f5a0dc8e8 100644
--- a/test-at/pom.xml
+++ b/test-at/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>com.stratio.sparkta</groupId>
-        <version>0.8.0-SNAPSHOT</version>
+        <version>0.8.0-RC3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>