Squashed commit of the following:

commit 97eab46 Author: Travis Crawford <travis@twitter.com> Date: Fri Feb 3 16:06:37 2012 -0800 Bump version number in readme. commit 8a35aeb Author: Travis Crawford <travis@twitter.com> Date: Fri Feb 3 15:51:57 2012 -0800 Remove links from changes file commit ed57db3 Author: Travis Crawford <travis@twitter.com> Date: Fri Feb 3 15:10:54 2012 -0800 Release version 2.1.6.
kevinweil · Feb 4, 2012 · f31cb60 · f31cb60
1 parent 722050e
commit f31cb60
Show file tree

Hide file tree

Showing 13 changed files with 168 additions and 9 deletions.
diff --git a/Changes.md b/Changes.md
@@ -1,14 +1,28 @@
 # Elephant Bird #
 
+### Version 2.1.6 ###
+
+ISSUE 129. Add "install-local" ant target (Travis Crawford)
+
+ISSUE 127. Lzo text outputformat heirarchy (Raghu Angadi)
+
+ISSUE 126. Add protobuf-java-2.3.0.jar back as a checked-in library (Travis Crawford)
+
+ISSUE 125. Deprecated lzo output format update. (Raghu Angadi)
+
+ISSUE 123. Fix maven repo documentation (Travis Crawford)
+
+NO ISSUE. Upgrade hadoop-lzo to 0.4.15 (Raghu Angadi)
+
 ### Version 2.1.5 ###
 
