--- pom.xml	2012-04-07 00:10:52.556970405 +0200
+++ pom.xml-gil	2012-04-07 00:15:45.775977360 +0200
@@ -480,8 +480,8 @@
                 <version>1.13.1</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-jpa_2.0_spec</artifactId>
+                <groupId>org.hibernate.javax.persistence</groupId>
+                <artifactId>hibernate-jpa-2.0-api</artifactId>
                 <version>1.1</version>
             </dependency>
             <dependency>
@@ -501,7 +501,12 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.bval</groupId>
-                <artifactId>org.apache.bval.bundle</artifactId>
+                <artifactId>bval-core</artifactId>
+                <version>0.3-incubating</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.bval</groupId>
+                <artifactId>bval-jsr303</artifactId>
                 <version>0.3-incubating</version>
             </dependency>
             <dependency>
@@ -565,7 +570,7 @@
                 <artifactId>jmock</artifactId>
                 <version>2.5.1</version>
             </dependency>
-            <dependency>
+            <!--dependency>
                 <groupId>org.jmock</groupId>
                 <artifactId>jmock-junit3</artifactId>
                 <version>2.5.1</version>
@@ -579,7 +584,7 @@
                 <groupId>net.sourceforge.findbugs</groupId>
                 <artifactId>annotations</artifactId>
                 <version>1.3.2</version>
-            </dependency>
+            </dependency-->
         </dependencies>
     </dependencyManagement>
 
@@ -690,11 +695,11 @@
                     <artifactId>maven-surefire-report-plugin</artifactId>
                     <version>2.6</version>
                 </plugin>
-                <plugin>
+                <!--plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>findbugs-maven-plugin</artifactId>
                     <version>2.3.1</version>
-                </plugin>
+                </plugin-->
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>buildnumber-maven-plugin</artifactId>
@@ -760,11 +765,11 @@
                         </dependency>
                     </dependencies>
                 </plugin>
-                <plugin>
+                <!--plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>taglist-maven-plugin</artifactId>
                     <version>2.4</version>
-                </plugin>
+                </plugin-->
                 <!--plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>ianal-maven-plugin</artifactId>
@@ -885,17 +890,17 @@
                         </execution>
                     </executions>
                 </plugin>
-                <plugin>
+                <!--plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>findbugs-maven-plugin</artifactId>
                     <version>2.3.1</version>
-                </plugin>
+                </plugin-->
                 <!-- Newer versions of plugin will cause PDF build failures -->
-                <plugin>
+                <!--plugin>
                     <groupId>com.agilejava.docbkx</groupId>
                     <artifactId>docbkx-maven-plugin</artifactId>
                     <version>2.0.13</version>
-                </plugin>
+                </plugin-->
                 
                 <!-- Ignore/Execute plugin execution -->
                 <plugin>