avro-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scottca...@apache.org
Subject svn commit: r1241561 - in /avro/trunk: ./ lang/java/ lang/java/archetypes/ lang/java/archetypes/avro-service-archetype/ lang/java/archetypes/avro-service-archetype/src/main/pom/ lang/java/archetypes/avro-service-archetype/src/main/resources/archetype-r...
Date Tue, 07 Feb 2012 19:25:10 GMT
Author: scottcarey
Date: Tue Feb  7 19:25:09 2012
New Revision: 1241561

URL: http://svn.apache.org/viewvc?rev=1241561&view=rev
Log:
AVRO-1011. Improve POM structure. (Lars Francke via scottcarey)

Removed:
    avro/trunk/lang/java/archetypes/avro-service-archetype/src/main/resources/archetype-resources/pom.xml
Modified:
    avro/trunk/CHANGES.txt
    avro/trunk/lang/java/archetypes/avro-service-archetype/pom.xml
    avro/trunk/lang/java/archetypes/avro-service-archetype/src/main/pom/pom.xml
    avro/trunk/lang/java/archetypes/pom.xml
    avro/trunk/lang/java/avro/pom.xml
    avro/trunk/lang/java/compiler/pom.xml
    avro/trunk/lang/java/ipc/pom.xml
    avro/trunk/lang/java/mapred/pom.xml
    avro/trunk/lang/java/mapred/src/test/java/org/apache/avro/mapred/tether/TestWordCountTether.java
    avro/trunk/lang/java/maven-plugin/pom.xml
    avro/trunk/lang/java/pom.xml
    avro/trunk/lang/java/protobuf/pom.xml
    avro/trunk/lang/java/thrift/pom.xml
    avro/trunk/lang/java/tools/pom.xml
    avro/trunk/pom.xml

Modified: avro/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/avro/trunk/CHANGES.txt?rev=1241561&r1=1241560&r2=1241561&view=diff
==============================================================================
--- avro/trunk/CHANGES.txt (original)
+++ avro/trunk/CHANGES.txt Tue Feb  7 19:25:09 2012
@@ -46,6 +46,8 @@ Avro 1.6.2 (unreleased)
 
     AVRO-956. Remove dependency on Flex/Bison. (thiru)
 
+    AVRO-1011. Improve POM structure. (Lars Francke via scottcarey) 
+
   BUG FIXES
 
     AVRO-962. Java: Fix Maven plugin to support string type override.

Modified: avro/trunk/lang/java/archetypes/avro-service-archetype/pom.xml
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/archetypes/avro-service-archetype/pom.xml?rev=1241561&r1=1241560&r2=1241561&view=diff
==============================================================================
--- avro/trunk/lang/java/archetypes/avro-service-archetype/pom.xml (original)
+++ avro/trunk/lang/java/archetypes/avro-service-archetype/pom.xml Tue Feb  7 19:25:09 2012
@@ -19,14 +19,18 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
   xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <artifactId>avro-archetypes-parent</artifactId>
     <groupId>org.apache.avro</groupId>
     <version>1.6.2-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
+
   <artifactId>avro-service-archetype</artifactId>
+  <packaging>maven-archetype</packaging>
+
   <name>Apache Avro Maven Service Archetype</name>
   <description>Archetype that generates a simple example Avro service</description>
-  <packaging>maven-archetype</packaging>
+
 </project>

Modified: avro/trunk/lang/java/archetypes/avro-service-archetype/src/main/pom/pom.xml
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/archetypes/avro-service-archetype/src/main/pom/pom.xml?rev=1241561&r1=1241560&r2=1241561&view=diff
==============================================================================
--- avro/trunk/lang/java/archetypes/avro-service-archetype/src/main/pom/pom.xml (original)
+++ avro/trunk/lang/java/archetypes/avro-service-archetype/src/main/pom/pom.xml Tue Feb  7 19:25:09 2012
@@ -15,40 +15,45 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<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">
+<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>\${groupId}</groupId>
   <artifactId>\${artifactId}</artifactId>
-  <packaging>jar</packaging>
   <version>\${version}</version>
+  <packaging>jar</packaging>
+
   <name>Simple Avro Ordering Service</name>
+
   <properties>
-    <avro-version>${project.version}</avro-version>
-    <jackson-version>1.8.4</jackson-version>
-    <junit.version>4.8.1</junit.version>
-    <logback.version>0.9.29</logback.version>
-    <slf4j.version>1.6.2</slf4j.version>
+    <avro.version>${project.version}</avro.version>
+    <jackson.version>1.8.4</jackson.version>
+    <junit.version>4.10</junit.version>
+    <logback.version>1.0.0</logback.version>
+    <slf4j.version>1.6.4</slf4j.version>
   </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.avro</groupId>
       <artifactId>avro</artifactId>
-      <version>\${avro-version}</version>
+      <version>\${avro.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.avro</groupId>
       <artifactId>avro-ipc</artifactId>
-      <version>\${avro-version}</version>
+      <version>\${avro.version}</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.jackson</groupId>
       <artifactId>jackson-core-asl</artifactId>
-      <version>\${jackson-version}</version>
+      <version>\${jackson.version}</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.jackson</groupId>
       <artifactId>jackson-mapper-asl</artifactId>
-      <version>\${jackson-version}</version>
+      <version>\${jackson.version}</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -67,13 +72,14 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+
   <build>
     <defaultGoal>install</defaultGoal>
     <plugins>
       <plugin>
         <groupId>org.apache.avro</groupId>
         <artifactId>avro-maven-plugin</artifactId>
-        <version>${avro-version}</version>
+        <version>${avro.version}</version>
         <executions>
           <execution>
             <goals>
@@ -86,7 +92,7 @@
           <dependency>
             <groupId>org.apache.avro</groupId>
             <artifactId>avro-ipc</artifactId>
-            <version>\${avro-version}</version>
+            <version>\${avro.version}</version>
           </dependency>
         </dependencies>
       </plugin>
@@ -128,4 +134,5 @@
       </plugin>
     </plugins>
   </build>
+
 </project>

Modified: avro/trunk/lang/java/archetypes/pom.xml
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/archetypes/pom.xml?rev=1241561&r1=1241560&r2=1241561&view=diff
==============================================================================
--- avro/trunk/lang/java/archetypes/pom.xml (original)
+++ avro/trunk/lang/java/archetypes/pom.xml Tue Feb  7 19:25:09 2012
@@ -15,25 +15,31 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<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/xsd/maven-4.0.0.xsd">
+<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/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
-    <artifactId>avro-parent</artifactId>
     <groupId>org.apache.avro</groupId>
+    <artifactId>avro-parent</artifactId>
     <version>1.6.2-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
+
   <artifactId>avro-archetypes-parent</artifactId>
+  <packaging>pom</packaging>
+
   <name>Apache Avro Maven Archetypes</name>
   <description>Archetypes parent defining configuration for generating archetype poms with the correct Avro version</description>
-  <packaging>pom</packaging>
-  <modules>
-    <module>avro-service-archetype</module>
-  </modules>
+
   <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.archetype.version>2.1</maven.archetype.version>
   </properties>
+
+  <modules>
+    <module>avro-service-archetype</module>
+  </modules>
+
   <build>
     <extensions>
       <extension>
@@ -84,7 +90,7 @@
             </goals>
             <phase>verify</phase>
             <configuration>
-                <outputDirectory>target/test-classes/</outputDirectory>
+              <outputDirectory>target/test-classes/</outputDirectory>
               <resources>
                 <resource>
                   <directory>src/test/integration</directory>
@@ -111,4 +117,5 @@
       </plugin>
     </plugins>
   </build>
+
 </project>

Modified: avro/trunk/lang/java/avro/pom.xml
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/avro/pom.xml?rev=1241561&r1=1241560&r2=1241561&view=diff
==============================================================================
--- avro/trunk/lang/java/avro/pom.xml (original)
+++ avro/trunk/lang/java/avro/pom.xml Tue Feb  7 19:25:09 2012
@@ -19,32 +19,20 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
   xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <artifactId>avro-parent</artifactId>
     <groupId>org.apache.avro</groupId>
     <version>1.6.2-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
+
   <artifactId>avro</artifactId>
+
   <name>Apache Avro</name>
   <url>http://avro.apache.org</url>
   <description>Avro core components</description>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-mapper-asl</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.thoughtworks.paranamer</groupId>
-      <artifactId>paranamer</artifactId>
-    </dependency>
-      <dependency>
-	<groupId>org.xerial.snappy</groupId>
-	<artifactId>snappy-java</artifactId>
-      </dependency>
-  </dependencies>
-
   <build>
     <resources>
       <resource>
@@ -58,7 +46,7 @@
       <plugin>
         <groupId>com.thoughtworks.paranamer</groupId>
         <artifactId>paranamer-maven-plugin</artifactId>
-        <version>${paranamer-version}</version>
+        <version>${paranamer.version}</version>
         <executions>
           <execution>
             <id>paranamer-test</id>
@@ -102,5 +90,24 @@
     </profile>
   </profiles>
 
+  <dependencies>
+    <dependency>
+      <groupId>org.codehaus.jackson</groupId>
+      <artifactId>jackson-core-asl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.jackson</groupId>
+      <artifactId>jackson-mapper-asl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.thoughtworks.paranamer</groupId>
+      <artifactId>paranamer</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.xerial.snappy</groupId>
+      <artifactId>snappy-java</artifactId>
+    </dependency>
+  </dependencies>
+
 </project>
 

Modified: avro/trunk/lang/java/compiler/pom.xml
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/compiler/pom.xml?rev=1241561&r1=1241560&r2=1241561&view=diff
==============================================================================
--- avro/trunk/lang/java/compiler/pom.xml (original)
+++ avro/trunk/lang/java/compiler/pom.xml Tue Feb  7 19:25:09 2012
@@ -19,13 +19,16 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
   xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <artifactId>avro-parent</artifactId>
     <groupId>org.apache.avro</groupId>
     <version>1.6.2-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
+
   <artifactId>avro-compiler</artifactId>
+
   <name>Apache Avro Compiler</name>
   <url>http://avro.apache.org</url>
   <description>Compilers for Avro IDL and Avro Specific Java API</description>
@@ -45,8 +48,8 @@
       </testResource>
     </testResources>
     <plugins>
-      <!-- Avro generates a parser class with javacc. By default, this looks in src/main/javacc 
-        and outputs to target/generated-sources/javacc See http://mojo.codehaus.org/javacc-maven-plugin/javacc-mojo.html 
+      <!-- Avro generates a parser class with javacc. By default, this looks in src/main/javacc
+        and outputs to target/generated-sources/javacc See http://mojo.codehaus.org/javacc-maven-plugin/javacc-mojo.html
         for more info on using this plugin. -->
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
@@ -82,17 +85,24 @@
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
-      <version>2.6</version>
-      <scope>compile</scope>
+      <version>${commons-lang.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.velocity</groupId>
       <artifactId>velocity</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.codehaus.jackson</groupId>
+      <artifactId>jackson-core-asl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.jackson</groupId>
+      <artifactId>jackson-mapper-asl</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.8.2</version>
+      <version>${ant.version}</version>
       <!-- can only be used from within ant -->
       <scope>provided</scope>
     </dependency>

Modified: avro/trunk/lang/java/ipc/pom.xml
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/ipc/pom.xml?rev=1241561&r1=1241560&r2=1241561&view=diff
==============================================================================
--- avro/trunk/lang/java/ipc/pom.xml (original)
+++ avro/trunk/lang/java/ipc/pom.xml Tue Feb  7 19:25:09 2012
@@ -19,43 +19,20 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
   xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <artifactId>avro-parent</artifactId>
     <groupId>org.apache.avro</groupId>
     <version>1.6.2-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
+
   <artifactId>avro-ipc</artifactId>
+
   <name>Apache Avro IPC</name>
   <url>http://avro.apache.org</url>
   <description>Avro inter-process communication components</description>
 
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>avro</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>avro-compiler</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.netty</groupId>
-      <artifactId>netty</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.velocity</groupId>
-      <artifactId>velocity</artifactId>
-    </dependency>
-  </dependencies>
-
   <build>
     <resources>
       <resource>
@@ -92,5 +69,53 @@
       </plugin>
     </plugins>
   </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>avro</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>avro-compiler</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.jackson</groupId>
+      <artifactId>jackson-core-asl</artifactId>
+      <version>${jackson.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.jackson</groupId>
+      <artifactId>jackson-mapper-asl</artifactId>
+      <version>${jackson.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jetty</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jetty-util</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.netty</groupId>
+      <artifactId>netty</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.velocity</groupId>
+      <artifactId>velocity</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>${jetty-servlet-api.version}</version>
+    </dependency>
+
+  </dependencies>
+
 </project>
 

Modified: avro/trunk/lang/java/mapred/pom.xml
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/mapred/pom.xml?rev=1241561&r1=1241560&r2=1241561&view=diff
==============================================================================
--- avro/trunk/lang/java/mapred/pom.xml (original)
+++ avro/trunk/lang/java/mapred/pom.xml Tue Feb  7 19:25:09 2012
@@ -19,35 +19,19 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
   xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <artifactId>avro-parent</artifactId>
     <groupId>org.apache.avro</groupId>
     <version>1.6.2-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
+
   <artifactId>avro-mapred</artifactId>
+
   <name>Apache Avro Mapred API</name>
   <description>An org.apache.hadoop.mapred compatible API for using Avro Serializatin in Hadoop</description>
 
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>avro-ipc</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-core</artifactId>
-      <!-- hadoop's execution environment provides its own jars, usurping any others. 
-        So we should not include it here -->
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>net.sf.jopt-simple</groupId>
-      <artifactId>jopt-simple</artifactId>
-    </dependency>
-  </dependencies>
-
   <build>
     <plugins>
       <plugin>
@@ -75,7 +59,7 @@
             <goals>
               <goal>protocol</goal>
             </goals>
-            <configuration>  
+            <configuration>
               <stringType>String</stringType>
               <includes>
                 <include>**/mapred/tether/*.avpr</include>
@@ -88,5 +72,31 @@
       </plugin>
     </plugins>
   </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>avro-ipc</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-core</artifactId>
+      <!-- hadoop's execution environment provides its own jars, usurping any others.
+        So we should not include it here -->
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.jackson</groupId>
+      <artifactId>jackson-core-asl</artifactId>
+      <version>${jackson.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.jackson</groupId>
+      <artifactId>jackson-mapper-asl</artifactId>
+      <version>${jackson.version}</version>
+    </dependency>
+  </dependencies>
+
 </project>
 

Modified: avro/trunk/lang/java/mapred/src/test/java/org/apache/avro/mapred/tether/TestWordCountTether.java
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/mapred/src/test/java/org/apache/avro/mapred/tether/TestWordCountTether.java?rev=1241561&r1=1241560&r2=1241561&view=diff
==============================================================================
--- avro/trunk/lang/java/mapred/src/test/java/org/apache/avro/mapred/tether/TestWordCountTether.java (original)
+++ avro/trunk/lang/java/mapred/src/test/java/org/apache/avro/mapred/tether/TestWordCountTether.java Tue Feb  7 19:25:09 2012
@@ -18,39 +18,20 @@
 
 package org.apache.avro.mapred.tether;
 
-
 import static org.junit.Assert.assertEquals;
 
 import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.IOException;
 import java.io.InputStream;
-import java.net.URI;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.StringTokenizer;
-
-import joptsimple.OptionParser;
-import joptsimple.OptionSet;
-import joptsimple.OptionSpec;
-import junit.framework.Assert;
 
-import org.apache.hadoop.fs.FileStatus;
-import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.io.NullWritable;
-import org.apache.hadoop.mapred.FileSplit;
-import org.apache.hadoop.mapred.JobClient;
 import org.apache.hadoop.mapred.JobConf;
 import org.apache.hadoop.mapred.FileInputFormat;
 import org.apache.hadoop.mapred.FileOutputFormat;
-import org.apache.hadoop.mapred.Reporter;
 
-import org.apache.avro.Schema;
-import org.apache.avro.specific.SpecificDatumReader;
-import org.apache.avro.util.Utf8;
-import org.apache.avro.Protocol;
 import org.junit.Test;
 
 import org.apache.avro.file.DataFileStream;
@@ -58,16 +39,9 @@ import org.apache.avro.io.DatumReader;
 import org.apache.avro.mapred.AvroJob;
 import org.apache.avro.mapred.WordCountUtil;
 import org.apache.avro.mapred.Pair;
-
 import org.apache.avro.Schema;
 import org.apache.avro.util.Utf8;
-import org.apache.avro.io.DatumReader;
-import org.apache.avro.io.DatumWriter;
-import org.apache.avro.generic.GenericDatumReader;
-import org.apache.avro.generic.GenericDatumWriter;
 import org.apache.avro.specific.SpecificDatumReader;
-import org.apache.avro.file.DataFileWriter;
-import org.apache.avro.file.DataFileStream;
 
 public class TestWordCountTether {
 

Modified: avro/trunk/lang/java/maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/maven-plugin/pom.xml?rev=1241561&r1=1241560&r2=1241561&view=diff
==============================================================================
--- avro/trunk/lang/java/maven-plugin/pom.xml (original)
+++ avro/trunk/lang/java/maven-plugin/pom.xml Tue Feb  7 19:25:09 2012
@@ -19,23 +19,22 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
   xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <artifactId>avro-parent</artifactId>
     <groupId>org.apache.avro</groupId>
     <version>1.6.2-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
+
   <artifactId>avro-maven-plugin</artifactId>
+  <packaging>maven-plugin</packaging>
+
   <name>Apache Avro Maven Plugin</name>
   <description>Maven plugin for Avro IDL and Specific API Compilers</description>
-  <packaging>maven-plugin</packaging>
-  
-  <properties>
-    <maven-version>2.0.10</maven-version>
-  </properties>
 
   <prerequisites>
-    <maven>${maven-version}</maven>
+    <maven>${maven.version}</maven>
   </prerequisites>
 
   <build>
@@ -60,17 +59,17 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>${maven-version}</version>
+      <version>${maven.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-project</artifactId>
-      <version>${maven-version}</version>
+      <version>${maven.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.shared</groupId>
       <artifactId>file-management</artifactId>
-      <version>1.2.1</version>
+      <version>${file-management.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>

Modified: avro/trunk/lang/java/pom.xml
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/pom.xml?rev=1241561&r1=1241560&r2=1241561&view=diff
==============================================================================
--- avro/trunk/lang/java/pom.xml (original)
+++ avro/trunk/lang/java/pom.xml Tue Feb  7 19:25:09 2012
@@ -16,7 +16,7 @@
    limitations under the License.
 -->
 <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/xsd/maven-4.0.0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -36,43 +36,58 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <!-- version properties for dependencies -->
-    <junit-version>4.10</junit-version>
-    <paranamer-version>2.3</paranamer-version>
-    <slf4j-version>1.6.3</slf4j-version>
-    <jackson-version>1.8.6</jackson-version>
-    <hadoop-version>0.20.205.0</hadoop-version>
-    <velocity-version>1.7</velocity-version>
-    <jetty-version>6.1.26</jetty-version>
-    <netty-version>3.2.6.Final</netty-version> 
-    <jopt-simple-version>4.1</jopt-simple-version>
-    <snappy-version>1.0.4.1</snappy-version>
-    <protobuf-version>2.4.1</protobuf-version>
+    <hadoop.version>0.20.205.0</hadoop.version>
+    <jackson.version>1.8.6</jackson.version>
+    <jetty.version>6.1.26</jetty.version>
+    <jetty-servlet-api.version>2.5-20081211</jetty-servlet-api.version>
+    <jopt-simple.version>4.1</jopt-simple.version>
+    <junit.version>4.10</junit.version>
+    <netty.version>3.2.6.Final</netty.version>
+    <paranamer.version>2.3</paranamer.version>
+    <protobuf.version>2.4.1</protobuf.version>
+    <thrift.version>0.7.0</thrift.version>
+    <slf4j.version>1.6.3</slf4j.version>
+    <snappy.version>1.0.4.1</snappy.version>
+    <velocity.version>1.7</velocity.version>
+    <thrift.version>0.7.0</thrift.version>
+    <maven.version>2.0.10</maven.version>
+    <ant.version>1.8.2</ant.version>
+    <commons-lang.version>2.6</commons-lang.version>
 
     <!-- version properties for plugins -->
-    <compiler-plugin-version>2.3.2</compiler-plugin-version>
-    <jar-plugin-version>2.3.2</jar-plugin-version>
-    <surefire-plugin-version>2.10</surefire-plugin-version>
-    <!-- checkstyle plugin 2.7 has a bug, fixed in 2.8 
-         http://jira.codehaus.org/browse/MCHECKSTYLE-159 -->
-    <checkstyle-plugin-version>2.6</checkstyle-plugin-version>
-    <javadoc-plugin-version>2.8</javadoc-plugin-version> 
-    <source-plugin-version>2.1.2</source-plugin-version>
-    <javacc-plugin-version>2.6</javacc-plugin-version>
-    <exec-plugin-version>1.2.1</exec-plugin-version>
-    <plugin-plugin-version>2.9</plugin-plugin-version>
+    <checkstyle-plugin.version>2.6</checkstyle-plugin.version>
+    <compiler-plugin.version>2.3.2</compiler-plugin.version>
+    <exec-plugin.version>1.2.1</exec-plugin.version>
+    <jar-plugin.version>2.3.2</jar-plugin.version>
+    <javacc-plugin.version>2.6</javacc-plugin.version>
+    <javadoc-plugin.version>2.8</javadoc-plugin.version>
+    <plugin-plugin.version>2.9</plugin-plugin.version>
+    <source-plugin.version>2.1.2</source-plugin.version>
+    <surefire-plugin.version>2.10</surefire-plugin.version>
+    <file-management.version>1.2.1</file-management.version>  </properties>
 
-  </properties>
+  <modules>
+    <module>avro</module>
+    <module>compiler</module>
+    <module>maven-plugin</module>
+    <module>ipc</module>
+    <module>tools</module>
+    <module>mapred</module>
+    <module>protobuf</module>
+    <module>thrift</module>
+    <module>archetypes</module>
+  </modules>
 
   <build>
-    <!-- defines the default plugin configuration that all child projects inherit 
-      from. Like dependencyManagement, this provides configuration, version, and other 
+    <!-- defines the default plugin configuration that all child projects inherit from.
+      Like dependencyManagement, this provides configuration, version, and other
       parameters if the plugins are used by child projects -->
     <pluginManagement>
       <plugins>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>${compiler-plugin-version}</version>
+          <version>${compiler-plugin.version}</version>
           <configuration>
             <source>1.6</source>
             <target>1.6</target>
@@ -81,7 +96,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-jar-plugin</artifactId>
-          <version>${jar-plugin-version}</version>
+          <version>${jar-plugin.version}</version>
           <configuration>
             <archive>
               <manifest>
@@ -94,7 +109,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>${surefire-plugin-version}</version>
+          <version>${surefire-plugin.version}</version>
           <configuration>
             <includes>
               <!-- Avro naming convention for JUnit tests -->
@@ -103,14 +118,14 @@
             <excludes>
               <!-- A few innner classes are not to be tested -->
               <exclude>**/*$*</exclude>
-              <!-- exclude the generated classes under apache.avro.test, some of 
+              <!-- exclude the generated classes under apache.avro.test, some of
                 these match **/Test** and are not JUnit tests -->
               <exclude>**/apache/avro/test/**</exclude>
             </excludes>
             <enableAssertions>false</enableAssertions>
             <!-- some IPC tests hang if not run in a separate JVM -->
             <forkMode>always</forkMode>
-            <!-- TestSpecificCompiler instantiates a Java compiler to test output results, 
+            <!-- TestSpecificCompiler instantiates a Java compiler to test output results,
                  this does not work with a manifest-only-jar to set the classpath for the javac.
                  This may cause problems on some platforms.
                  See http://maven.apache.org/plugins/maven-surefire-plugin/examples/class-loading.html
@@ -128,11 +143,11 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-checkstyle-plugin</artifactId>
-          <version>${checkstyle-plugin-version}</version>
+          <version>${checkstyle-plugin.version}</version>
           <configuration>
             <configLocation>checkstyle.xml</configLocation>
           </configuration>
-          <!-- Runs by default in the verify phase  (mvn verify or later in the build cycle) 
+          <!-- Runs by default in the verify phase  (mvn verify or later in the build cycle)
                the 'check' goal will fail the build if it does not pass.  "mvn checkstyle:check"
                will do this alone, or "mvn checkstyle:checkstyle" will report but not break  -->
           <executions>
@@ -148,53 +163,34 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
-          <version>${javadoc-plugin-version}</version>
+          <version>${javadoc-plugin.version}</version>
           <configuration>
             <links>
-              <link>http://jackson.codehaus.org/${jackson-version}/javadoc/</link>
+              <link>http://jackson.codehaus.org/${jackson.version}/javadoc/</link>
               <link>http://java.sun.com/products/servlet/2.3/javadoc/</link>
-              <link>http://hadoop.apache.org/common/docs/r${hadoop-version}/api/</link>
+              <link>http://hadoop.apache.org/common/docs/r${hadoop.version}/api/</link>
             </links>
           </configuration>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-source-plugin</artifactId>
-          <version>${source-plugin-version}</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-enforcer-plugin</artifactId>
-          <version>${enforcer-plugin-version}</version>
-          <configuration>
-            <rules>
-              <requireProperty>
-               <property>avro.version</property>
-               <message>*****!!!!!!   Must have property avro.version set to enforce version.   !!!!!!*****</message>
-              </requireProperty>
-              <requireProperty>
-                <property>project.version</property>
-                <regex>${avro.version}</regex>
-                <regexMessage>*****!!!!!   Version of project must be ${avro.version}   !!!!!*****</regexMessage>
-              </requireProperty>
-            </rules>
-            <fail>true</fail>
-          </configuration>
+          <version>${source-plugin.version}</version>
         </plugin>
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>javacc-maven-plugin</artifactId>
-          <version>${javacc-plugin-version}</version>
+          <version>${javacc-plugin.version}</version>
         </plugin>
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>exec-maven-plugin</artifactId>
-          <version>${exec-plugin-version}</version>
+          <version>${exec-plugin.version}</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-plugin-plugin</artifactId>
-          <version>${plugin-plugin-version}</version>
+          <version>${plugin-plugin.version}</version>
         </plugin>
       </plugins>
     </pluginManagement>
@@ -235,118 +231,82 @@
       </build>
     </profile>
   </profiles>
-  
-  <!-- dependencyManagement can be used to define dependency versions, scopes, and 
-    excludes to be shared by child projects. Child projects will not inherit these dependencies, 
-    rather they inherit the properties of the below dependencies (such as version) if 
+
+  <!-- dependencyManagement can be used to define dependency versions, scopes, and
+    excludes to be shared by child projects. Child projects will not inherit these dependencies,
+    rather they inherit the properties of the below dependencies (such as version) if
     the dependency is specified in the child. -->
   <dependencyManagement>
     <dependencies>
       <dependency>
         <groupId>org.codehaus.jackson</groupId>
+        <artifactId>jackson-core-asl</artifactId>
+        <version>${jackson.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.codehaus.jackson</groupId>
         <artifactId>jackson-mapper-asl</artifactId>
-        <version>${jackson-version}</version>
-        <scope>compile</scope>
+        <version>${jackson.version}</version>
       </dependency>
       <dependency>
         <groupId>com.thoughtworks.paranamer</groupId>
         <artifactId>paranamer</artifactId>
-        <version>${paranamer-version}</version>
-        <scope>compile</scope>
+        <version>${paranamer.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.velocity</groupId>
         <artifactId>velocity</artifactId>
-        <version>${velocity-version}</version>
-        <scope>compile</scope>
+        <version>${velocity.version}</version>
       </dependency>
       <dependency>
         <groupId>org.mortbay.jetty</groupId>
         <artifactId>jetty</artifactId>
-        <version>${jetty-version}</version>
-        <scope>compile</scope>
+        <version>${jetty.version}</version>
       </dependency>
       <dependency>
         <groupId>org.jboss.netty</groupId>
         <artifactId>netty</artifactId>
-        <version>${netty-version}</version>
-        <scope>compile</scope>
+        <version>${netty.version}</version>
       </dependency>
       <dependency>
         <groupId>net.sf.jopt-simple</groupId>
         <artifactId>jopt-simple</artifactId>
-        <version>${jopt-simple-version}</version>
-        <scope>compile</scope>
+        <version>${jopt-simple.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.hadoop</groupId>
         <artifactId>hadoop-core</artifactId>
-        <version>${hadoop-version}</version>
-        <scope>compile</scope>
+        <version>${hadoop.version}</version>
       </dependency>
       <dependency>
-	<groupId>org.xerial.snappy</groupId>
-	<artifactId>snappy-java</artifactId>
-	<version>${snappy-version}</version>
-	<type>jar</type>
-	<scope>compile</scope>
+        <groupId>org.xerial.snappy</groupId>
+        <artifactId>snappy-java</artifactId>
+        <version>${snappy.version}</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
 
-  <!-- dependencies defines dependencies that all child projects share. Child projects 
+  <!-- dependencies defines dependencies that all child projects share. Child projects
     will inherit these dependencies directly, and can opt out if necessary with <excludes> -->
   <dependencies>
     <dependency>
       <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>${junit-version}</version>
+      <artifactId>junit-dep</artifactId>
+      <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>${slf4j-version}</version>
-      <scope>compile</scope>
+      <version>${slf4j.version}</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
-      <version>${slf4j-version}</version>
+      <version>${slf4j.version}</version>
+      <scope>runtime</scope>
       <optional>true</optional>
     </dependency>
   </dependencies>
 
-  <repositories>
-    <repository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshot Repository</name>
-      <url>http://repository.apache.org/snapshots</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-    </repository>
-    <!-- JBoss repo needed for netty -->
-    <repository>
-      <id>jboss-release-repository</id>
-      <name>JBoss Release Repository</name>
-      <url>https://repository.jboss.org/nexus/content/repositories/releases/</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-
-  <modules>
-    <module>avro</module>
-    <module>compiler</module>
-    <module>maven-plugin</module>
-    <module>ipc</module>
-    <module>tools</module>
-    <module>mapred</module>
-    <module>protobuf</module>
-    <module>thrift</module>
-    <module>archetypes</module>
-  </modules>
-
 </project>

Modified: avro/trunk/lang/java/protobuf/pom.xml
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/protobuf/pom.xml?rev=1241561&r1=1241560&r2=1241561&view=diff
==============================================================================
--- avro/trunk/lang/java/protobuf/pom.xml (original)
+++ avro/trunk/lang/java/protobuf/pom.xml Tue Feb  7 19:25:09 2012
@@ -19,29 +19,18 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
   xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <artifactId>avro-parent</artifactId>
     <groupId>org.apache.avro</groupId>
     <version>1.6.2-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
+
   <artifactId>avro-protobuf</artifactId>
-  <name>Apache Avro Protobuf Compatibility</name>
-  <description>Permit serialization of Protobuf-generated classes as
-  Avro data.</description>
 
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>avro</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.google.protobuf</groupId>
-      <artifactId>protobuf-java</artifactId>
-      <version>${protobuf-version}</version>
-    </dependency>
-  </dependencies>
+  <name>Apache Avro Protobuf Compatibility</name>
+  <description>Permit serialization of Protobuf-generated classes as Avro data.</description>
 
   <profiles>
     <profile>
@@ -55,7 +44,7 @@
                 <phase>generate-test-sources</phase>
                 <configuration>
                   <tasks>
-                    <mkdir dir="target/protobuf-tmp" />
+                    <mkdir dir="target/protobuf-tmp"/>
                     <exec executable="protoc">
                       <arg value="--java_out=src/test/java/"/>
                       <arg value="src/test/protobuf/test.proto"/>
@@ -73,4 +62,27 @@
     </profile>
   </profiles>
 
+  <dependencies>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>avro</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.protobuf</groupId>
+      <artifactId>protobuf-java</artifactId>
+      <version>${protobuf.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.jackson</groupId>
+      <artifactId>jackson-core-asl</artifactId>
+      <version>${jackson.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.jackson</groupId>
+      <artifactId>jackson-mapper-asl</artifactId>
+      <version>${jackson.version}</version>
+    </dependency>
+  </dependencies>
+
 </project>

Modified: avro/trunk/lang/java/thrift/pom.xml
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/thrift/pom.xml?rev=1241561&r1=1241560&r2=1241561&view=diff
==============================================================================
--- avro/trunk/lang/java/thrift/pom.xml (original)
+++ avro/trunk/lang/java/thrift/pom.xml Tue Feb  7 19:25:09 2012
@@ -19,29 +19,18 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
   xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <artifactId>avro-parent</artifactId>
     <groupId>org.apache.avro</groupId>
     <version>1.6.2-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
+
   <artifactId>avro-thrift</artifactId>
-  <name>Apache Avro Thrift Compatibility</name>
-  <description>Permit serialization of Thrift-generated classes as
-  Avro data.</description>
 
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>avro</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.thrift</groupId>
-      <artifactId>libthrift</artifactId>
-      <version>0.7.0</version>
-    </dependency>
-  </dependencies>
+  <name>Apache Avro Thrift Compatibility</name>
+  <description>Permit serialization of Thrift-generated classes as Avro data.</description>
 
   <profiles>
     <profile>
@@ -55,15 +44,16 @@
                 <phase>generate-test-sources</phase>
                 <configuration>
                   <tasks>
-                    <mkdir dir="target/thrift-tmp" />
+                    <mkdir dir="target/thrift-tmp"/>
                     <exec executable="thrift">
-                      <arg value="--gen" /> <arg value="java:beans"/>
+                      <arg value="--gen"/>
+                      <arg value="java:beans"/>
                       <arg value="-o"/>
                       <arg value="target/thrift-tmp"/>
                       <arg value="src/test/thrift/test.thrift"/>
                     </exec>
                     <copy todir="src/test/java" overwrite="true">
-                      <fileset dir="target/thrift-tmp/gen-javabean" />
+                      <fileset dir="target/thrift-tmp/gen-javabean"/>
                     </copy>
                   </tasks>
                 </configuration>
@@ -78,4 +68,22 @@
     </profile>
   </profiles>
 
+  <dependencies>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>avro</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.thrift</groupId>
+      <artifactId>libthrift</artifactId>
+      <version>${thrift.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.jackson</groupId>
+      <artifactId>jackson-core-asl</artifactId>
+      <version>${jackson.version}</version>
+    </dependency>
+  </dependencies>
+
 </project>

Modified: avro/trunk/lang/java/tools/pom.xml
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/tools/pom.xml?rev=1241561&r1=1241560&r2=1241561&view=diff
==============================================================================
--- avro/trunk/lang/java/tools/pom.xml (original)
+++ avro/trunk/lang/java/tools/pom.xml Tue Feb  7 19:25:09 2012
@@ -19,13 +19,16 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
   xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <artifactId>avro-parent</artifactId>
     <groupId>org.apache.avro</groupId>
     <version>1.6.2-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
+
   <artifactId>avro-tools</artifactId>
+
   <name>Apache Avro Tools</name>
   <url>http://avro.apache.org</url>
   <description>Avro command line tools and utilities</description>
@@ -108,6 +111,11 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
+      <groupId>org.codehaus.jackson</groupId>
+      <artifactId>jackson-core-asl</artifactId>
+      <version>${jackson.version}</version>
+    </dependency>
+    <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-core</artifactId>
       <optional>true</optional>

Modified: avro/trunk/pom.xml
URL: http://svn.apache.org/viewvc/avro/trunk/pom.xml?rev=1241561&r1=1241560&r2=1241561&view=diff
==============================================================================
--- avro/trunk/pom.xml (original)
+++ avro/trunk/pom.xml Tue Feb  7 19:25:09 2012
@@ -16,7 +16,7 @@
    limitations under the License.
 -->
 <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/xsd/maven-4.0.0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -34,7 +34,7 @@
   <url>http://avro.apache.org</url>
   <description>Avro toplevel pom</description>
 
-  <!-- This project is used for top level build tasks and artifact copying.  
+  <!-- This project is used for top level build tasks and artifact copying.
        The RAT task is run to validate licenses.  The Enforcer plugin is used
        to validate that java projects are the correct version.
        Java artifacts are copied to the final build destination with a custom profile.
@@ -43,12 +43,11 @@
     <avro.distDir>dist</avro.distDir>
     <avro.docDir>build/avro-doc-${project.version}/api</avro.docDir>
     <!-- dependency plugin versions -->
-    <apache-rat-tasks-version>0.7</apache-rat-tasks-version>    
+    <apache-rat-tasks.version>0.7</apache-rat-tasks.version>
 
     <!-- plugin versions -->
-    <antrun-plugin-version>1.6</antrun-plugin-version>
-    <enforcer-plugin-version>1.0.1</enforcer-plugin-version>
-     
+    <antrun-plugin.version>1.6</antrun-plugin.version>
+    <enforcer-plugin.version>1.0.1</enforcer-plugin.version>
   </properties>
 
   <modules>
@@ -97,17 +96,17 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>${enforcer-plugin-version}</version>
+        <version>${enforcer-plugin.version}</version>
         <configuration>
           <rules>
             <requireProperty>
-             <property>avro.version</property>
-             <message>*****!!!!!!   Must have property avro.version set to enforce version.   !!!!!!*****</message>
+              <property>avro.version</property>
+              <message>*****!!!!!! Must have property avro.version set to enforce version. !!!!!!*****</message>
             </requireProperty>
             <requireProperty>
               <property>project.version</property>
               <regex>${avro.version}</regex>
-              <regexMessage>*****!!!!!   Version of project must be ${avro.version}   !!!!!*****</regexMessage>
+              <regexMessage>*****!!!!! Version of project must be ${avro.version} !!!!!*****</regexMessage>
             </requireProperty>
           </rules>
           <fail>true</fail>
@@ -168,7 +167,7 @@
               <execution>
                 <phase>package</phase>
                 <goals>
-                 <goal>enforce</goal>
+                  <goal>enforce</goal>
                 </goals>
               </execution>
             </executions>
@@ -188,7 +187,7 @@
                 <id>sign-artifacts</id>
                 <phase>verify</phase>
                 <goals>
-	          <goal>sign</goal>
+                  <goal>sign</goal>
                 </goals>
               </execution>
             </executions>
@@ -203,11 +202,11 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-antrun-plugin</artifactId>
-            <version>${antrun-plugin-version}</version>
+            <version>${antrun-plugin.version}</version>
             <configuration>
               <target name="rat">
                 <rat:report xmlns:rat="antlib:org.apache.rat.anttasks"
-                    reportFile="build/rat-report.log">
+                            reportFile="build/rat-report.log">
                   <fileset dir="build/avro-src-${project.version}/"
                            excludesfile="share/rat-excludes.txt"/>
                 </rat:report>
@@ -223,7 +222,7 @@
               <dependency>
                 <groupId>org.apache.rat</groupId>
                 <artifactId>apache-rat-tasks</artifactId>
-                <version>${apache-rat-tasks-version}</version>
+                <version>${apache-rat-tasks.version}</version>
               </dependency>
             </dependencies>
           </plugin>
@@ -237,17 +236,17 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-antrun-plugin</artifactId>
-            <version>${antrun-plugin-version}</version>
+            <version>${antrun-plugin.version}</version>
             <configuration>
               <target name="copy-java-artifacts">
                 <mkdir dir="${avro.distDir}/java"/>
                 <copy todir="${avro.distDir}/java" verbose="true">
-                 <flattenmapper/>
-                 <fileset dir="lang/java/"
+                  <flattenmapper/>
+                  <fileset dir="lang/java/"
                            includes="*/target/*${project.version}*.jar"
                            excludes="**/original-*.jar **/*tests.jar"/>
                 </copy>
-                
+
                 <mkdir dir="${avro.docDir}"/>
                 <copy todir="${avro.docDir}/java">
                   <fileset dir="lang/java/target/site/apidocs"/>
@@ -259,4 +258,5 @@
       </build>
     </profile>
   </profiles>
+
 </project>



Mime
View raw message