Updated Branches: refs/heads/master 8a0763f0e -> 5df1ccd08
Remove leftover Cloudera/CDH references from some comments/fileheaders and the build.sbt file Project: http://git-wip-us.apache.org/repos/asf/incubator-crunch/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-crunch/commit/5df1ccd0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-crunch/tree/5df1ccd0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-crunch/diff/5df1ccd0 Branch: refs/heads/master Commit: 5df1ccd08d63800b88810ecae923b123d4a249ef Parents: 8a0763f Author: Josh Wills <[email protected]> Authored: Fri Sep 7 02:41:41 2012 -0700 Committer: Josh Wills <[email protected]> Committed: Fri Sep 7 05:02:00 2012 -0700 ---------------------------------------------------------------------- crunch-scrunch/build.sbt | 7 ++--- crunch-scrunch/src/main/examples/WordCount.scala | 21 ++++++++------ .../mapreduce/lib/jobcontrol/CrunchJobControl.java | 4 --- 3 files changed, 15 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/5df1ccd0/crunch-scrunch/build.sbt ---------------------------------------------------------------------- diff --git a/crunch-scrunch/build.sbt b/crunch-scrunch/build.sbt index 7d4a6f8..21b52ce 100644 --- a/crunch-scrunch/build.sbt +++ b/crunch-scrunch/build.sbt @@ -17,13 +17,12 @@ */ name := "scrunch" -version := "0.2.0" +version := "0.3.0" scalaVersion := "2.9.2" resolvers ++= Seq( "Local Maven Repository" at "file://"+Path.userHome.absolutePath+"/.m2/repository", - "Hadoop Releases" at "https://repository.cloudera.com/content/repositories/releases/"; ) libraryDependencies ++= Seq( @@ -32,12 +31,12 @@ libraryDependencies ++= Seq( ExclusionRule(organization = "com.sun.jmx"), ExclusionRule(organization = "javax.jms") ), - "org.apache.hadoop" % "hadoop-client" % "0.20.2-cdh3u4" % "provided" excludeAll( + "org.apache.hadoop" % "hadoop-client" % "1.0.3" % "provided" excludeAll( ExclusionRule(organization = "com.sun.jdmk"), ExclusionRule(organization = "com.sun.jmx"), ExclusionRule(organization = "javax.jms") ), - "org.apache.hbase" % "hbase" % "0.90.6-cdh3u4" % "provided" excludeAll( + "org.apache.hbase" % "hbase" % "0.90.4" % "provided" excludeAll( ExclusionRule(organization = "org.apache.hadoop"), ExclusionRule(organization = "commons-logging"), ExclusionRule(organization = "com.google.guava"), http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/5df1ccd0/crunch-scrunch/src/main/examples/WordCount.scala ---------------------------------------------------------------------- diff --git a/crunch-scrunch/src/main/examples/WordCount.scala b/crunch-scrunch/src/main/examples/WordCount.scala index b51c281..59cd1c5 100644 --- a/crunch-scrunch/src/main/examples/WordCount.scala +++ b/crunch-scrunch/src/main/examples/WordCount.scala @@ -1,16 +1,19 @@ /** - * Copyright (c) 2011, Cloudera, Inc. All Rights Reserved. - * - * Cloudera, Inc. licenses this file to you under the Apache License, - * Version 2.0 (the "License"). You may not use this file except in - * compliance with the License. You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - * This software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR - * CONDITIONS OF ANY KIND, either express or implied. See the License for - * the specific language governing permissions and limitations under the - * License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ import org.apache.crunch.scrunch.PipelineApp http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/5df1ccd0/crunch/src/main/java/org/apache/crunch/hadoop/mapreduce/lib/jobcontrol/CrunchJobControl.java ---------------------------------------------------------------------- diff --git a/crunch/src/main/java/org/apache/crunch/hadoop/mapreduce/lib/jobcontrol/CrunchJobControl.java b/crunch/src/main/java/org/apache/crunch/hadoop/mapreduce/lib/jobcontrol/CrunchJobControl.java index 3230f90..e2dd39f 100644 --- a/crunch/src/main/java/org/apache/crunch/hadoop/mapreduce/lib/jobcontrol/CrunchJobControl.java +++ b/crunch/src/main/java/org/apache/crunch/hadoop/mapreduce/lib/jobcontrol/CrunchJobControl.java @@ -41,10 +41,6 @@ import org.apache.hadoop.conf.Configuration; * the states of the running jobs, and updates the states of jobs based on the * state changes of their depending jobs states. The class provides APIs for * suspending/resuming the thread, and for stopping the thread. - * - * TODO This is mostly a copy of the JobControl class in Hadoop MapReduce core. - * Once the location and interface of the class are more stable in CDH, this class - * should be removed completely and be based on the hadoop-core class. */ public class CrunchJobControl implements Runnable {
