--- bval-jsr303/pom.xml	2012-04-09 22:00:36.000000000 +0200
+++ bval-jsr303/pom.xml-gil	2012-05-15 15:18:27.514644106 +0200
@@ -65,8 +65,8 @@
             </activation>
             <dependencies>
                 <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-validation_1.0_spec</artifactId>
+                    <groupId>org.hibernate.javax.persistence</groupId>
+                    <artifactId>hibernate-jpa-2.0-api</artifactId>
                     <!-- allow users to choose an API provider -->
                     <scope>provided</scope>
                 </dependency>
@@ -144,8 +144,8 @@
             <optional>true</optional>
         </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>
             <!-- allow users to choose an API provider -->
             <scope>provided</scope>
             <optional>true</optional>
@@ -179,19 +179,22 @@
 
         <plugins>
             <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.apache.bval.jsr303.xml</packageName>
                     <extension>true</extension>
+                    <schemaDirectory>src/main/xsd</schemaDirectory>
+                    <bindingDirectory>src/main/xjb</bindingDirectory>
+                    <generatePackage>org.apache.bval.jsr303.xml</generatePackage>
+                    <generateDirectory>${basedir}/target/generated-sources</generateDirectory>
                 </configuration>
             </plugin>