diff options
-rw-r--r-- | core/pom.xml | 31 | ||||
-rw-r--r-- | examples/pom.xml | 8 | ||||
-rw-r--r-- | external/flume/pom.xml | 5 | ||||
-rw-r--r-- | external/kafka/pom.xml | 9 | ||||
-rw-r--r-- | external/mqtt/pom.xml | 5 | ||||
-rw-r--r-- | external/twitter/pom.xml | 5 | ||||
-rw-r--r-- | external/zeromq/pom.xml | 5 | ||||
-rw-r--r-- | pom.xml | 28 | ||||
-rw-r--r-- | project/SparkBuild.scala | 21 | ||||
-rw-r--r-- | repl/pom.xml | 4 | ||||
-rw-r--r-- | streaming/pom.xml | 5 |
11 files changed, 57 insertions, 69 deletions
diff --git a/core/pom.xml b/core/pom.xml index dbcde0f434..5576b0c3b4 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -39,6 +39,12 @@ <dependency> <groupId>net.java.dev.jets3t</groupId> <artifactId>jets3t</artifactId> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.avro</groupId> @@ -69,6 +75,22 @@ <artifactId>slf4j-api</artifactId> </dependency> <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jul-to-slf4j</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </dependency> + <dependency> <groupId>com.ning</groupId> <artifactId>compress-lzf</artifactId> </dependency> @@ -128,10 +150,6 @@ <artifactId>netty-all</artifactId> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> - <dependency> <groupId>com.clearspring.analytics</groupId> <artifactId>stream</artifactId> </dependency> @@ -190,11 +208,6 @@ <artifactId>junit-interface</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> </dependencies> <build> <outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory> diff --git a/examples/pom.xml b/examples/pom.xml index 874bbd803f..12a11821a4 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -115,6 +115,10 @@ <groupId>org.jboss.netty</groupId> <artifactId>netty</artifactId> </exclusion> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -162,10 +166,6 @@ <artifactId>jline</artifactId> </exclusion> <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> <groupId>org.apache.cassandra.deps</groupId> <artifactId>avro</artifactId> </exclusion> diff --git a/external/flume/pom.xml b/external/flume/pom.xml index cdb9bef8e2..a0e8b84514 100644 --- a/external/flume/pom.xml +++ b/external/flume/pom.xml @@ -74,11 +74,6 @@ <artifactId>junit-interface</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> </dependencies> <build> <outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory> diff --git a/external/kafka/pom.xml b/external/kafka/pom.xml index 630bbed5eb..fb37cd7988 100644 --- a/external/kafka/pom.xml +++ b/external/kafka/pom.xml @@ -61,6 +61,10 @@ <groupId>net.sf.jopt-simple</groupId> <artifactId>jopt-simple</artifactId> </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -78,11 +82,6 @@ <artifactId>junit-interface</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> </dependencies> <build> <outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory> diff --git a/external/mqtt/pom.xml b/external/mqtt/pom.xml index eff3e7809b..cfa1870e98 100644 --- a/external/mqtt/pom.xml +++ b/external/mqtt/pom.xml @@ -89,11 +89,6 @@ <artifactId>junit-interface</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> </dependencies> <build> <outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory> diff --git a/external/twitter/pom.xml b/external/twitter/pom.xml index cde495cac4..077f88dc59 100644 --- a/external/twitter/pom.xml +++ b/external/twitter/pom.xml @@ -70,11 +70,6 @@ <artifactId>junit-interface</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> </dependencies> <build> <outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory> diff --git a/external/zeromq/pom.xml b/external/zeromq/pom.xml index 04f9fbfd5b..4c68294b7b 100644 --- a/external/zeromq/pom.xml +++ b/external/zeromq/pom.xml @@ -70,11 +70,6 @@ <artifactId>junit-interface</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> </dependencies> <build> <outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory> @@ -112,7 +112,7 @@ <mesos.version>0.13.0</mesos.version> <akka.group>org.spark-project.akka</akka.group> <akka.version>2.2.3-shaded-protobuf</akka.version> - <slf4j.version>1.7.2</slf4j.version> + <slf4j.version>1.7.5</slf4j.version> <log4j.version>1.2.17</log4j.version> <hadoop.version>1.0.4</hadoop.version> <protobuf.version>2.4.1</protobuf.version> @@ -186,6 +186,17 @@ <version>${slf4j.version}</version> </dependency> <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + <version>${slf4j.version}</version> + <!-- <scope>runtime</scope> --> <!-- more correct, but scalac 2.10.3 doesn't like it --> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>${log4j.version}</version> + </dependency> + <dependency> <groupId>com.ning</groupId> <artifactId>compress-lzf</artifactId> <version>1.0.0</version> @@ -347,23 +358,12 @@ <version>${scala.version}</version> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>${log4j.version}</version> - </dependency> - <dependency> <groupId>org.scalatest</groupId> <artifactId>scalatest_${scala.binary.version}</artifactId> <version>1.9.1</version> <scope>test</scope> </dependency> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <scope>test</scope> - <version>1.8.5</version> - </dependency> - <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> <version>2.4</version> @@ -424,6 +424,10 @@ <groupId>org.sonatype.sisu.inject</groupId> <artifactId>*</artifactId> </exclusion> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 74bad66cfd..f0d2e74148 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -86,7 +86,7 @@ object SparkBuild extends Build { case None => DEFAULT_YARN case Some(v) => v.toBoolean } - lazy val hadoopClient = if (hadoopVersion.startsWith("0.20.") || hadoopVersion == "1.0.0") "hadoop-core" else "hadoop-client" + lazy val hadoopClient = if (hadoopVersion.startsWith("0.20.") || hadoopVersion == "1.0.0") "hadoop-core" else "hadoop-client" // Conditionally include the yarn sub-project lazy val yarnAlpha = Project("yarn-alpha", file("yarn/alpha"), settings = yarnAlphaSettings) dependsOn(core) @@ -236,13 +236,15 @@ object SparkBuild extends Build { publishLocalBoth <<= Seq(publishLocal in MavenCompile, publishLocal).dependOn ) ++ net.virtualvoid.sbt.graph.Plugin.graphSettings ++ ScalaStyleSettings - val slf4jVersion = "1.7.2" + val slf4jVersion = "1.7.5" val excludeCglib = ExclusionRule(organization = "org.sonatype.sisu.inject") val excludeJackson = ExclusionRule(organization = "org.codehaus.jackson") val excludeNetty = ExclusionRule(organization = "org.jboss.netty") val excludeAsm = ExclusionRule(organization = "asm") val excludeSnappy = ExclusionRule(organization = "org.xerial.snappy") + val excludeCommonsLogging = ExclusionRule(organization = "commons-logging") + val excludeSLF4J = ExclusionRule(organization = "org.slf4j") def coreSettings = sharedSettings ++ Seq( name := "spark-core", @@ -257,6 +259,8 @@ object SparkBuild extends Build { "log4j" % "log4j" % "1.2.17", "org.slf4j" % "slf4j-api" % slf4jVersion, "org.slf4j" % "slf4j-log4j12" % slf4jVersion, + "org.slf4j" % "jul-to-slf4j" % slf4jVersion, + "org.slf4j" % "jcl-over-slf4j" % slf4jVersion, "commons-daemon" % "commons-daemon" % "1.0.10", // workaround for bug HADOOP-9407 "com.ning" % "compress-lzf" % "1.0.0", "org.xerial.snappy" % "snappy-java" % "1.0.5", @@ -268,9 +272,9 @@ object SparkBuild extends Build { "it.unimi.dsi" % "fastutil" % "6.4.4", "colt" % "colt" % "1.2.0", "org.apache.mesos" % "mesos" % "0.13.0", - "net.java.dev.jets3t" % "jets3t" % "0.7.1", + "net.java.dev.jets3t" % "jets3t" % "0.7.1" excludeAll(excludeCommonsLogging), "org.apache.derby" % "derby" % "10.4.2.0" % "test", - "org.apache.hadoop" % hadoopClient % hadoopVersion excludeAll(excludeJackson, excludeNetty, excludeAsm, excludeCglib), + "org.apache.hadoop" % hadoopClient % hadoopVersion excludeAll(excludeJackson, excludeNetty, excludeAsm, excludeCglib, excludeCommonsLogging, excludeSLF4J), "org.apache.avro" % "avro" % "1.7.4", "org.apache.avro" % "avro-ipc" % "1.7.4" excludeAll(excludeNetty), "org.apache.zookeeper" % "zookeeper" % "3.4.5" excludeAll(excludeNetty), @@ -300,18 +304,15 @@ object SparkBuild extends Build { name := "spark-examples", libraryDependencies ++= Seq( "com.twitter" %% "algebird-core" % "0.1.11", - "org.apache.hbase" % "hbase" % "0.94.6" excludeAll(excludeNetty, excludeAsm), - "org.apache.hbase" % "hbase" % HBASE_VERSION excludeAll(excludeNetty, excludeAsm), + "org.apache.hbase" % "hbase" % HBASE_VERSION excludeAll(excludeNetty, excludeAsm, excludeCommonsLogging), "org.apache.cassandra" % "cassandra-all" % "1.2.6" exclude("com.google.guava", "guava") exclude("com.googlecode.concurrentlinkedhashmap", "concurrentlinkedhashmap-lru") exclude("com.ning","compress-lzf") exclude("io.netty", "netty") exclude("jline","jline") - exclude("log4j","log4j") exclude("org.apache.cassandra.deps", "avro") - excludeAll(excludeSnappy) - excludeAll(excludeCglib) + excludeAll(excludeSnappy, excludeCglib, excludeSLF4J) ) ) ++ assemblySettings ++ extraAssemblySettings @@ -416,7 +417,7 @@ object SparkBuild extends Build { exclude("com.sun.jdmk", "jmxtools") exclude("com.sun.jmx", "jmxri") exclude("net.sf.jopt-simple", "jopt-simple") - excludeAll(excludeNetty) + excludeAll(excludeNetty, excludeSLF4J) ) ) diff --git a/repl/pom.xml b/repl/pom.xml index 143b009f3c..73597f635b 100644 --- a/repl/pom.xml +++ b/repl/pom.xml @@ -73,10 +73,6 @@ <artifactId>jul-to-slf4j</artifactId> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </dependency> - <dependency> <groupId>org.scalatest</groupId> <artifactId>scalatest_${scala.binary.version}</artifactId> <scope>test</scope> diff --git a/streaming/pom.xml b/streaming/pom.xml index d31ee60e4e..acc1d23c7d 100644 --- a/streaming/pom.xml +++ b/streaming/pom.xml @@ -80,11 +80,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> </dependency> |