diff --git a/cache-ehcache/pom.xml b/cache-ehcache/pom.xml
index 952317a8da..4ceb6721ba 100644
--- a/cache-ehcache/pom.xml
+++ b/cache-ehcache/pom.xml
@@ -3,26 +3,26 @@
         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>
         <groupId>org.hibernate</groupId>
-        <artifactId>hibernate-code</artifactId>
-        <version>3.3.0.beta1</version>
-        <relativePath>../pom.xml</relativePath>
+        <artifactId>hibernate-core-parent</artifactId>
+        <version>1</version>
     </parent>
-
+    
     <groupId>org.hibernate</groupId>
     <artifactId>hibernate-ehcache</artifactId>
-    <packaging>jar</packaging>
+    <version>3.3.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
 
-    <name>Hibernate Ehcache integration</name>
+    <name>Hibernate Ehcache Integration</name>
     <description>Integration of Hibernate with Ehcache</description>
 
     <dependencies>
         <dependency>
             <groupId>${groupId}</groupId>
-            <artifactId>hibernate-core</artifactId>
-            <version>${hibernate.core.version}</version>
+            <artifactId>hibernate-core</artifactId>
+            <version>${version}</version>
         </dependency>
         <dependency>
             <groupId>net.sf.ehcache</groupId>
@@ -31,4 +31,4 @@
         </dependency>
     </dependencies>
 
-</project>
+</project>
diff --git a/cache-jbosscache/pom.xml b/cache-jbosscache/pom.xml
index 24631cb66c..17ea3a204a 100644
--- a/cache-jbosscache/pom.xml
+++ b/cache-jbosscache/pom.xml
@@ -3,26 +3,26 @@
         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>
         <groupId>org.hibernate</groupId>
-        <artifactId>hibernate-code</artifactId>
-        <version>3.3.0.beta1</version>
-        <relativePath>../pom.xml</relativePath>
+        <artifactId>hibernate-core-parent</artifactId>
+        <version>1</version>
     </parent>
-
+    
     <groupId>org.hibernate</groupId>
     <artifactId>hibernate-jbosscache</artifactId>
-    <packaging>jar</packaging>
+    <version>3.3.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
 
-    <name>Hibernate JBossCache integration</name>
+    <name>Hibernate JBossCache Integration</name>
     <description>Integration of Hibernate with JBossCache (based on JBossCache1.x APIs)</description>
 
     <dependencies>
         <dependency>
             <groupId>${groupId}</groupId>
-            <artifactId>hibernate-core</artifactId>
-            <version>${hibernate.core.version}</version>
+            <artifactId>hibernate-core</artifactId>
+            <version>${version}</version>
         </dependency>
         <dependency>
             <groupId>jboss</groupId>
@@ -62,4 +62,4 @@
         </dependency>
     </dependencies>
 
-</project>
+</project>
diff --git a/cache-jbosscache2/pom.xml b/cache-jbosscache2/pom.xml
index 6bccb9a6ea..919f91e4ba 100644
--- a/cache-jbosscache2/pom.xml
+++ b/cache-jbosscache2/pom.xml
@@ -3,31 +3,31 @@
         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>
         <groupId>org.hibernate</groupId>
-        <artifactId>hibernate-code</artifactId>
-        <version>3.3.0.beta1</version>
-        <relativePath>../pom.xml</relativePath>
+        <artifactId>hibernate-core-parent</artifactId>
+        <version>1</version>
     </parent>
-
+    
     <groupId>org.hibernate</groupId>
     <artifactId>hibernate-jbosscache2</artifactId>
-    <packaging>jar</packaging>
+    <version>3.3.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
 
-    <name>Hibernate JBossCache2.x integration</name>
+    <name>Hibernate JBossCache2.x Integration</name>
     <description>Integration of Hibernate with JBossCache (based on JBossCache2.x APIs)</description>
 
     <dependencies>
         <dependency>
             <groupId>${groupId}</groupId>
-            <artifactId>hibernate-core</artifactId>
-            <version>${hibernate.core.version}</version>
+            <artifactId>hibernate-core</artifactId>
+            <version>${version}</version>
         </dependency>
         <dependency>
             <groupId>jboss</groupId>
             <artifactId>jboss-cache</artifactId>
-            <!-- does not work with idea plugin :(
+            <!-- I'd prefer this, at least until we get a GA...
             <version>[2.0.0.BETA2,)</version>
             -->
             <version>2.0.0.BETA2</version>
@@ -36,16 +36,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-idea-plugin</artifactId>
-                <configuration>
-                    <jdkName>1.5</jdkName>
-                    <jdkLevel>5.0</jdkLevel>
-                    <!-- why this isnt the default I have no clue -->
-                    <linkModules>true</linkModules>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -57,4 +47,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
diff --git a/cache-oscache/pom.xml b/cache-oscache/pom.xml
index 53d6a949d6..1fcc5a6fb0 100644
--- a/cache-oscache/pom.xml
+++ b/cache-oscache/pom.xml
@@ -3,26 +3,26 @@
         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>
         <groupId>org.hibernate</groupId>
-        <artifactId>hibernate-code</artifactId>
-        <version>3.3.0.beta1</version>
-        <relativePath>../pom.xml</relativePath>
+        <artifactId>hibernate-core-parent</artifactId>
+        <version>1</version>
     </parent>
-
+    
     <groupId>org.hibernate</groupId>
     <artifactId>hibernate-oscache</artifactId>
-    <packaging>jar</packaging>
+    <version>3.3.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
 
-    <name>Hibernate OSCache integration</name>
+    <name>Hibernate OSCache Integration</name>
     <description>Integration of Hibernate with OSCache</description>
 
     <dependencies>
         <dependency>
             <groupId>${groupId}</groupId>
-            <artifactId>hibernate-core</artifactId>
-            <version>${hibernate.core.version}</version>
+            <artifactId>hibernate-core</artifactId>
+            <version>${version}</version>
         </dependency>
         <dependency>
             <groupId>opensymphony</groupId>
@@ -31,4 +31,4 @@
         </dependency>
     </dependencies>
 
-</project>
+</project>
diff --git a/cache-swarmcache/pom.xml b/cache-swarmcache/pom.xml
index e20ebcb469..d612f86f26 100644
--- a/cache-swarmcache/pom.xml
+++ b/cache-swarmcache/pom.xml
@@ -3,26 +3,26 @@
         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>
         <groupId>org.hibernate</groupId>
-        <artifactId>hibernate-code</artifactId>
-        <version>3.3.0.beta1</version>
-        <relativePath>../pom.xml</relativePath>
+        <artifactId>hibernate-core-parent</artifactId>
+        <version>1</version>
     </parent>
-
+    
     <groupId>org.hibernate</groupId>
     <artifactId>hibernate-swarmcache</artifactId>
-    <packaging>jar</packaging>
+    <version>3.3.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
 
-    <name>Hibernate SwarmCache integration</name>
+    <name>Hibernate SwarmCache Integration</name>
     <description>Integration of Hibernate with SwarmCache</description>
 
     <dependencies>
         <dependency>
             <groupId>${groupId}</groupId>
-            <artifactId>hibernate-core</artifactId>
-            <version>${hibernate.core.version}</version>
+            <artifactId>hibernate-core</artifactId>
+            <version>${version}</version>
         </dependency>
         <dependency>
             <groupId>swarmcache</groupId>
@@ -31,4 +31,4 @@
         </dependency>
     </dependencies>
 
-</project>
+</project>
diff --git a/connection-c3p0/pom.xml b/connection-c3p0/pom.xml
index 0a59572ca1..67d36ff233 100644
--- a/connection-c3p0/pom.xml
+++ b/connection-c3p0/pom.xml
@@ -3,17 +3,17 @@
         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>
         <groupId>org.hibernate</groupId>
-        <artifactId>hibernate-code</artifactId>
-        <version>3.3.0.beta1</version>
-        <relativePath>../pom.xml</relativePath>
+        <artifactId>hibernate-core-parent</artifactId>
+        <version>1</version>
     </parent>
-
+    
     <groupId>org.hibernate</groupId>
     <artifactId>hibernate-c3p0</artifactId>
-    <packaging>jar</packaging>
+    <version>3.3.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
 
     <name>Hibernate C3P0 ConnectionProvider</name>
     <description>C3P0-based implementation of the Hibernate ConnectionProvder contract</description>
@@ -21,8 +21,8 @@
     <dependencies>
         <dependency>
             <groupId>${groupId}</groupId>
-            <artifactId>hibernate-core</artifactId>
-            <version>${hibernate.core.version}</version>
+            <artifactId>hibernate-core</artifactId>
+            <version>${version}</version>
         </dependency>
         <dependency>
             <groupId>c3p0</groupId>
@@ -31,4 +31,4 @@
         </dependency>
     </dependencies>
 
-</project>
+</project>
diff --git a/connection-proxool/pom.xml b/connection-proxool/pom.xml
index 0daf469af2..9c5355d034 100644
--- a/connection-proxool/pom.xml
+++ b/connection-proxool/pom.xml
@@ -3,17 +3,17 @@
         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>
         <groupId>org.hibernate</groupId>
-        <artifactId>hibernate-code</artifactId>
-        <version>3.3.0.beta1</version>
-        <relativePath>../pom.xml</relativePath>
+        <artifactId>hibernate-core-parent</artifactId>
+        <version>1</version>
     </parent>
-
+    
     <groupId>org.hibernate</groupId>
     <artifactId>hibernate-proxool</artifactId>
-    <packaging>jar</packaging>
+    <version>3.3.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
 
     <name>Hibernate Proxool ConnectionProvider</name>
     <description>Proxool-based implementation of the Hibernate ConnectionProvder contract</description>
@@ -21,8 +21,8 @@
     <dependencies>
         <dependency>
             <groupId>${groupId}</groupId>
-            <artifactId>hibernate-core</artifactId>
-            <version>${hibernate.core.version}</version>
+            <artifactId>hibernate-core</artifactId>
+            <version>${version}</version>
         </dependency>
         <dependency>
             <groupId>proxool</groupId>
@@ -31,4 +31,4 @@
         </dependency>
     </dependencies>
 
-</project>
+</project>
diff --git a/core/pom.xml b/core/pom.xml
index ccf07a2cfc..d0f9c32ae4 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -2,17 +2,17 @@
         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>
-        <groupId>org.hibernate</groupId>
-        <artifactId>hibernate-code</artifactId>
-        <version>3.3.0.beta1</version>
-        <relativePath>../pom.xml</relativePath>
+    <modelVersion>4.0.0</modelVersion>
+    
+    <parent>
+        <groupId>org.hibernate</groupId>
+        <artifactId>hibernate-core-parent</artifactId>
+        <version>1</version>
     </parent>
 
     <groupId>org.hibernate</groupId>
     <artifactId>hibernate-core</artifactId>
+    <version>3.3.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>Hibernate Core</name>
@@ -32,7 +32,6 @@
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
-            <version>1.0.4</version>
         </dependency>
         <dependency>
             <groupId>dom4j</groupId>
diff --git a/documentation/manual/en-US/pom.xml b/documentation/manual/en-US/pom.xml
index 154387eb27..a1e6c075c0 100644
--- a/documentation/manual/en-US/pom.xml
+++ b/documentation/manual/en-US/pom.xml
@@ -3,60 +3,20 @@
         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>
         <groupId>org.hibernate</groupId>
-        <artifactId>hibernate-manual</artifactId>
-        <version>3.3.0.beta1</version>
-        <relativePath>../pom.xml</relativePath>
+        <artifactId>hibernate-manual-parent</artifactId>
+        <version>1</version>
     </parent>
-
+    
+    <groupId>org.hibernate</groupId>
     <artifactId>hibernate-manual-${translation}</artifactId>
-    <packaging>docbook</packaging>
-    <name>Hibernate Manual (${translation})</name>
+    <version>3.3.0-SNAPSHOT</version>
+    <packaging>jdocbook</packaging>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.jboss.maven.plugins</groupId>
-                <artifactId>maven-jboss-docbook-plugin</artifactId>
-                <version>2.0-SNAPSHOT</version>
-                <extensions>true</extensions>
-                <dependencies>
-                    <dependency>
-                        <groupId>com.redhat</groupId>
-                        <artifactId>docbook-xslt</artifactId>
-                        <version>0.1</version>
-                    </dependency>
-                </dependencies>
-                <configuration>
-                    <sourceDocumentName>master.xml</sourceDocumentName>
-                    <formats>
-                        <format>
-                            <formatName>pdf</formatName>
-                            <stylesheetResource>/standard/fopdf.xsl</stylesheetResource>
-                            <finalName>Hibernate_Reference.pdf</finalName>
-                        </format>
-                        <format>
-                            <formatName>eclipse</formatName>
-                        </format>
-                        <format>
-                            <formatName>html</formatName>
-                            <stylesheetResource>/standard/html.xsl</stylesheetResource>
-                            <finalName>index.html</finalName>
-                        </format>
-                    </formats>
-                    <options>
-                        <xincludeSupported>true</xincludeSupported>
-                        <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>
-                    </options>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+    <name>Hibernate Manual (${translation})</name>
+    <description>The Hibernate reference manual (${translation})</description>
 
     <properties>
         <translation>en-US</translation>
diff --git a/documentation/manual/es-ES/pom.xml b/documentation/manual/es-ES/pom.xml
index 1b53f5021b..f739031f79 100644
--- a/documentation/manual/es-ES/pom.xml
+++ b/documentation/manual/es-ES/pom.xml
@@ -3,17 +3,20 @@
         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>
         <groupId>org.hibernate</groupId>
-        <artifactId>hibernate-manual</artifactId>
-        <version>3.3.0.beta1</version>
-        <relativePath>../pom.xml</relativePath>
+        <artifactId>hibernate-manual-parent</artifactId>
+        <version>1</version>
     </parent>
-
+    
+    <groupId>org.hibernate</groupId>
     <artifactId>hibernate-manual-${translation}</artifactId>
-    <packaging>pom</packaging>
+    <version>3.3.0-SNAPSHOT</version>
+    <packaging>jdocbook</packaging>
+    
     <name>Hibernate Manual (${translation})</name>
+    <description>The Hibernate reference manual (${translation})</description>
 
     <properties>
         <translation>es-ES</translation>
diff --git a/documentation/manual/fr-FR/pom.xml b/documentation/manual/fr-FR/pom.xml
index f0926d82ed..9bc2988778 100644
--- a/documentation/manual/fr-FR/pom.xml
+++ b/documentation/manual/fr-FR/pom.xml
@@ -3,19 +3,23 @@
         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>
         <groupId>org.hibernate</groupId>
-        <artifactId>hibernate-manual</artifactId>
-        <version>3.3.0.beta1</version>
-        <relativePath>../pom.xml</relativePath>
+        <artifactId>hibernate-manual-parent</artifactId>
+        <version>1</version>
     </parent>
-
+    
+    <groupId>org.hibernate</groupId>
     <artifactId>hibernate-manual-${translation}</artifactId>
-    <packaging>pom</packaging>
+    <version>3.3.0-SNAPSHOT</version>
+    <packaging>jdocbook</packaging>
+    
     <name>Hibernate Manual (${translation})</name>
+    <description>The Hibernate reference manual (${translation})</description>
 
     <properties>
         <translation>fr-FR</translation>
     </properties>
+
 </project>
diff --git a/documentation/manual/ja-JP/pom.xml b/documentation/manual/ja-JP/pom.xml
index fa54730671..50b1bd4662 100644
--- a/documentation/manual/ja-JP/pom.xml
+++ b/documentation/manual/ja-JP/pom.xml
@@ -3,17 +3,20 @@
         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>
         <groupId>org.hibernate</groupId>
-        <artifactId>hibernate-manual</artifactId>
-        <version>3.3.0.beta1</version>
-        <relativePath>../pom.xml</relativePath>
+        <artifactId>hibernate-manual-parent</artifactId>
+        <version>1</version>
     </parent>
-
+    
+    <groupId>org.hibernate</groupId>
     <artifactId>hibernate-manual-${translation}</artifactId>
-    <packaging>pom</packaging>
+    <version>3.3.0-SNAPSHOT</version>
+    <packaging>jdocbook</packaging>
+    
     <name>Hibernate Manual (${translation})</name>
+    <description>The Hibernate reference manual (${translation})</description>
 
     <properties>
         <translation>ja-JP</translation>
diff --git a/documentation/manual/ko-KR/pom.xml b/documentation/manual/ko-KR/pom.xml
index 2984721749..057eea0f8d 100644
--- a/documentation/manual/ko-KR/pom.xml
+++ b/documentation/manual/ko-KR/pom.xml
@@ -3,17 +3,20 @@
         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>
         <groupId>org.hibernate</groupId>
-        <artifactId>hibernate-manual</artifactId>
-        <version>3.3.0.beta1</version>
-        <relativePath>../pom.xml</relativePath>
+        <artifactId>hibernate-manual-parent</artifactId>
+        <version>1</version>
     </parent>
-
+    
+    <groupId>org.hibernate</groupId>
     <artifactId>hibernate-manual-${translation}</artifactId>
-    <packaging>pom</packaging>
+    <version>3.3.0-SNAPSHOT</version>
+    <packaging>jdocbook</packaging>
+    
     <name>Hibernate Manual (${translation})</name>
+    <description>The Hibernate reference manual (${translation})</description>
 
     <properties>
         <translation>ko-KR</translation>
diff --git a/documentation/manual/pom.xml b/documentation/manual/pom.xml
index c8f6bfdfc5..ac48e56190 100644
--- a/documentation/manual/pom.xml
+++ b/documentation/manual/pom.xml
@@ -3,86 +3,24 @@
         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>
         <groupId>org.hibernate</groupId>
-        <artifactId>hibernate-documentation</artifactId>
-        <version>3.3.0.beta1</version>
-        <relativePath>../pom.xml</relativePath>
+        <artifactId>hibernate-core-parent</artifactId>
+        <version>1</version>
     </parent>
-
+    
+    <groupId>org.hibernate</groupId>
     <artifactId>hibernate-manual</artifactId>
+    <version>3.3.0-SNAPSHOT</version>
     <packaging>pom</packaging>
-    <name>Hibernate Manual</name>
-    <description>The Hibernate reference manual</description>
+
+    <name>Hibernate Manual (aggregator)</name>
+    <description>The Hibernate reference manual (aggregator)</description>
 
     <modules>
         <module>en-US</module>
         <module>fr-FR</module>
     </modules>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.jboss.maven.plugins</groupId>
-                <artifactId>maven-jboss-docbook-plugin</artifactId>
-                <version>1.0</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.hibernate</groupId>
-                        <artifactId>hibernate-docbook-xslt</artifactId>
-                        <version>0.1</version>
-                    </dependency>
-                </dependencies>
-                <configuration>
-                    <sourceDocumentName>master.xml</sourceDocumentName>
-                    <formats>
-                        <format>
-                            <formatName>pdf</formatName>
-                            <stylesheetResource>/standard/fopdf.xsl</stylesheetResource>
-                            <finalName>hibernate_reference.pdf</finalName>
-                        </format>
-                        <format>
-                            <formatName>html</formatName>
-                            <stylesheetResource>/standard/html.xsl</stylesheetResource>
-                            <finalName>index.html</finalName>
-                        </format>
-                    </formats>
-                    <xincludeSupported>true</xincludeSupported>
-                    <options>
-                        <xincludeSupported>true</xincludeSupported>
-                        <xmlTransformerType>saxon</xmlTransformerType>
-                        <transformerParameters>
-                            <property>
-                                <name>custom.titlepage.img</name>
-                                <value>${basedir}/src/main/resources/shared/images/hibernate_logo_a.png</value>
-                            </property>
-                        </transformerParameters>
-                    </options>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-<!-- report plugin is currently hosed
-    <reporting>
-        <plugins>
-            <plugin>
-                <groupId>org.jboss.maven.plugin</groupId>
-                <artifactId>jboss-docbook-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </reporting>
--->
-    <properties>
-        <masterTranslation>en-US</masterTranslation>
-    </properties>
-
 </project>
diff --git a/documentation/manual/pt-BR/pom.xml b/documentation/manual/pt-BR/pom.xml
index 570e1d1d24..2f277e6cfd 100644
--- a/documentation/manual/pt-BR/pom.xml
+++ b/documentation/manual/pt-BR/pom.xml
@@ -3,17 +3,20 @@
         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>
         <groupId>org.hibernate</groupId>
-        <artifactId>hibernate-manual</artifactId>
-        <version>3.3.0.beta1</version>
-        <relativePath>.../pom.xml</relativePath>
+        <artifactId>hibernate-manual-parent</artifactId>
+        <version>1</version>
     </parent>
-
+    
+    <groupId>org.hibernate</groupId>
     <artifactId>hibernate-manual-${translation}</artifactId>
-    <packaging>pom</packaging>
+    <version>3.3.0-SNAPSHOT</version>
+    <packaging>jdocbook</packaging>
+    
     <name>Hibernate Manual (${translation})</name>
+    <description>The Hibernate reference manual (${translation})</description>
 
     <properties>
         <translation>pt-BR</translation>
diff --git a/documentation/manual/zh-CN/pom.xml b/documentation/manual/zh-CN/pom.xml
index 7f120800c0..7093ab462a 100644
--- a/documentation/manual/zh-CN/pom.xml
+++ b/documentation/manual/zh-CN/pom.xml
@@ -3,17 +3,20 @@
         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>
         <groupId>org.hibernate</groupId>
-        <artifactId>hibernate-manual</artifactId>
-        <version>3.3.0.beta1</version>
-        <relativePath>../pom.xml</relativePath>
+        <artifactId>hibernate-manual-parent</artifactId>
+        <version>1</version>
     </parent>
-
+    
+    <groupId>org.hibernate</groupId>
     <artifactId>hibernate-manual-${translation}</artifactId>
-    <packaging>pom</packaging>
+    <version>3.3.0-SNAPSHOT</version>
+    <packaging>jdocbook</packaging>
+    
     <name>Hibernate Manual (${translation})</name>
+    <description>The Hibernate reference manual (${translation})</description>
 
     <properties>
         <translation>zh-CN</translation>
diff --git a/documentation/pom.xml b/documentation/pom.xml
index 5530327015..99633cc1e1 100644
--- a/documentation/pom.xml
+++ b/documentation/pom.xml
@@ -3,18 +3,19 @@
         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>
         <groupId>org.hibernate</groupId>
-        <artifactId>hibernate-parent</artifactId>
-        <version>3.3.0.beta1</version>
-        <relativePath>../pom.xml</relativePath>
+        <artifactId>hibernate-core-parent</artifactId>
+        <version>1</version>
     </parent>
-
+    
+    <groupId>org.hibernate</groupId>
     <artifactId>hibernate-documentation</artifactId>
+    <version>3.3.0-SNAPSHOT</version>
     <packaging>pom</packaging>
-
-    <name>Hibernate Core - Documentation</name>
+
+    <name>Hibernate Core - Documentation</name>
     <description>Grouping of Hibernate Core Project documentation modules</description>
 
     <modules>
diff --git a/documentation/tutorial/pom.xml b/documentation/tutorial/pom.xml
index ef8db1ebeb..2d42a2d841 100644
--- a/documentation/tutorial/pom.xml
+++ b/documentation/tutorial/pom.xml
@@ -3,17 +3,18 @@
         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>
         <groupId>org.hibernate</groupId>
-        <artifactId>hibernate-documentation</artifactId>
-        <version>3.3.0.beta1</version>
-        <relativePath>../pom.xml</relativePath>
+        <artifactId>hibernate-core-parent</artifactId>
+        <version>1</version>
     </parent>
-
+    
     <groupId>org.hibernate</groupId>
     <artifactId>hibernate-tutorial</artifactId>
+    <version>3.3.0-SNAPSHOT</version>
     <packaging>war</packaging>
+
     <name>Hibernate Tutorial</name>
     <description>A tutorial project showcasing Hibernate usage</description>
 
@@ -21,7 +22,7 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-core</artifactId>
-            <version>${hibernate.core.version}</version>
+            <version>${version}</version>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
diff --git a/eg/pom.xml b/eg/pom.xml
index 6a684b537b..b467f356bc 100644
--- a/eg/pom.xml
+++ b/eg/pom.xml
@@ -5,16 +5,16 @@
     <modelVersion>4.0.0</modelVersion>
 
     <!-- todo : this module should eventually make its way over to documentation/tutorial -->
-
+    
     <parent>
         <groupId>org.hibernate</groupId>
-        <artifactId>hibernate-code</artifactId>
-        <version>3.3.0.beta1</version>
-        <relativePath>../pom.xml</relativePath>
+        <artifactId>hibernate-core-parent</artifactId>
+        <version>1</version>
     </parent>
-
+    
     <groupId>org.hibernate</groupId>
     <artifactId>hibernate-eg</artifactId>
+    <version>3.3.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>Hibernate Example</name>
@@ -24,7 +24,7 @@
         <dependency>
             <groupId>${groupId}</groupId>
             <artifactId>hibernate-core</artifactId>
-            <version>${hibernate.core.version}</version>
+            <version>${version}</version>
         </dependency>
     </dependencies>
 
diff --git a/jmx/pom.xml b/jmx/pom.xml
index d782d131de..53252071c6 100644
--- a/jmx/pom.xml
+++ b/jmx/pom.xml
@@ -3,27 +3,31 @@
         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>
         <groupId>org.hibernate</groupId>
-        <artifactId>hibernate-code</artifactId>
-        <version>3.3.0.beta1</version>
-        <relativePath>../pom.xml</relativePath>
+        <artifactId>hibernate-core-parent</artifactId>
+        <version>1</version>
     </parent>
-
+    
     <groupId>org.hibernate</groupId>
     <artifactId>hibernate-jmx</artifactId>
-    <packaging>jar</packaging>
+    <version>3.3.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
 
     <name>Hibernate JMX Module</name>
-    <description>Defines Hibernate JMX functionality</description>
+    <description>Defines Hibernate JMX capabilities</description>
 
     <dependencies>
         <dependency>
             <groupId>${groupId}</groupId>
-            <artifactId>hibernate-core</artifactId>
-            <version>${hibernate.core.version}</version>
+            <artifactId>hibernate-core</artifactId>
+            <version>${version}</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
         </dependency>
     </dependencies>
 
-</project>
+</project>
diff --git a/testing/pom.xml b/testing/pom.xml
index cd82774242..2cd2702546 100644
--- a/testing/pom.xml
+++ b/testing/pom.xml
@@ -3,17 +3,17 @@
         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>
         <groupId>org.hibernate</groupId>
-        <artifactId>hibernate-code</artifactId>
-        <version>3.3.0.beta1</version>
-        <relativePath>../pom.xml</relativePath>
+        <artifactId>hibernate-core-parent</artifactId>
+        <version>1</version>
     </parent>
-
+    
     <groupId>org.hibernate</groupId>
     <artifactId>hibernate-testing</artifactId>
-    <packaging>jar</packaging>
+    <version>3.3.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
 
     <name>Hibernate Testing</name>
     <description>Hibernate JUnit test utilities</description>
@@ -21,16 +21,15 @@
     <dependencies>
         <dependency>
             <groupId>${groupId}</groupId>
-            <artifactId>hibernate-core</artifactId>
-            <version>${hibernate.core.version}</version>
+            <artifactId>hibernate-core</artifactId>
+            <version>${version}</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>3.8.1</version>
             <!-- here we need to pull JUnit deps into compile scope... -->
             <scope>compile</scope>
         </dependency>
     </dependencies>
 
-</project>
+</project>
diff --git a/testsuite/pom.xml b/testsuite/pom.xml
index e3b0aab517..b2fc94d981 100644
--- a/testsuite/pom.xml
+++ b/testsuite/pom.xml
@@ -3,76 +3,80 @@
         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>
         <groupId>org.hibernate</groupId>
-        <artifactId>hibernate-code</artifactId>
-        <version>3.3.0.beta1</version>
-        <relativePath>../pom.xml</relativePath>
+        <artifactId>hibernate-core-parent</artifactId>
+        <version>1</version>
     </parent>
-
+    
     <groupId>org.hibernate</groupId>
     <artifactId>hibernate-testsuite</artifactId>
-    <packaging>jar</packaging>
+    <version>3.3.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
 
     <name>Hibernate Testsuite</name>
     <description>The testsuite of Hibernate functionality</description>
 
     <dependencies>
         <dependency>
-            <groupId>${groupId}</groupId>
-            <artifactId>hibernate-core</artifactId>
-            <version>${hibernate.core.version}</version>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
         </dependency>
         <dependency>
-            <groupId>${groupId}</groupId>
-            <artifactId>hibernate-testing</artifactId>
-            <version>${hibernate.core.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${groupId}</groupId>
-            <artifactId>hibernate-ehcache</artifactId>
-            <version>${hibernate.core.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${groupId}</groupId>
-            <artifactId>hibernate-jbosscache</artifactId>
-            <version>${hibernate.core.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${groupId}</groupId>
-            <artifactId>hibernate-oscache</artifactId>
-            <version>${hibernate.core.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${groupId}</groupId>
-            <artifactId>hibernate-swarmcache</artifactId>
-            <version>${hibernate.core.version}</version>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
         </dependency>
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
-            <version>1.2.11</version>
+        </dependency>
+        <dependency>
+            <groupId>${groupId}</groupId>
+            <artifactId>hibernate-core</artifactId>
+            <version>${version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${groupId}</groupId>
+            <artifactId>hibernate-testing</artifactId>
+            <version>${version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${groupId}</groupId>
+            <artifactId>hibernate-ehcache</artifactId>
+            <version>${version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${groupId}</groupId>
+            <artifactId>hibernate-jbosscache</artifactId>
+            <version>${version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${groupId}</groupId>
+            <artifactId>hibernate-oscache</artifactId>
+            <version>${version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${groupId}</groupId>
+            <artifactId>hibernate-swarmcache</artifactId>
+            <version>${version}</version>
         </dependency>
         <!-- these are optional on core... :( -->
         <dependency>
             <groupId>javassist</groupId>
             <artifactId>javassist</artifactId>
             <version>3.4.GA</version>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>cglib</groupId>
             <artifactId>cglib</artifactId>
             <version>2.1_3</version>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>asm</groupId>
             <artifactId>asm-attrs</artifactId>
             <version>1.5.3</version>
-            <optional>true</optional>
-        </dependency>
+        </dependency>
         <!-- optional dom4j dependency; needed here for dom4j (de)serialization -->
         <dependency>
             <groupId>jaxen</groupId>
@@ -95,7 +99,20 @@
                 <directory>src/test/resources</directory>
             </testResource>
         </testResources>
+
         <plugins>
+            <plugin>
+                <groupId>org.jboss.maven.plugins</groupId>
+                <artifactId>maven-test-ext-plugin</artifactId>
+                <version>1.0.3</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>extend</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -111,28 +128,9 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>hsqldb</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <build>
-                <testResources>
-                    <testResource>
-                        <filtering>false</filtering>
-                        <directory>src/test/profile/hsqldb</directory>
-                    </testResource>
-                </testResources>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>hsqldb</groupId>
-                    <artifactId>hsqldb</artifactId>
-                    <version>1.8.0.2</version>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
+    <properties>
+        <test.extender.cfg>${basedir}/src/test/profile/hsqldb/hsqldb-env.xml</test.extender.cfg>
+	<test.extender.env>hsqldb</test.extender.env>
+    </properties>
 
-</project>
+</project>