Skip to content
Snippets Groups Projects
Commit 7fd2708e authored by Mikhail Bautin's avatar Mikhail Bautin
Browse files

Add a log4j compile dependency to fix build in IntelliJ

Also rename parent project to spark-parent (otherwise it shows up as
"parent" in IntelliJ, which is very confusing).
parent 4032beba
No related branches found
No related tags found
No related merge requests found
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.spark-project</groupId> <groupId>org.spark-project</groupId>
<artifactId>parent</artifactId> <artifactId>spark-parent</artifactId>
<version>0.7.1-SNAPSHOT</version> <version>0.7.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.spark-project</groupId> <groupId>org.spark-project</groupId>
<artifactId>parent</artifactId> <artifactId>spark-parent</artifactId>
<version>0.7.1-SNAPSHOT</version> <version>0.7.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
...@@ -87,6 +87,10 @@ ...@@ -87,6 +87,10 @@
<groupId>org.apache.mesos</groupId> <groupId>org.apache.mesos</groupId>
<artifactId>mesos</artifactId> <artifactId>mesos</artifactId>
</dependency> </dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.scalatest</groupId> <groupId>org.scalatest</groupId>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.spark-project</groupId> <groupId>org.spark-project</groupId>
<artifactId>parent</artifactId> <artifactId>spark-parent</artifactId>
<version>0.7.1-SNAPSHOT</version> <version>0.7.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<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>
<groupId>org.spark-project</groupId> <groupId>org.spark-project</groupId>
<artifactId>parent</artifactId> <artifactId>spark-parent</artifactId>
<version>0.7.1-SNAPSHOT</version> <version>0.7.1-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Spark Project Parent POM</name> <name>Spark Project Parent POM</name>
...@@ -58,6 +58,7 @@ ...@@ -58,6 +58,7 @@
<spray.json.version>1.1.1</spray.json.version> <spray.json.version>1.1.1</spray.json.version>
<slf4j.version>1.6.1</slf4j.version> <slf4j.version>1.6.1</slf4j.version>
<cdh.version>4.1.2</cdh.version> <cdh.version>4.1.2</cdh.version>
<log4j.version>1.2.17</log4j.version>
</properties> </properties>
<repositories> <repositories>
...@@ -267,6 +268,12 @@ ...@@ -267,6 +268,12 @@
<version>${scala.version}</version> <version>${scala.version}</version>
</dependency> </dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.scalatest</groupId> <groupId>org.scalatest</groupId>
<artifactId>scalatest_${scala.version}</artifactId> <artifactId>scalatest_${scala.version}</artifactId>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.spark-project</groupId> <groupId>org.spark-project</groupId>
<artifactId>parent</artifactId> <artifactId>spark-parent</artifactId>
<version>0.7.1-SNAPSHOT</version> <version>0.7.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.spark-project</groupId> <groupId>org.spark-project</groupId>
<artifactId>parent</artifactId> <artifactId>spark-parent</artifactId>
<version>0.7.1-SNAPSHOT</version> <version>0.7.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.spark-project</groupId> <groupId>org.spark-project</groupId>
<artifactId>parent</artifactId> <artifactId>spark-parent</artifactId>
<version>0.7.1-SNAPSHOT</version> <version>0.7.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment