diff -Naur infinispan-5.1.2.FINAL/client/hotrod-client/pom.xml infinispan-5.1.2.FINAL-work/client/hotrod-client/pom.xml
--- infinispan-5.1.2.FINAL/client/hotrod-client/pom.xml	2012-03-02 09:14:01.000000000 -0500
+++ infinispan-5.1.2.FINAL-work/client/hotrod-client/pom.xml	2012-03-22 12:49:12.710999963 -0500
@@ -25,7 +25,7 @@
       </dependency>
 
       <dependency>
-         <groupId>org.apache.hadoop</groupId>
+         <groupId>org.apache.avro</groupId>
          <artifactId>avro</artifactId>
          <scope>provided</scope>
       </dependency>
@@ -73,4 +73,4 @@
          </plugin>
       </plugins>
    </build>
-</project>
\ No newline at end of file
+</project>
diff -Naur infinispan-5.1.2.FINAL/parent/pom.xml infinispan-5.1.2.FINAL-work/parent/pom.xml
--- infinispan-5.1.2.FINAL/parent/pom.xml	2012-03-02 09:14:01.000000000 -0500
+++ infinispan-5.1.2.FINAL-work/parent/pom.xml	2012-03-22 15:12:30.292999891 -0500
@@ -414,13 +414,6 @@
             </exclusions>
          </dependency>
          <dependency>
-            <groupId>org.jboss.arquillian</groupId>
-            <artifactId>arquillian-bom</artifactId>
-            <version>${version.arquillian}</version>
-            <type>pom</type>
-            <scope>import</scope>
-         </dependency>
-         <dependency>
             <groupId>org.jboss.spec.javax.transaction</groupId>
             <artifactId>jboss-transaction-api_1.1_spec</artifactId>
             <version>${version.jta}</version>
@@ -770,12 +763,6 @@
       </dependency>
       <dependency>
          <groupId>org.jboss.logging</groupId>
-         <artifactId>jboss-logging-generator</artifactId>
-         <version>${version.jboss.logging.processor}</version>
-         <scope>provided</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.jboss.logging</groupId>
          <artifactId>jboss-logging-processor</artifactId>
          <version>${version.jboss.logging.processor}</version>
          <scope>provided</scope>
@@ -1024,24 +1011,6 @@
       </pluginManagement>
       <plugins>
          <plugin>
-            <artifactId>maven-remote-resources-plugin</artifactId>
-            <version>1.1</version>
-            <executions>
-               <execution>
-                  <id>attach-license</id>
-                  <goals>
-                     <goal>process</goal>
-                  </goals>
-                  <inherited>true</inherited>
-                  <configuration>
-                     <resourceBundles>
-                        <resourceBundle>org.infinispan:infinispan-license:1</resourceBundle>
-                     </resourceBundles>
-                  </configuration>
-               </execution>
-            </executions>
-         </plugin>
-         <plugin>
             <groupId>org.apache.felix</groupId>
             <artifactId>maven-bundle-plugin</artifactId>
             <extensions>true</extensions>
@@ -1149,7 +1118,7 @@
             <version>2.1</version>
          </plugin>
          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
+            <groupId>maven-plugins</groupId>
             <artifactId>maven-resources-plugin</artifactId>
             <version>2.4.3</version>
             <configuration>
@@ -1414,4 +1383,4 @@
          </properties>
       </profile>
    </profiles>
-</project>
\ No newline at end of file
+</project>
diff -Naur infinispan-5.1.2.FINAL/pom.xml infinispan-5.1.2.FINAL-work/pom.xml
--- infinispan-5.1.2.FINAL/pom.xml	2012-03-02 09:14:01.000000000 -0500
+++ infinispan-5.1.2.FINAL-work/pom.xml	2012-03-22 15:14:17.386999186 -0500
@@ -19,37 +19,9 @@
    <modules>
       <module>parent</module>
       <module>core</module>
-      <module>tools</module>
-      <module>query</module>
-      <module>tree</module>
-      <module>lucene-directory</module>
-      <module>cachestore</module>
       <module>cachestore/jdbc</module>
-      <module>cachestore/jdbm</module>
-      <module>cachestore/bdbje</module>
-      <module>cachestore/cloud</module>
       <module>cachestore/remote</module>
-      <module>cachestore/cassandra</module>
-      <module>server</module>
-      <module>server/core</module>
-      <module>server/memcached</module>
-      <module>server/hotrod</module>
-      <module>server/websocket</module>
-      <module>server/rest</module>
       <module>client/hotrod-client</module>
-      <module>rhq-plugin</module>
-      <module>spring</module>
-      <module>demos/gui</module>
-      <module>demos/ec2</module>
-      <module>demos/distexec</module>
-      <module>demos/ec2-ui</module>
-      <module>demos/directory</module>
-      <module>demos/lucene-directory-demo</module>
-      <module>demos/gridfs-webdav</module>
-      <module>demos/nearcache</module>
-      <module>demos/nearcache-client</module>
-      <module>cdi/extension</module>
-      <module>cdi/tck-runner</module>
    </modules>
 
    <profiles>
@@ -304,4 +276,4 @@
       </profile>
 
    </profiles>
-</project>
\ No newline at end of file
+</project>