Updating the pom.

Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/fdabc5e2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/fdabc5e2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/fdabc5e2

Branch: refs/heads/master
Commit: fdabc5e250118467faf703fac8bfbe698f58698f
Parents: dbd529a
Author: Aaron McCurry <[email protected]>
Authored: Sun Oct 26 12:20:58 2014 -0400
Committer: Aaron McCurry <[email protected]>
Committed: Sun Jan 11 16:28:03 2015 -0500

----------------------------------------------------------------------
 contrib/blur-spark/pom.xml | 129 +++++++++++++++++++++++++++++++---------
 1 file changed, 102 insertions(+), 27 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/fdabc5e2/contrib/blur-spark/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/blur-spark/pom.xml b/contrib/blur-spark/pom.xml
index 63a6b37..47e5904 100644
--- a/contrib/blur-spark/pom.xml
+++ b/contrib/blur-spark/pom.xml
@@ -1,6 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
-       
+<?xml version="1.0" encoding="UTF-8" ?>
 <!--
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
@@ -19,15 +17,21 @@ KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
-
+<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
        <modelVersion>4.0.0</modelVersion>
-
-       <groupId>spark-blur-connector</groupId>
-       <artifactId>spark-blur-connector</artifactId>
-       <version>0.0.1-SNAPSHOT</version>
+       <parent>
+               <groupId>org.apache.blur</groupId>
+               <artifactId>blur</artifactId>
+               <version>0.2.4-incubating-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+       </parent>
+       <groupId>org.apache.blur</groupId>
+       <artifactId>blur-spark-connector</artifactId>
+       <version>${projectVersion}</version>
        <packaging>jar</packaging>
-
-       <name>spark-blur-connector</name>
+       <name>Blur Spark Connector</name>
+       <description>The Blur spark connector module contains the the ability 
for Spark to write out to a Blur table.</description>
 
        <repositories>
                <repository>
@@ -45,7 +49,31 @@ under the License.
        </repositories>
 
        <build>
-
+               <pluginManagement>
+                       <plugins>
+                               <plugin>
+                                       
<groupId>org.apache.maven.plugins</groupId>
+                                       
<artifactId>maven-surefire-plugin</artifactId>
+                                       <configuration>
+                                               
<argLine>-XX:+UseConcMarkSweepGC -Xmx1g -Xms1g</argLine>
+                                               <forkCount>2</forkCount>
+                                               <forkMode>always</forkMode>
+                                               <reuseForks>false</reuseForks>
+                                               <systemPropertyVariables>
+                                                       
<blur.tmp.dir>${project.build.directory}/target/tmp</blur.tmp.dir>
+                                               </systemPropertyVariables>
+                                       </configuration>
+                               </plugin>
+                               <plugin>
+                                       
<groupId>org.apache.maven.plugins</groupId>
+                                       
<artifactId>maven-compiler-plugin</artifactId>
+                                       <configuration>
+                                               <source>1.6</source>
+                                               <target>1.6</target>
+                                       </configuration>
+                               </plugin>
+                       </plugins>
+               </pluginManagement>
                <resources>
                        <resource>
                                
<directory>src/main/resources/services</directory>
@@ -82,65 +110,65 @@ under the License.
                <dependency>
                        <groupId>org.apache.blur</groupId>
                        <artifactId>blur-thrift</artifactId>
-                       <version>0.2.4-incubating-SNAPSHOT-hadoop1</version>
+                       <version>${project.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.apache.blur</groupId>
                        <artifactId>blur-util</artifactId>
-                       <version>0.2.4-incubating-SNAPSHOT-hadoop1</version>
+                       <version>${project.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.apache.blur</groupId>
                        <artifactId>blur-core</artifactId>
-                       <version>0.2.4-incubating-SNAPSHOT-hadoop1</version>
+                       <version>${project.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.apache.blur</groupId>
                        <artifactId>blur-store</artifactId>
-                       <version>0.2.4-incubating-SNAPSHOT-hadoop1</version>
+                       <version>${project.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.apache.blur</groupId>
                        <artifactId>blur-query</artifactId>
-                       <version>0.2.4-incubating-SNAPSHOT-hadoop1</version>
+                       <version>${project.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.apache.blur</groupId>
                        <artifactId>blur-mapred-hadoop1</artifactId>
-                       <version>0.2.4-incubating-SNAPSHOT-hadoop1</version>
+                       <version>${project.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.apache.lucene</groupId>
                        <artifactId>lucene-core</artifactId>
-                       <version>4.3.0</version>
+                       <version>${lucene.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.apache.lucene</groupId>
                        <artifactId>lucene-spatial</artifactId>
-                       <version>4.3.0</version>
+                       <version>${lucene.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.apache.lucene</groupId>
                        <artifactId>lucene-codecs</artifactId>
-                       <version>4.3.0</version>
+                       <version>${lucene.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.apache.lucene</groupId>
                        <artifactId>lucene-analyzers-common</artifactId>
-                       <version>4.3.0</version>
+                       <version>${lucene.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.apache.lucene</groupId>
                        <artifactId>lucene-queries</artifactId>
-                       <version>4.3.0</version>
+                       <version>${lucene.version}</version>
                </dependency>
                <dependency>
                        <groupId>junit</groupId>
                        <artifactId>junit</artifactId>
-                       <version>4.11</version>
+                       <version>${junit.version}</version>
                        <scope>test</scope>
                </dependency>
-               <dependency>
+               <!-- dependency>
                        <groupId>commons-codec</groupId>
                        <artifactId>commons-codec</artifactId>
                        <version>1.3</version>
@@ -159,11 +187,58 @@ under the License.
                        <groupId>org.slf4j</groupId>
                        <artifactId>slf4j-log4j12</artifactId>
                        <version>1.7.4</version>
-               </dependency>
-               <dependency>
+               </dependency -->
+               
+               <dependency>
+       <groupId>org.apache.spark</groupId>
+       <artifactId>spark-core_2.10</artifactId>
+       <version>1.1.0</version>
+</dependency>
+<dependency>
+       <groupId>org.apache.spark</groupId>
+       <artifactId>spark-streaming_2.10</artifactId>
+       <version>1.1.0</version>
+</dependency>
+               <!-- dependency>
                        <groupId>kafka.spark.consumer</groupId>
                        <artifactId>kafka-spark-consumer</artifactId>
                        <version>0.0.1-SNAPSHOT</version>
-               </dependency>
+               </dependency -->
        </dependencies>
+       
+       <profiles>
+               <profile>
+                       <id>hadoop1</id>
+                       <activation>
+                               <property>
+                                       <name>hadoop1</name>
+                               </property>
+                       </activation>
+        <properties>
+            <projectVersion>${project.parent.version}-hadoop1</projectVersion>
+        </properties>
+               </profile>
+               <profile>
+                       <id>hadoop2-mr1</id>
+                       <activation>
+                               <property>
+                                       <name>hadoop2-mr1</name>
+                               </property>
+                       </activation>
+        <properties>
+            
<projectVersion>${project.parent.version}-hadoop2-mr1</projectVersion>
+        </properties>
+               </profile>
+               <profile>
+                       <id>hadoop2</id>
+                       <activation>
+                               <property>
+                                       <name>hadoop2</name>
+                               </property>
+                       </activation>
+        <properties>
+            <projectVersion>${project.parent.version}-hadoop2</projectVersion>
+        </properties>
+               </profile>
+       </profiles>
 </project>

Reply via email to