diff --git a/annotations/pom.xml b/annotations/pom.xml
index bc75bf9b91..b70422b963 100644
--- a/annotations/pom.xml
+++ b/annotations/pom.xml
@@ -1,11 +1,37 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" 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">
+<?xml version="1.0"?>
+<!--
+  ~ Hibernate, Relational Persistence for Idiomatic Java
+  ~
+  ~ Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
+  ~ indicated by the @author tags or express copyright attribution
+  ~ statements applied by the authors.  All third-party contributions are
+  ~ distributed under license by Red Hat Middleware LLC.
+  ~
+  ~ This copyrighted material is made available to anyone wishing to use, modify,
+  ~ copy, or redistribute it subject to the terms and conditions of the GNU
+  ~ Lesser General Public License, as published by the Free Software Foundation.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+  ~ or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+  ~ for more details.                              
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public License
+  ~ along with this distribution; if not, write to:
+  ~ Free Software Foundation, Inc.
+  ~ 51 Franklin Street, Fifth Floor
+  ~ Boston, MA  02110-1301  USA
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    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-parent</artifactId>
-        <version>3.5.0.Beta-1</version>
+        <version>3.5.0-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
@@ -216,8 +242,8 @@
                 <jdbc.driver>org.hsqldb.jdbcDriver</jdbc.driver>
                 <jdbc.url>jdbc:hsqldb:target/test/db/hsqldb/hibernate</jdbc.url>
                 <jdbc.user>sa</jdbc.user>
-                <jdbc.pass />
-                <jdbc.isolation />
+                <jdbc.pass/>
+                <jdbc.isolation/>
             </properties>
         </profile>
 
@@ -236,8 +262,8 @@
                 <jdbc.driver>org.h2.Driver</jdbc.driver>
                 <jdbc.url>jdbc:h2:mem:target/test/db/h2/hibernate</jdbc.url>
                 <jdbc.user>sa</jdbc.user>
-                <jdbc.pass />
-                <jdbc.isolation />
+                <jdbc.pass/>
+                <jdbc.isolation/>
             </properties>
         </profile>
 
@@ -265,7 +291,7 @@
                 <jdbc.url>jdbc:mysql://vmg08.mw.lab.eng.bos.redhat.com/hibbrtru</jdbc.url>
                 <jdbc.user>hibbrtru</jdbc.user>
                 <jdbc.pass>hibbrtru</jdbc.pass>
-                <jdbc.isolation />
+                <jdbc.isolation/>
             </properties>
         </profile>
 
@@ -285,7 +311,7 @@
                 <jdbc.url>jdbc:postgresql://dev01.qa.atl.jboss.com:5432:hibbrtru</jdbc.url>
                 <jdbc.user>hibbrtru</jdbc.user>
                 <jdbc.pass>hibbrtru</jdbc.pass>
-                <jdbc.isolation />
+                <jdbc.isolation/>
             </properties>
         </profile>
 
@@ -316,7 +342,7 @@
                 <jdbc.url>jdbc:db2://dev32.qa.atl.jboss.com:50000/jbossqa</jdbc.url>
                 <jdbc.user>hibbrtru</jdbc.user>
                 <jdbc.pass>hibbrtru</jdbc.pass>
-                <jdbc.isolation />
+                <jdbc.isolation/>
             </properties>
         </profile>
 
@@ -341,7 +367,7 @@
                 <jdbc.url>jdbc:db2://dev67.qa.atl.jboss.com:50000/jbossqa</jdbc.url>
                 <jdbc.user>hibbrtru</jdbc.user>
                 <jdbc.pass>hibbrtru</jdbc.pass>
-                <jdbc.isolation />
+                <jdbc.isolation/>
             </properties>
         </profile>
 
@@ -362,7 +388,7 @@
                 <jdbc.url>jdbc:oracle:thin:@dev20.qa.atl.jboss.com:1521:qa</jdbc.url>
                 <jdbc.user>hibbrtru</jdbc.user>
                 <jdbc.pass>hibbrtru</jdbc.pass>
-                <jdbc.isolation />
+                <jdbc.isolation/>
             </properties>
         </profile>
 
@@ -383,7 +409,7 @@
                 <jdbc.url>jdbc:oracle:thin:@dev01.qa.atl.jboss.com:1521:qadb01</jdbc.url>
                 <jdbc.user>hibbrtru</jdbc.user>
                 <jdbc.pass>hibbrtru</jdbc.pass>
-                <jdbc.isolation />
+                <jdbc.isolation/>
             </properties>
         </profile>
 
@@ -403,7 +429,7 @@
                 <jdbc.url>jdbc:sybase:Tds:dev77.qa.atl2.redhat.com:5000/hibbrtru</jdbc.url>
                 <jdbc.user>hibbrtru</jdbc.user>
                 <jdbc.pass>hibbrtru</jdbc.pass>
-                <jdbc.isolation />
+                <jdbc.isolation/>
             </properties>
         </profile>
 
