Skip to content
Snippets Groups Projects
Commit a99fb374 authored by Sandy Ryza's avatar Sandy Ryza Committed by Patrick Wendell
Browse files

SPARK-1193. Fix indentation in pom.xmls 

Author: Sandy Ryza <sandy@cloudera.com>

Closes #91 from sryza/sandy-spark-1193 and squashes the following commits:

a878124 [Sandy Ryza] SPARK-1193. Fix indentation in pom.xmls
parent 6e730edc
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 305 additions and 319 deletions
bagel/pom.xml
+ 4
− 4
View file @ a99fb374
...@@ -37,10 +37,10 @@ ...@@ -37,10 +37,10 @@
a Hadoop 0.23.X issue --> a Hadoop 0.23.X issue -->
<id>yarn-alpha</id> <id>yarn-alpha</id>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.avro</groupId> <groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId> <artifactId>avro</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
</profile> </profile>
</profiles> </profiles>
......
core/pom.xml
+ 253
− 267
View file @ a99fb374
...@@ -17,274 +17,260 @@ ...@@ -17,274 +17,260 @@
--> -->
<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"> <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> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-core_2.10</artifactId> <artifactId>spark-parent</artifactId>
<packaging>jar</packaging> <version>1.0.0-SNAPSHOT</version>
<name>Spark Project Core</name> <relativePath>../pom.xml</relativePath>
<url>http://spark.apache.org/</url> </parent>
<!-- SPARK-1121: SPARK-1121: Adds an explicit dependency on Avro to work around <groupId>org.apache.spark</groupId>
a Hadoop 0.23.X issue --> <artifactId>spark-core_2.10</artifactId>
<profiles> <packaging>jar</packaging>
<profile> <name>Spark Project Core</name>
<id>yarn-alpha</id> <url>http://spark.apache.org/</url>
<dependencies>
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
</dependency>
</dependencies>
</profile>
</profiles>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId> <artifactId>hadoop-client</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.java.dev.jets3t</groupId> <groupId>net.java.dev.jets3t</groupId>
<artifactId>jets3t</artifactId> <artifactId>jets3t</artifactId>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>commons-logging</groupId> <groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId> <artifactId>commons-logging</artifactId>
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.curator</groupId> <groupId>org.apache.curator</groupId>
<artifactId>curator-recipes</artifactId> <artifactId>curator-recipes</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-plus</artifactId> <artifactId>jetty-plus</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId> <artifactId>jetty-security</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId> <artifactId>jetty-util</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId> <artifactId>jetty-server</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.code.findbugs</groupId> <groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId> <artifactId>jsr305</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId> <artifactId>jul-to-slf4j</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId> <artifactId>jcl-over-slf4j</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>log4j</groupId>
<artifactId>log4j</artifactId> <artifactId>log4j</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-log4j12</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.ning</groupId> <groupId>com.ning</groupId>
<artifactId>compress-lzf</artifactId> <artifactId>compress-lzf</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.xerial.snappy</groupId> <groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId> <artifactId>snappy-java</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.ow2.asm</groupId> <groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId> <artifactId>asm</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.twitter</groupId> <groupId>com.twitter</groupId>
<artifactId>chill_${scala.binary.version}</artifactId> <artifactId>chill_${scala.binary.version}</artifactId>
<version>0.3.1</version> <version>0.3.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.twitter</groupId> <groupId>com.twitter</groupId>
<artifactId>chill-java</artifactId> <artifactId>chill-java</artifactId>
<version>0.3.1</version> <version>0.3.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-net</groupId> <groupId>commons-net</groupId>
<artifactId>commons-net</artifactId> <artifactId>commons-net</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>${akka.group}</groupId> <groupId>${akka.group}</groupId>
<artifactId>akka-remote_${scala.binary.version}</artifactId> <artifactId>akka-remote_${scala.binary.version}</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>${akka.group}</groupId> <groupId>${akka.group}</groupId>
<artifactId>akka-slf4j_${scala.binary.version}</artifactId> <artifactId>akka-slf4j_${scala.binary.version}</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>${akka.group}</groupId> <groupId>${akka.group}</groupId>
<artifactId>akka-testkit_${scala.binary.version}</artifactId> <artifactId>akka-testkit_${scala.binary.version}</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.scala-lang</groupId> <groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId> <artifactId>scala-library</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.json4s</groupId> <groupId>org.json4s</groupId>
<artifactId>json4s-jackson_${scala.binary.version}</artifactId> <artifactId>json4s-jackson_${scala.binary.version}</artifactId>
<version>3.2.6</version> <version>3.2.6</version>
<!-- see also exclusion for lift-json; this is necessary since it depends on <!-- see also exclusion for lift-json; this is necessary since it depends on
scala-library and scalap 2.10.0, but we use 2.10.3, and only override scala-library and scalap 2.10.0, but we use 2.10.3, and only override
scala-library --> scala-library -->
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>org.scala-lang</groupId> <groupId>org.scala-lang</groupId>
<artifactId>scalap</artifactId> <artifactId>scalap</artifactId>
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>it.unimi.dsi</groupId> <groupId>it.unimi.dsi</groupId>
<artifactId>fastutil</artifactId> <artifactId>fastutil</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>colt</groupId> <groupId>colt</groupId>
<artifactId>colt</artifactId> <artifactId>colt</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.mesos</groupId> <groupId>org.apache.mesos</groupId>
<artifactId>mesos</artifactId> <artifactId>mesos</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-all</artifactId> <artifactId>netty-all</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.clearspring.analytics</groupId> <groupId>com.clearspring.analytics</groupId>
<artifactId>stream</artifactId> <artifactId>stream</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.codahale.metrics</groupId> <groupId>com.codahale.metrics</groupId>
<artifactId>metrics-core</artifactId> <artifactId>metrics-core</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.codahale.metrics</groupId> <groupId>com.codahale.metrics</groupId>
<artifactId>metrics-jvm</artifactId> <artifactId>metrics-jvm</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.codahale.metrics</groupId> <groupId>com.codahale.metrics</groupId>
<artifactId>metrics-json</artifactId> <artifactId>metrics-json</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.codahale.metrics</groupId> <groupId>com.codahale.metrics</groupId>
<artifactId>metrics-ganglia</artifactId> <artifactId>metrics-ganglia</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.codahale.metrics</groupId> <groupId>com.codahale.metrics</groupId>
<artifactId>metrics-graphite</artifactId> <artifactId>metrics-graphite</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.derby</groupId> <groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId> <artifactId>derby</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-io</groupId> <groupId>commons-io</groupId>
<artifactId>commons-io</artifactId> <artifactId>commons-io</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.scalatest</groupId> <groupId>org.scalatest</groupId>
<artifactId>scalatest_${scala.binary.version}</artifactId> <artifactId>scalatest_${scala.binary.version}</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.mockito</groupId> <groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId> <artifactId>mockito-all</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.scalacheck</groupId> <groupId>org.scalacheck</groupId>
<artifactId>scalacheck_${scala.binary.version}</artifactId> <artifactId>scalacheck_${scala.binary.version}</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.easymock</groupId> <groupId>org.easymock</groupId>
<artifactId>easymock</artifactId> <artifactId>easymock</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.novocode</groupId> <groupId>com.novocode</groupId>
<artifactId>junit-interface</artifactId> <artifactId>junit-interface</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory> <outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory>
<testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory> <testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId> <artifactId>maven-antrun-plugin</artifactId>
<executions> <executions>
<execution> <execution>
<phase>test</phase> <phase>test</phase>
<goals> <goals>
<goal>run</goal> <goal>run</goal>
</goals> </goals>
<configuration> <configuration>
<exportAntProperties>true</exportAntProperties> <exportAntProperties>true</exportAntProperties>
<target> <target>
<property name="spark.classpath" refid="maven.test.classpath" /> <property name="spark.classpath" refid="maven.test.classpath" />
<property environment="env" /> <property environment="env" />
<fail message="Please set the SCALA_HOME (or SCALA_LIBRARY_PATH if scala is on the path) environment variables and retry."> <fail message="Please set the SCALA_HOME (or SCALA_LIBRARY_PATH if scala is on the path) environment variables and retry.">
<condition> <condition>
<not> <not>
<or> <or>
<isset property="env.SCALA_HOME" /> <isset property="env.SCALA_HOME" />
<isset property="env.SCALA_LIBRARY_PATH" /> <isset property="env.SCALA_LIBRARY_PATH" />
</or> </or>
</not> </not>
</condition> </condition>
</fail> </fail>
</target> </target>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.scalatest</groupId> <groupId>org.scalatest</groupId>
<artifactId>scalatest-maven-plugin</artifactId> <artifactId>scalatest-maven-plugin</artifactId>
<configuration> <configuration>
<environmentVariables> <environmentVariables>
<SPARK_HOME>${basedir}/..</SPARK_HOME> <SPARK_HOME>${basedir}/..</SPARK_HOME>
<SPARK_TESTING>1</SPARK_TESTING> <SPARK_TESTING>1</SPARK_TESTING>
<SPARK_CLASSPATH>${spark.classpath}</SPARK_CLASSPATH> <SPARK_CLASSPATH>${spark.classpath}</SPARK_CLASSPATH>
</environmentVariables> </environmentVariables>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>
examples/pom.xml
+ 4
− 4
View file @ a99fb374
...@@ -37,10 +37,10 @@ ...@@ -37,10 +37,10 @@
a Hadoop 0.23.X issue --> a Hadoop 0.23.X issue -->
<id>yarn-alpha</id> <id>yarn-alpha</id>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.avro</groupId> <groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId> <artifactId>avro</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
</profile> </profile>
</profiles> </profiles>
......
external/flume/pom.xml
+ 4
− 4
View file @ a99fb374
...@@ -37,10 +37,10 @@ ...@@ -37,10 +37,10 @@
a Hadoop 0.23.X issue --> a Hadoop 0.23.X issue -->
<id>yarn-alpha</id> <id>yarn-alpha</id>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.avro</groupId> <groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId> <artifactId>avro</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
</profile> </profile>
</profiles> </profiles>
......
external/kafka/pom.xml
+ 4
− 4
View file @ a99fb374
...@@ -37,10 +37,10 @@ ...@@ -37,10 +37,10 @@
a Hadoop 0.23.X issue --> a Hadoop 0.23.X issue -->
<id>yarn-alpha</id> <id>yarn-alpha</id>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.avro</groupId> <groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId> <artifactId>avro</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
</profile> </profile>
</profiles> </profiles>
......
external/twitter/pom.xml
+ 4
− 4
View file @ a99fb374
...@@ -37,10 +37,10 @@ ...@@ -37,10 +37,10 @@
a Hadoop 0.23.X issue --> a Hadoop 0.23.X issue -->
<id>yarn-alpha</id> <id>yarn-alpha</id>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.avro</groupId> <groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId> <artifactId>avro</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
</profile> </profile>
</profiles> </profiles>
......
external/zeromq/pom.xml
+ 4
− 4
View file @ a99fb374
...@@ -37,10 +37,10 @@ ...@@ -37,10 +37,10 @@
a Hadoop 0.23.X issue --> a Hadoop 0.23.X issue -->
<id>yarn-alpha</id> <id>yarn-alpha</id>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.avro</groupId> <groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId> <artifactId>avro</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
</profile> </profile>
</profiles> </profiles>
......
graphx/pom.xml
+ 4
− 4
View file @ a99fb374
...@@ -37,10 +37,10 @@ ...@@ -37,10 +37,10 @@
a Hadoop 0.23.X issue --> a Hadoop 0.23.X issue -->
<id>yarn-alpha</id> <id>yarn-alpha</id>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.avro</groupId> <groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId> <artifactId>avro</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
</profile> </profile>
</profiles> </profiles>
......
mllib/pom.xml
+ 4
− 4
View file @ a99fb374
...@@ -37,10 +37,10 @@ ...@@ -37,10 +37,10 @@
a Hadoop 0.23.X issue --> a Hadoop 0.23.X issue -->
<id>yarn-alpha</id> <id>yarn-alpha</id>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.avro</groupId> <groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId> <artifactId>avro</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
</profile> </profile>
</profiles> </profiles>
......
repl/pom.xml
+ 4
− 4
View file @ a99fb374
...@@ -37,10 +37,10 @@ ...@@ -37,10 +37,10 @@
<profile> <profile>
<id>yarn-alpha</id> <id>yarn-alpha</id>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.avro</groupId> <groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId> <artifactId>avro</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
</profile> </profile>
</profiles> </profiles>
......
streaming/pom.xml
+ 4
− 4
View file @ a99fb374
...@@ -37,10 +37,10 @@ ...@@ -37,10 +37,10 @@
a Hadoop 0.23.X issue --> a Hadoop 0.23.X issue -->
<id>yarn-alpha</id> <id>yarn-alpha</id>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.avro</groupId> <groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId> <artifactId>avro</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
</profile> </profile>
</profiles> </profiles>
......
tools/pom.xml
+ 4
− 4
View file @ a99fb374
...@@ -36,10 +36,10 @@ ...@@ -36,10 +36,10 @@
<profile> <profile>
<id>yarn-alpha</id> <id>yarn-alpha</id>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.avro</groupId> <groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId> <artifactId>avro</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
</profile> </profile>
</profiles> </profiles>
......
yarn/alpha/pom.xml
+ 4
− 4
View file @ a99fb374
...@@ -30,10 +30,10 @@ ...@@ -30,10 +30,10 @@
a Hadoop 0.23.X issue --> a Hadoop 0.23.X issue -->
<id>yarn-alpha</id> <id>yarn-alpha</id>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.avro</groupId> <groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId> <artifactId>avro</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
</profile> </profile>
</profiles> </profiles>
......
yarn/stable/pom.xml
+ 4
− 4
View file @ a99fb374
...@@ -30,10 +30,10 @@ ...@@ -30,10 +30,10 @@
a Hadoop 0.23.X issue --> a Hadoop 0.23.X issue -->
<id>yarn-alpha</id> <id>yarn-alpha</id>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.avro</groupId> <groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId> <artifactId>avro</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
</profile> </profile>
</profiles> </profiles>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment