Merge branch 'release/0.11.1'

.travis.yml

@@ -1,12 +1,12 @@
 language: scala
+jdk: oraclejdk7
+sudo: false
 scala:
-  - 2.10.3
+  - 2.10.4
   - 2.9.3
 before_install: umask 0022
 script:
   - "./sbt -Dlog4j.configuration=file://$TRAVIS_BUILD_DIR/project/travis-log4j.properties ++$TRAVIS_SCALA_VERSION assembly"
   - "scripts/test_tutorials.sh"
-jdk:
-  - oraclejdk7
 notifications:
   irc: "chat.freenode.net#scalding"

CHANGES.md

@@ -1,5 +1,13 @@
 # Scalding #
 
+### Version 0.11.1 ###
+* Fixes bad release portion where code wasn't updated for new scalding version number.
+* use cascading-jdbc 2.5.3 for table exists fix and cascading 2.5.5: https://github.com/twitter/scalding/pull/951
+* Bump build properties and sbt launcher: https://github.com/twitter/scalding/pull/950
+* Fixes the travis build: https://github.com/twitter/scalding/pull/944
+* Making the README.md consistent with 0.11.0 changes for the REPL.: https://github.com/twitter/scalding/pull/941
+* Backport Meatlocker: https://github.com/twitter/scalding/pull/571
+
 ### Version 0.11.0 ###
 * REPL: Add toIterator (and related methods): https://github.com/twitter/scalding/pull/929
 * Fix the build to use the shared module method: https://github.com/twitter/scalding/pull/938

README.md

@@ -4,7 +4,7 @@ Scalding is a Scala library that makes it easy to specify Hadoop MapReduce jobs.
 
 ![Scalding Logo](https://raw.github.com/twitter/scalding/develop/logo/scalding.png)
 
-Current version: `0.10.0`
+Current version: `0.11.0`
 
 ## Word Count
 
@@ -65,20 +65,24 @@ We use [Travis CI](http://travis-ci.org/) to verify the build:
 
 Scalding modules are available from maven central.
 
-The current groupid and version for all modules is, respectively, `"com.twitter"` and  `0.8.11`.
+The current groupid and version for all modules is, respectively, `"com.twitter"` and  `0.11.0`.
 
 Current published artifacts are
 
-* `scalding-core_2.9.2`
+* `scalding-core_2.9.3`
 * `scalding-core_2.10`
-* `scalding-args_2.9.2`
+* `scalding-args_2.9.3`
 * `scalding-args_2.10`
-* `scalding-date_2.9.2`
+* `scalding-date_2.9.3`
 * `scalding-date_2.10`
-* `scalding-commons_2.9.2`
+* `scalding-commons_2.9.3`
 * `scalding-commons_2.10`
-* `scalding-avro_2.9.2`
+* `scalding-avro_2.9.3`
 * `scalding-avro_2.10`
+* `scalding-parquet_2.9.3`
+* `scalding-parquet_2.10`
+* `scalding-repl_2.9.3`
+* `scalding-repl_2.10`
 
 
 The suffix denotes the scala version.

project/Build.scala

@@ -20,7 +20,7 @@ object ScaldingBuild extends Build {
     //TODO: Change to 2.10.* when Twitter moves to Scala 2.10 internally
     scalaVersion := "2.9.3",
 
-    crossScalaVersions := Seq("2.9.3", "2.10.3"),
+    crossScalaVersions := Seq("2.9.3", "2.10.4"),
 
     ScalariformKeys.preferences := formattingPreferences,
 
@@ -54,6 +54,7 @@ object ScaldingBuild extends Build {
 
     // Uncomment if you don't want to run all the tests before building assembly
     // test in assembly := {},
+    logLevel in assembly := Level.Warn,
 
     // Publishing options:
 
@@ -186,10 +187,10 @@ object ScaldingBuild extends Build {
   lazy val scaldingDate = module("date")
 
   lazy val cascadingVersion =
-    System.getenv.asScala.getOrElse("SCALDING_CASCADING_VERSION", "2.5.4")
+    System.getenv.asScala.getOrElse("SCALDING_CASCADING_VERSION", "2.5.5")
 
   lazy val cascadingJDBCVersion =
-    System.getenv.asScala.getOrElse("SCALDING_CASCADING_JDBC_VERSION", "2.5.2")
+    System.getenv.asScala.getOrElse("SCALDING_CASCADING_JDBC_VERSION", "2.5.3")
 
   val hadoopVersion = "1.2.1"
   val algebirdVersion = "0.7.0"

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.0
+sbt.version=0.13.5

project/travis-log4j.properties

@@ -4,6 +4,7 @@ log4j.threshhold=ALL
 
 log4j.category.cascading=WARN
 log4j.category.com.twitter=INFO
+log4j.logger.org.apache.hadoop=ERROR
 
 log4j.appender.console=org.apache.log4j.ConsoleAppender
 log4j.appender.console.layout=org.apache.log4j.PatternLayout