@@ -429,4 +455,4 @@
 
     </profiles>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/cache-ehcache/pom.xml b/cache-ehcache/pom.xml
index 41905d3843..c28e6b0bbc 100644
--- a/cache-ehcache/pom.xml
+++ b/cache-ehcache/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-parent</artifactId>
-        <version>3.5.0.Beta-1</version>
+        <version>3.5.0-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     
diff --git a/cache-jbosscache/pom.xml b/cache-jbosscache/pom.xml
index 95747f1e89..bc8f5dc176 100644
--- a/cache-jbosscache/pom.xml
+++ b/cache-jbosscache/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-parent</artifactId>
-        <version>3.5.0.Beta-1</version>
+        <version>3.5.0-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     
diff --git a/cache-oscache/pom.xml b/cache-oscache/pom.xml
index 28e6ffd650..cf48a524ff 100644
--- a/cache-oscache/pom.xml
+++ b/cache-oscache/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-parent</artifactId>
-        <version>3.5.0.Beta-1</version>
+        <version>3.5.0-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     
diff --git a/cache-swarmcache/pom.xml b/cache-swarmcache/pom.xml
index 2b2856c554..afa7837a58 100644
--- a/cache-swarmcache/pom.xml
+++ b/cache-swarmcache/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-parent</artifactId>
-        <version>3.5.0.Beta-1</version>
+        <version>3.5.0-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     
diff --git a/connection-c3p0/pom.xml b/connection-c3p0/pom.xml
index d96f959362..7a31c47d6b 100644
--- a/connection-c3p0/pom.xml
+++ b/connection-c3p0/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-parent</artifactId>
-        <version>3.5.0.Beta-1</version>
+        <version>3.5.0-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     
diff --git a/connection-proxool/pom.xml b/connection-proxool/pom.xml
index b84d3e0931..2fc28633d4 100644
--- a/connection-proxool/pom.xml
+++ b/connection-proxool/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-parent</artifactId>
-        <version>3.5.0.Beta-1</version>
+        <version>3.5.0-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     
diff --git a/core/pom.xml b/core/pom.xml
index c985ccf5cc..f1696542e9 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-parent</artifactId>
-        <version>3.5.0.Beta-1</version>
+        <version>3.5.0-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
@@ -106,7 +106,7 @@
                             <targetMembers>
                             	<methodBodyReturn>
                             	    <className>org.hibernate.Version</className>
-                            	    <methodName>getVersionString</methodName>&gt;
+                            	    <methodName>getVersionString</methodName>>
                             	</methodBodyReturn>
                             </targetMembers>
                         </bytecodeInjection>
@@ -171,4 +171,4 @@
     <properties>
         <antlrPluginVersion>2.1</antlrPluginVersion>
     </properties>
-</project>
\ No newline at end of file
+</project>
diff --git a/entitymanager/pom.xml b/entitymanager/pom.xml
index 2093e13110..98eb473fa5 100644
--- a/entitymanager/pom.xml
+++ b/entitymanager/pom.xml
@@ -1,11 +1,13 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         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-parent</artifactId>
-        <version>3.5.0.Beta-1</version>
+        <version>3.5.0-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
@@ -92,12 +94,12 @@
 	            <phase>process-test-classes</phase>
 	            <configuration>
 		        	<tasks>
-	                    <property name="package.dir" value="${basedir}/target/test-packages" />
-	                    <property name="package.tmp.dir" value="${basedir}/target/tmp" />
-	                    <property name="classes.dir" value="${project.build.directory}/test-classes" />	
-                        <property name="testresources.dir" value="${basedir}/src/test/resources" />					
+	                    <property name="package.dir" value="${basedir}/target/test-packages"/>
+	                    <property name="package.tmp.dir" value="${basedir}/target/tmp"/>
+	                    <property name="classes.dir" value="${project.build.directory}/test-classes"/>	
+                        <property name="testresources.dir" value="${basedir}/src/test/resources"/>					
 	                	<ant antfile="${basedir}/build.xml">
-	                  		<target name="package" />
+	                  		<target name="package"/>
 	                	</ant>
 					</tasks>
 	            </configuration>
@@ -447,4 +449,4 @@
 
     </profiles>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/envers/pom.xml b/envers/pom.xml
index 5fa91a4a1a..608beaf404 100644
--- a/envers/pom.xml
+++ b/envers/pom.xml
@@ -1,11 +1,13 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         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-parent</artifactId>
-        <version>3.5.0.Beta-1</version>
+        <version>3.5.0-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
@@ -152,4 +154,4 @@
         <jbossenvers.reports.aggregate>true</jbossenvers.reports.aggregate>
     </properties>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/hibernate-maven-plugin/pom.xml b/hibernate-maven-plugin/pom.xml
index 850e1a1579..6236b2690a 100644
--- a/hibernate-maven-plugin/pom.xml
+++ b/hibernate-maven-plugin/pom.xml
@@ -20,14 +20,15 @@
   ~ 51 Franklin Street, Fifth Floor
   ~ Boston, MA  02110-1301  USA
   -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" 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>
         <artifactId>hibernate-parent</artifactId>
         <groupId>org.hibernate</groupId>
