Permalink
Browse files

Merge pull request #9 from johnynek/dev

Bump to 0.3.0
  • Loading branch information...
johnynek committed Feb 20, 2012
2 parents 2f2bed5 + 51742bd commit f6f05e3a0bc302e964dc91935a0c87557ffd1fd5
View
@@ -2,23 +2,25 @@ import AssemblyKeys._
name := "scalding"
-version := "0.2.0"
+version := "0.3.0"
organization := "com.twitter"
scalaVersion := "2.8.1"
resolvers += "Concurrent Maven Repo" at "http://conjars.org/repo"
-libraryDependencies += "cascading" % "cascading-core" % "2.0.0-wip-165"
+libraryDependencies += "cascading" % "cascading-core" % "2.0.0-wip-215"
-libraryDependencies += "cascading" % "cascading-local" % "2.0.0-wip-165"
+libraryDependencies += "cascading" % "cascading-local" % "2.0.0-wip-215"
-libraryDependencies += "cascading" % "cascading-hadoop" % "2.0.0-wip-165"
+libraryDependencies += "cascading" % "cascading-hadoop" % "2.0.0-wip-215"
-libraryDependencies += "commons-lang" % "commons-lang" % "2.4"
+libraryDependencies += "cascading.kryo" % "cascading.kryo" % "0.2.0"
+
+libraryDependencies += "com.twitter" % "meat-locker" % "0.1.4"
-libraryDependencies += "de.javakaffee" % "kryo-serializers" % "0.9"
+libraryDependencies += "commons-lang" % "commons-lang" % "2.4"
libraryDependencies += "org.scala-tools.testing" % "specs_2.8.0" % "1.6.5" % "test"
View
@@ -2,6 +2,8 @@
require 'fileutils'
require 'thread'
+SCALDING_VERSION="0.3.0"
+
#Usage : scald.rb [--hdfs|--local|--print] job <job args>
# --hdfs: if job ends in ".scala" or ".java" and the file exists, link it against JARFILE (below) and then run it on HOST.
# else, it is assumed to be a full classname to an item in the JARFILE, which is run on HOST
@@ -15,7 +17,7 @@
#Get the absolute path of the original (non-symlink) file.
ORIGINAL_FILE=File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
SCIENCE_ROOT=File.expand_path(File.dirname(ORIGINAL_FILE)+"/../")
-JARFILE=SCIENCE_ROOT + "/target/scalding-assembly-0.2.0.jar" #what jar has all the depencies for this job
+JARFILE=SCIENCE_ROOT + "/target/scalding-assembly-#{SCALDING_VERSION}.jar" #what jar has all the depencies for this job
puts JARFILE
HOST="my.remote.host" #where the job is rsynced to and run
TMPDIR="/tmp"
Oops, something went wrong.

0 comments on commit f6f05e3

Please sign in to comment.