You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@crunch.apache.org by rs...@apache.org on 2012/10/19 08:54:01 UTC
[1/2] git commit: CRUNCH-93: Minor POM and javadoc fixes.
Updated Branches:
refs/heads/master 14132b093 -> 82a978299
CRUNCH-93: Minor POM and javadoc fixes.
Signed-off-by: Rahul Sharma <rs...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-crunch/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-crunch/commit/82a97829
Tree: http://git-wip-us.apache.org/repos/asf/incubator-crunch/tree/82a97829
Diff: http://git-wip-us.apache.org/repos/asf/incubator-crunch/diff/82a97829
Branch: refs/heads/master
Commit: 82a978299d1f51db74789e97dc267f3275b29619
Parents: 1cee024
Author: Matthias Friedrich <ma...@mafr.de>
Authored: Tue Oct 16 17:47:56 2012 +0200
Committer: Rahul Sharma <rs...@apache.org>
Committed: Fri Oct 19 11:01:53 2012 +0530
----------------------------------------------------------------------
.../org/apache/crunch/test/CrunchTestSupport.java | 4 ++--
crunch/pom.xml | 12 +++++-------
pom.xml | 7 +++++++
3 files changed, 14 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/82a97829/crunch-test/src/main/java/org/apache/crunch/test/CrunchTestSupport.java
----------------------------------------------------------------------
diff --git a/crunch-test/src/main/java/org/apache/crunch/test/CrunchTestSupport.java b/crunch-test/src/main/java/org/apache/crunch/test/CrunchTestSupport.java
index fc1a77a..d2a2896 100644
--- a/crunch-test/src/main/java/org/apache/crunch/test/CrunchTestSupport.java
+++ b/crunch-test/src/main/java/org/apache/crunch/test/CrunchTestSupport.java
@@ -36,8 +36,8 @@ public class CrunchTestSupport {
/**
* The method creates a {@linkplain TaskInputOutputContext} which can be used
- * in unit tests. The context servers very limited purpose. You can only
- * operate with counters, taskAttempId ,status and configuration while using
+ * in unit tests. The context serves very limited purpose. You can only
+ * operate with counters, taskAttempId, status and configuration while using
* this context.
*/
public static <KI, VI, KO, VO> TaskInputOutputContext<KI, VI, KO, VO> getTestContext(final Configuration config) {
http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/82a97829/crunch/pom.xml
----------------------------------------------------------------------
diff --git a/crunch/pom.xml b/crunch/pom.xml
index 39dcc75..fd85bd5 100644
--- a/crunch/pom.xml
+++ b/crunch/pom.xml
@@ -45,6 +45,11 @@ under the License.
</dependency>
<dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
<scope>provided</scope>
@@ -76,13 +81,6 @@ under the License.
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>3.12.1.GA</version>
- </dependency>
-
-
<!-- Both Protobufs and Thrift are supported as
derived serialization types, and you can use
(almost) any version of them you like, Crunch
http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/82a97829/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 00391b1..06c5218 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,6 +72,7 @@ under the License.
<commons-logging.version>1.1.1</commons-logging.version>
<commons-cli.version>1.2</commons-cli.version>
<avro.version>1.7.0</avro.version>
+ <javassist.version>3.12.1.GA</javassist.version>
<jackson.version>1.8.8</jackson.version>
<protobuf-java.version>2.3.0</protobuf-java.version>
<libthrift.version>0.8.0</libthrift.version>
@@ -215,6 +216,12 @@ under the License.
</dependency>
<dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>${javassist.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons-io.version}</version>