-[ISSUE 122](https://github.com/kevinweil/elephant-bird/pull/122). Add maven repository support (Travis Crawford)
+ISSUE 122. Add maven repository support (Travis Crawford)
 
-[ISSUE 121](https://github.com/kevinweil/elephant-bird/pull/121). Add Ivy & POM file generation to Elephant Bird build (Travis Crawford)
+ISSUE 121. Add Ivy & POM file generation to Elephant Bird build (Travis Crawford)
 
-[ISSUE 120](https://github.com/kevinweil/elephant-bird/pull/120). Build improvements  (Travis Crawford)
+ISSUE 120. Build improvements  (Travis Crawford)
 
-[ISSUE 119](https://github.com/kevinweil/elephant-bird/pull/119). Fix a regression from 2.1.4 related to the multi-loader (Raghu Angadi)
+ISSUE 119. Fix a regression from 2.1.4 related to the multi-loader (Raghu Angadi)
 
 ### Version 2.1.4 ###
 

diff --git a/Readme.md b/Readme.md
@@ -1,6 +1,6 @@
 # Elephant Bird #
 
-Version: 2.1.5
+Version: 2.1.6
 
 #### Twitter's library of [LZO](http://www.github.com/kevinweil/hadoop-lzo), [Thrift](http://thrift.apache.org/), and/or [Protocol Buffer](http://code.google.com/p/protobuf)-related [Hadoop](http://hadoop.apache.org) InputFormats, OutputFormats, Writables, [Pig](http://pig.apache.org/) LoadFuncs, [Hive](http://hadoop.apache.org/hive) SerDe, [HBase](http://hadoop.apache.org/hbase) miscellanea, etc. The majority of these are in production at Twitter running over data every day. ####
 

diff --git a/build.xml b/build.xml
@@ -45,7 +45,7 @@
   <property name="test.lib.dir" location="${build.dir}/lib/test"/>
 
   <property name="jar.name" value="elephant-bird"/>
-  <property name="version" value="2.1.5"/>
+  <property name="version" value="2.1.6"/>
   <property name="jar.file" location="${build.dir}/${jar.name}-${version}.jar"/>
 
   <property name="maven.repo" value="http://repo1.maven.org/maven2"/>

diff --git a/ivy.xml b/ivy.xml
@@ -34,5 +34,8 @@
     <dependency org="org.apache.thrift" name="thrift-test"
                 rev="${thrift-test.version}" conf="test"/>
     <dependency org="yamlbeans" name="yamlbeans" rev="${yamlbeans.version}"/>
+    <exclude org="javax.jms"/>
+    <exclude org="com.sun.jdmk"/>
+    <exclude org="com.sun.jmx"/>
   </dependencies>
 </ivy-module>
diff --git a/repo/com/twitter/elephant-bird/2.1.6/elephant-bird-2.1.6.jar b/repo/com/twitter/elephant-bird/2.1.6/elephant-bird-2.1.6.jar
diff --git a/repo/com/twitter/elephant-bird/2.1.6/elephant-bird-2.1.6.jar.md5 b/repo/com/twitter/elephant-bird/2.1.6/elephant-bird-2.1.6.jar.md5
@@ -0,0 +1 @@
+a1704e4693f14b94816120ff12df3e86
diff --git a/repo/com/twitter/elephant-bird/2.1.6/elephant-bird-2.1.6.jar.sha1 b/repo/com/twitter/elephant-bird/2.1.6/elephant-bird-2.1.6.jar.sha1
@@ -0,0 +1 @@
+b8cb52cab21750f582d5d37c82d70df348e245a1
diff --git a/repo/com/twitter/elephant-bird/2.1.6/elephant-bird-2.1.6.pom b/repo/com/twitter/elephant-bird/2.1.6/elephant-bird-2.1.6.pom
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Apache Maven 2 POM generated by Apache Ivy
+   http://ant.apache.org/ivy/
+   Apache Ivy version: 2.2.0 20100923230623
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.twitter</groupId>
+  <artifactId>elephant-bird</artifactId>
+  <packaging>jar</packaging>
+  <version>2.1.6</version>
+  <dependencies>
+    <dependency>
+      <groupId>cascading</groupId>
+      <artifactId>cascading-hadoop</artifactId>
+      <version>2.0.0-wip-191</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google</groupId>
+      <artifactId>protobuf-java</artifactId>
+      <version>2.3.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>11.0.1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.googlecode.json-simple</groupId>
+      <artifactId>json-simple</artifactId>
+      <version>1.1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.hadoop</groupId>
+      <artifactId>hadoop-lzo</artifactId>
+      <version>0.4.15</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-cli</groupId>
+      <artifactId>commons-cli</artifactId>
+      <version>1.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <version>1.3</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-httpclient</groupId>
+      <artifactId>commons-httpclient</artifactId>
+      <version>3.0.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <version>2.4</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.1.1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.15</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.antlr</groupId>
+      <artifactId>antlr</artifactId>
+      <version>3.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-core</artifactId>
+      <version>0.20.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hive</groupId>
+      <artifactId>hive-serde</artifactId>
+      <version>0.8.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-ant-tasks</artifactId>
+      <version>2.1.3</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.pig</groupId>
+      <artifactId>pig</artifactId>
+      <version>0.9.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.thrift</groupId>
+      <artifactId>libthrift</artifactId>
+      <version>0.5.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.thrift</groupId>
+      <artifactId>thrift-test</artifactId>
+      <version>0.5.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>yamlbeans</groupId>
+      <artifactId>yamlbeans</artifactId>
+      <version>0.9.3</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/repo/com/twitter/elephant-bird/2.1.6/elephant-bird-2.1.6.pom.md5 b/repo/com/twitter/elephant-bird/2.1.6/elephant-bird-2.1.6.pom.md5
@@ -0,0 +1 @@
+de400137b656a88de219dfd2f335aaed
diff --git a/repo/com/twitter/elephant-bird/2.1.6/elephant-bird-2.1.6.pom.sha1 b/repo/com/twitter/elephant-bird/2.1.6/elephant-bird-2.1.6.pom.sha1
@@ -0,0 +1 @@
+b80d034ea84e9e7ab6e53fba8eb0f3813f91f90c
diff --git a/repo/com/twitter/elephant-bird/maven-metadata.xml b/repo/com/twitter/elephant-bird/maven-metadata.xml
@@ -6,7 +6,8 @@
   <versioning>
     <versions>
       <version>2.1.5</version>
+      <version>2.1.6</version>
     </versions>
-    <lastUpdated>20120124213220</lastUpdated>
+    <lastUpdated>20120203230815</lastUpdated>
   </versioning>
 </metadata>
diff --git a/repo/com/twitter/elephant-bird/maven-metadata.xml.md5 b/repo/com/twitter/elephant-bird/maven-metadata.xml.md5
@@ -1 +1 @@
-dbbfbcc024af4e4f812b4fe386cef3ef
+ff4b9a4d02444d31a9a8a599f59aa245
diff --git a/repo/com/twitter/elephant-bird/maven-metadata.xml.sha1 b/repo/com/twitter/elephant-bird/maven-metadata.xml.sha1
@@ -1 +1 @@
-dddd372f6f429085b2baaeadd461f3256ae194f3
+aa1741b7db36abfceacae2a155dd6b2838b4b63d