You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2013/12/14 08:22:18 UTC
[1/2] git commit: Fix maven build issues in 2.10 branch
Updated Branches:
refs/heads/scala-2.10 6defb061f -> 7ac944fc2
Fix maven build issues in 2.10 branch
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/6e8a96c7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/6e8a96c7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/6e8a96c7
Branch: refs/heads/scala-2.10
Commit: 6e8a96c7e7652b3d1fc709b3c3ccc5f90ffeb623
Parents: 6defb06
Author: Patrick Wendell <pw...@gmail.com>
Authored: Fri Dec 13 23:14:08 2013 -0800
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Fri Dec 13 23:14:08 2013 -0800
----------------------------------------------------------------------
examples/pom.xml | 2 +-
pom.xml | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/6e8a96c7/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 97f6dfe..e16b1c8 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -87,7 +87,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.kafka</groupId>
+ <groupId>com.sksamuel.kafka</groupId>
<artifactId>kafka_2.10</artifactId>
<version>0.8.0-beta1</version>
<exclusions>
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/6e8a96c7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index aee07c2..58fc02e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -498,6 +498,10 @@
<groupId>org.jboss.netty</groupId>
<artifactId>netty</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+ </exclusion>
</exclusions>
</dependency>
</dependencies>
[2/2] git commit: Merge pull request #262 from pwendell/mvn-fix
Posted by pw...@apache.org.
Merge pull request #262 from pwendell/mvn-fix
Fix maven build issues in 2.10 branch
Found some issues when locally testing maven.
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/7ac944fc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/7ac944fc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/7ac944fc
Branch: refs/heads/scala-2.10
Commit: 7ac944fc27805e2a76285ce3a31f3b2ecf4a7b78
Parents: 6defb06 6e8a96c
Author: Patrick Wendell <pw...@gmail.com>
Authored: Fri Dec 13 23:22:08 2013 -0800
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Fri Dec 13 23:22:08 2013 -0800
----------------------------------------------------------------------
examples/pom.xml | 2 +-
pom.xml | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------