--- pom.xml	2012-03-06 15:54:11.000000000 +0100
+++ pom.xml-gil	2012-04-21 16:17:13.854286040 +0200
@@ -169,19 +169,20 @@
                 </configuration>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>jaxb2-maven-plugin</artifactId>
-                <version>1.2</version>
+                <groupId>org.jvnet.jaxb2.maven2</groupId>
+                <artifactId>maven-jaxb22-plugin</artifactId>
+                <version>0.8.1</version>
                 <executions>
                     <execution>
                         <goals>
-                            <goal>xjc</goal>
+                            <goal>generate</goal>
                         </goals>
                     </execution>
                 </executions>
                 <configuration>
-                    <packageName>org.hibernate.jpamodelgen.xml.jaxb</packageName>
-                    <outputDirectory>${basedir}/target/generated-sources</outputDirectory>
+                    <schemaDirectory>src/main/xsd</schemaDirectory>
+                    <generatePackage>org.hibernate.jpamodelgen.xml.jaxb</generatePackage>
+                    <generateDirectory>${basedir}/target/generated-sources</generateDirectory>
                     <extension>true</extension>
                 </configuration>
             </plugin>
@@ -265,7 +266,7 @@
                     </descriptors>
                 </configuration>
             </plugin>
-            <plugin>
+            <!--plugin>
                 <groupId>org.jboss.maven.plugins</groupId>
                 <artifactId>maven-jdocbook-plugin</artifactId>
                 <version>2.3.5</version>
@@ -306,10 +307,10 @@
                     </formats>
                     <options>
                         <xincludeSupported>true</xincludeSupported>
-                        <xmlTransformerType>saxon</xmlTransformerType>
+                        <xmlTransformerType>saxon</xmlTransformerType-->
                         <!-- needed for uri-resolvers; can be ommitted if using 'current' uri scheme -->
                         <!--     could also locate the docbook dependency and inspect its version... -->
-                        <docbookVersion>1.72.0</docbookVersion>
+                        <!--docbookVersion>1.72.0</docbookVersion>
                         <localeSeparator>-</localeSeparator>
                     </options>
                 </configuration>
@@ -323,7 +324,7 @@
                         </goals>
                     </execution>
                 </executions>
-            </plugin>
+            </plugin-->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-deploy-plugin</artifactId>