-        <version>3.5.0.Beta-1</version>
+        <version>3.5.0-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/jmx/pom.xml b/jmx/pom.xml
index 3a7f36b3dc..ef1544f626 100644
--- a/jmx/pom.xml
+++ b/jmx/pom.xml
@@ -1,11 +1,37 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" 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">
+<?xml version="1.0"?>
+<!--
+  ~ Hibernate, Relational Persistence for Idiomatic Java
+  ~
+  ~ Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
+  ~ indicated by the @author tags or express copyright attribution
+  ~ statements applied by the authors.  All third-party contributions are
+  ~ distributed under license by Red Hat Middleware LLC.
+  ~
+  ~ This copyrighted material is made available to anyone wishing to use, modify,
+  ~ copy, or redistribute it subject to the terms and conditions of the GNU
+  ~ Lesser General Public License, as published by the Free Software Foundation.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+  ~ or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+  ~ for more details.
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public License
+  ~ along with this distribution; if not, write to:
+  ~ Free Software Foundation, Inc.
+  ~ 51 Franklin Street, Fifth Floor
+  ~ Boston, MA  02110-1301  USA
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         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-parent</artifactId>
-        <version>3.5.0.Beta-1</version>
+        <version>3.5.0-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
@@ -23,4 +49,4 @@
             <version>${version}</version>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/parent/pom.xml b/parent/pom.xml
index 4c8cc36e85..ef7277a9f1 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1,11 +1,37 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" 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">
+<?xml version="1.0"?>
+<!--
+  ~ Hibernate, Relational Persistence for Idiomatic Java
+  ~
+  ~ Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
+  ~ indicated by the @author tags or express copyright attribution
+  ~ statements applied by the authors.  All third-party contributions are
+  ~ distributed under license by Red Hat Middleware LLC.
+  ~
+  ~ This copyrighted material is made available to anyone wishing to use, modify,
+  ~ copy, or redistribute it subject to the terms and conditions of the GNU
+  ~ Lesser General Public License, as published by the Free Software Foundation.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+  ~ or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+  ~ for more details.
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public License
+  ~ along with this distribution; if not, write to:
+  ~ Free Software Foundation, Inc.
+  ~ 51 Franklin Street, Fifth Floor
+  ~ Boston, MA  02110-1301  USA
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         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>
 
     <groupId>org.hibernate</groupId>
     <artifactId>hibernate-parent</artifactId>
     <packaging>pom</packaging>
-    <version>3.5.0.Beta-1</version>
+    <version>3.5.0-SNAPSHOT</version>
 
     <name>Hibernate Core Parent POM</name>
     <description>The base POM for all Hibernate Core modules.</description>
@@ -30,9 +56,9 @@
     </licenses>
 
     <scm>
-        <connection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.5.0.Beta-1</connection>
-        <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.5.0.Beta-1</developerConnection>
-        <url>https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.5.0.Beta-1</url>
+        <connection>scm:svn:https://svn.jboss.org/repos/hibernate/core/trunk</connection>
+        <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/trunk</developerConnection>
+        <url>https://svn.jboss.org/repos/hibernate/core/trunk</url>
     </scm>
 
     <ciManagement>
@@ -380,4 +406,4 @@
     <properties>
         <slf4jVersion>1.5.8</slf4jVersion>
     </properties>
-</project>
\ No newline at end of file
+</project>
diff --git a/testing/pom.xml b/testing/pom.xml
index 5b04aee3de..0b9916ffd7 100644
--- a/testing/pom.xml
+++ b/testing/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-parent</artifactId>
-        <version>3.5.0.Beta-1</version>
+        <version>3.5.0-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/testsuite/pom.xml b/testsuite/pom.xml
index d534443fc4..175486d62d 100644
--- a/testsuite/pom.xml
+++ b/testsuite/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-parent</artifactId>
-        <version>3.5.0.Beta-1</version>
+        <version>3.5.0-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     
diff --git a/tutorials/eg/pom.xml b/tutorials/eg/pom.xml
index 0b0e2463eb..611e4de51d 100644
--- a/tutorials/eg/pom.xml
+++ b/tutorials/eg/pom.xml
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-tutorials</artifactId>
-        <version>3.5.0.Beta-1</version>
+        <version>3.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/tutorials/pom.xml b/tutorials/pom.xml
index 585fdf35a5..64f5f9df0c 100644
--- a/tutorials/pom.xml
+++ b/tutorials/pom.xml
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-parent</artifactId>
-        <version>3.5.0.Beta-1</version>
+        <version>3.5.0-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/tutorials/web/pom.xml b/tutorials/web/pom.xml
index b25f5c3ea0..ad635b2baf 100644
--- a/tutorials/web/pom.xml
+++ b/tutorials/web/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-tutorials</artifactId>
-        <version>3.5.0.Beta-1</version>
+        <version>3.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>