Merge branch 'modules' of github.com:johanoskarsson/elephant-bird int…

…o modules

elephant-bird-cascading2/pom.xml

@@ -19,12 +19,16 @@
       <url>http://conjars.org/repo</url>
     </repository>
   </repositories>
-  
+
   <dependencies>
     <dependency>
       <groupId>com.twitter.elephantbird</groupId>
       <artifactId>elephant-bird-core</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+    </dependency>
     <dependency>
       <groupId>com.google.protobuf</groupId>
       <artifactId>protobuf-java</artifactId>

elephant-bird-core/pom.xml

@@ -18,6 +18,10 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+    </dependency>
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>

elephant-bird-hive/pom.xml

@@ -8,7 +8,7 @@
     <version>3.0.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
-  
+
   <artifactId>elephant-bird-hive</artifactId>
   <name>Elephant Bird Hive</name>
   <description>Hive utilities.</description>
@@ -18,6 +18,10 @@
       <groupId>com.twitter.elephantbird</groupId>
       <artifactId>elephant-bird-core</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.hive</groupId>
       <artifactId>hive-serde</artifactId>
@@ -29,6 +33,8 @@
     <dependency>
       <groupId>org.apache.hcatalog</groupId>
       <artifactId>hcatalog</artifactId>
+      <scope>system</scope>
+      <systemPath>${basedir}/../lib/hcatalog-0.5.0-dev.jar</systemPath>
     </dependency>
   </dependencies>
 </project>

elephant-bird-mahout/pom.xml

@@ -23,6 +23,10 @@
       <artifactId>elephant-bird-pig</artifactId>
       <type>test-jar</type>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.mahout</groupId>
       <artifactId>mahout-collections</artifactId>

elephant-bird-pig/pom.xml

@@ -18,6 +18,10 @@
       <groupId>com.twitter.elephantbird</groupId>
       <artifactId>elephant-bird-core</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.antlr</groupId>
       <artifactId>antlr</artifactId>
@@ -33,7 +37,6 @@
 
       <!-- need this for the mahout tests -->
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
         <executions>
           <execution>

elephant-bird-rcfile/pom.xml

@@ -6,7 +6,7 @@
     <groupId>com.twitter.elephantbird</groupId>
     <artifactId>elephant-bird</artifactId>
     <version>3.0.0-SNAPSHOT</version>
-    <relativePath>..</relativePath>        
+    <relativePath>..</relativePath>
   </parent>
 
   <artifactId>elephant-bird-rcfile</artifactId>
@@ -22,5 +22,9 @@
       <groupId>com.twitter.elephantbird</groupId>
       <artifactId>elephant-bird-hive</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+    </dependency>
   </dependencies>
 </project>

pom.xml

@@ -39,6 +39,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <slf4j.version>1.6.4</slf4j.version>
     <apache.hadoop.version>0.20.2</apache.hadoop.version>
     <apache.pig.version>0.9.2</apache.pig.version>
     <apache.hive.version>0.8.0</apache.hive.version>
@@ -88,8 +89,8 @@
         <artifactId>elephant-bird-pig</artifactId>
         <version>${project.version}</version>
         <type>test-jar</type>
-        <scope>test</scope>            
-      </dependency>        
+        <scope>test</scope>
+      </dependency>
       <dependency>
         <groupId>${project.groupId}</groupId>
         <artifactId>elephant-bird-rcfile</artifactId>
@@ -113,12 +114,12 @@
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-api</artifactId>
-        <version>1.6.4</version>
+        <version>${slf4j.version}</version>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-log4j12</artifactId>
-        <version>1.6.4</version>
+        <version>${slf4j.version}</version>
         <scope>runtime</scope>
         <optional>true</optional>
       </dependency>
@@ -176,13 +177,6 @@
         <artifactId>json-simple</artifactId>
         <version>1.1</version>
       </dependency>
-      <dependency>
-        <groupId>yamlbeans</groupId>
-        <artifactId>yamlbeans</artifactId>
-        <version>0.9.3</version>
-        <scope>system</scope>
-        <systemPath>${basedir}/../lib/yamlbeans-0.9.3.jar</systemPath>
-      </dependency>
 
       <!-- hadoop -->
       <dependency>
@@ -235,8 +229,6 @@
         <groupId>org.apache.hcatalog</groupId>
         <artifactId>hcatalog</artifactId>
         <version>0.5.0-dev</version>
-        <scope>system</scope>
-        <systemPath>${basedir}/../lib/hcatalog-0.5.0-dev.jar</systemPath>
       </dependency>
       <dependency>
         <groupId>javax.jdo</groupId>
@@ -302,6 +294,13 @@
         <plugin>
           <artifactId>maven-surefire-plugin</artifactId>
           <version>2.12</version>
+          <dependencies>
+            <dependency>
+              <groupId>org.apache.maven.surefire</groupId>
+              <artifactId>surefire-junit47</artifactId>
+              <version>2.12</version>
+            </dependency>
+          </dependencies>
         </plugin>
 
         <!-- package types -->