diff options
author | Hossein Falaki <falaki@gmail.com> | 2014-01-07 21:28:26 -0800 |
---|---|---|
committer | Hossein Falaki <falaki@gmail.com> | 2014-01-07 21:28:26 -0800 |
commit | 46cb980a5f5ba55f341b8bcce4f0d1e5213989d3 (patch) | |
tree | ff3823085f27c0f4477d25a056d333c429c5d6c9 /yarn/pom.xml | |
parent | 150089dae12bbba693db4edbfcea360b443637df (diff) | |
parent | b2e690f839e7ee47f405135d35170173386c5d13 (diff) | |
download | spark-46cb980a5f5ba55f341b8bcce4f0d1e5213989d3.tar.gz spark-46cb980a5f5ba55f341b8bcce4f0d1e5213989d3.tar.bz2 spark-46cb980a5f5ba55f341b8bcce4f0d1e5213989d3.zip |
Fixed merge conflict
Diffstat (limited to 'yarn/pom.xml')
-rw-r--r-- | yarn/pom.xml | 84 |
1 files changed, 47 insertions, 37 deletions
diff --git a/yarn/pom.xml b/yarn/pom.xml index bc64a190fd..aea8b0cdde 100644 --- a/yarn/pom.xml +++ b/yarn/pom.xml @@ -25,11 +25,10 @@ </parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-yarn_2.10</artifactId> - <packaging>jar</packaging> - <name>Spark Project YARN Support</name> - <url>http://spark.incubator.apache.org/</url> - + <artifactId>yarn-parent_2.10</artifactId> + <packaging>pom</packaging> + <name>Spark Project YARN Parent POM</name> + <dependencies> <dependency> <groupId>org.apache.spark</groupId> @@ -73,45 +72,52 @@ </dependency> </dependencies> + <profiles> + <profile> + <id>yarn-alpha</id> + <modules> + <module>alpha</module> + </modules> + </profile> + + <profile> + <id>yarn</id> + <modules> + <module>stable</module> + </modules> + </profile> + </profiles> + <build> - <outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory> - <testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <configuration> - <shadedArtifactAttached>false</shadedArtifactAttached> - <outputFile>${project.build.directory}/${project.artifactId}-${project.version}-shaded.jar</outputFile> - <artifactSet> - <includes> - <include>*:*</include> - </includes> - </artifactSet> - <filters> - <filter> - <artifact>*:*</artifact> - <excludes> - <exclude>META-INF/*.SF</exclude> - <exclude>META-INF/*.DSA</exclude> - <exclude>META-INF/*.RSA</exclude> - </excludes> - </filter> - </filters> - </configuration> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> <executions> <execution> - <phase>package</phase> + <id>add-scala-sources</id> + <phase>generate-sources</phase> + <goals> + <goal>add-source</goal> + </goals> + <configuration> + <sources> + <source>src/main/scala</source> + <source>../common/src/main/scala</source> + </sources> + </configuration> + </execution> + <execution> + <id>add-scala-test-sources</id> + <phase>generate-test-sources</phase> <goals> - <goal>shade</goal> + <goal>add-test-source</goal> </goals> <configuration> - <transformers> - <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" /> - <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer"> - <resource>reference.conf</resource> - </transformer> - </transformers> + <sources> + <source>src/test/scala</source> + <source>../common/src/test/scala</source> + </sources> </configuration> </execution> </executions> @@ -150,12 +156,16 @@ <artifactId>scalatest-maven-plugin</artifactId> <configuration> <environmentVariables> - <SPARK_HOME>${basedir}/..</SPARK_HOME> + <SPARK_HOME>${basedir}/../..</SPARK_HOME> <SPARK_TESTING>1</SPARK_TESTING> <SPARK_CLASSPATH>${spark.classpath}</SPARK_CLASSPATH> </environmentVariables> </configuration> </plugin> </plugins> + + <outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory> + <testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory> </build> + </project> |