Skip to content

Change dependency to Spark 0.6 (the "dev" branch) #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mateiz wants to merge 3 commits into
base: spork
Choose a base branch
from
Open

Change dependency to Spark 0.6 (the "dev" branch) #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4367e04
Updated to Spark 0.6.0
mateiz Jul 12, 2012
7bfbba0
Merge remote-tracking branch 'dvryaboy/spork' into spork
mateiz Jul 12, 2012
7976eea
Merge remote-tracking branch 'dvryaboy/spork' into spork
mateiz Jul 13, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion SPARK_README.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
Spork currently requires you to build Spark separately and publish it to your
local ivy cache. You can do this as follows:
local ivy cache. It relies on the "dev" branch of Spark. You can check this
out and publish it to your local Ivy as follows:

git clone git://github.com/mesos/spark.git
cd spark
git checkout -b dev --track origin/dev
sbt/sbt publish-local

Then build Spork using ant jar as usual.
18 changes: 18 additions & 0 deletions build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -700,10 +700,19 @@
<include name="slf4j*.jar" />
<include name="servlet-api*.jar" />
<include name="compress-lzf*.jar" />
<include name="netty-3.3.0*.jar" />
<include name="kryo*.jar" />
<include name="minlog*.jar" />
<include name="objenesis*.jar" />
<include name="reflectasm*.jar" />
</zipgroupfileset>
<zipgroupfileset dir="lib/spark">
<include name="mesos*.jar" />
</zipgroupfileset>
<zipfileset src="${ivy.lib.dir}/akka-actor-2.0.2.jar" excludes="reference.conf"/>
<zipfileset src="${ivy.lib.dir}/akka-remote-2.0.2.jar" excludes="reference.conf"/>
<zipfileset src="${ivy.lib.dir}/akka-slf4j-2.0.2.jar" />
<fileset file="lib/spark/reference.conf" />
<fileset file="${basedir}/src/pig-default.properties" />
<fileset file="${basedir}/src/main/jruby/pigudf.rb" />
<exclude name="hadoop-site.xml" />
Expand Down Expand Up @@ -796,10 +805,19 @@
<include name="slf4j*.jar" />
<include name="servlet-api*.jar" />
<include name="compress-lzf*.jar" />
<include name="netty-3.3.0*.jar" />
<include name="kryo*.jar" />
<include name="minlog*.jar" />
<include name="objenesis*.jar" />
<include name="reflectasm*.jar" />
</zipgroupfileset>
<zipgroupfileset dir="lib/spark">
<include name="mesos*.jar" />
</zipgroupfileset>
<zipfileset src="${ivy.lib.dir}/akka-actor-2.0.2.jar" excludes="reference.conf"/>
<zipfileset src="${ivy.lib.dir}/akka-remote-2.0.2.jar" excludes="reference.conf"/>
<zipfileset src="${ivy.lib.dir}/akka-slf4j-2.0.2.jar" />
<fileset file="lib/spark/reference.conf" />
<fileset file="${basedir}/src/pig-default.properties" />
<fileset file="${basedir}/src/main/jruby/pigudf.rb" />
<exclude name="hadoop-site.xml" />
Expand Down
2 changes: 1 addition & 1 deletion ivy.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@

<dependency org="org.mockito" name="mockito-all" rev="${mockito.version}" conf="compile->default"/>

<dependency org="org.spark-project" name="spark-core_2.9.1" rev="0.5.1-SNAPSHOT" conf="compile"/>
<dependency org="org.spark-project" name="spark-core_2.9.1" rev="0.6.0-SNAPSHOT" conf="compile"/>
<dependency org="org.scala-lang" name="scala-library" rev="2.9.1" conf="compile"/>

</dependencies>
Expand Down
Loading