diff --git a/adapters/cas/pom.xml b/adapters/cas/pom.xml
index 38c2d66cbc..f2bb0bec65 100644
--- a/adapters/cas/pom.xml
+++ b/adapters/cas/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.acegisecurity</groupId>
     <artifactId>acegi-security-adapters</artifactId>
-    <version>1.1-SNAPSHOT</version>
+    <version>1.0.4-SNAPSHOT</version>
   </parent>
   <artifactId>acegi-security-cas</artifactId>
   <name>Acegi Security System for Spring - CAS adapter</name>
diff --git a/adapters/catalina/pom.xml b/adapters/catalina/pom.xml
index fe4f6f9e92..b97d4a0359 100644
--- a/adapters/catalina/pom.xml
+++ b/adapters/catalina/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.acegisecurity</groupId>
     <artifactId>acegi-security-adapters</artifactId>
-    <version>1.1-SNAPSHOT</version>
+    <version>1.0.4-SNAPSHOT</version>
   </parent>
   <artifactId>acegi-security-catalina</artifactId>
   <name>Acegi Security System for Spring - Catalina adapter</name>
diff --git a/adapters/jboss/pom.xml b/adapters/jboss/pom.xml
index 6f33c1ab49..e643c6722e 100644
--- a/adapters/jboss/pom.xml
+++ b/adapters/jboss/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.acegisecurity</groupId>
     <artifactId>acegi-security-adapters</artifactId>
-    <version>1.1-SNAPSHOT</version>
+    <version>1.0.4-SNAPSHOT</version>
   </parent>
   <artifactId>acegi-security-jboss</artifactId>
   <name>Acegi Security System for Spring - JBoss adapter</name>
diff --git a/adapters/jetty/pom.xml b/adapters/jetty/pom.xml
index 9908fa07d9..2d1ca6800d 100644
--- a/adapters/jetty/pom.xml
+++ b/adapters/jetty/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.acegisecurity</groupId>
     <artifactId>acegi-security-adapters</artifactId>
-    <version>1.1-SNAPSHOT</version>
+    <version>1.0.4-SNAPSHOT</version>
   </parent>
   <artifactId>acegi-security-jetty</artifactId>
   <name>Acegi Security System for Spring - Jetty adapter</name>
diff --git a/adapters/pom.xml b/adapters/pom.xml
index 008eb8278b..eedae38f48 100644
--- a/adapters/pom.xml
+++ b/adapters/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.acegisecurity</groupId>
     <artifactId>acegi-security-parent</artifactId>
-    <version>1.1-SNAPSHOT</version>
+    <version>1.0.4-SNAPSHOT</version>
   </parent>
   <artifactId>acegi-security-adapters</artifactId>
   <name>Acegi Security System for Spring - Adapters</name>
diff --git a/adapters/resin/pom.xml b/adapters/resin/pom.xml
index e1777b34c4..812b434537 100644
--- a/adapters/resin/pom.xml
+++ b/adapters/resin/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.acegisecurity</groupId>
     <artifactId>acegi-security-adapters</artifactId>
-    <version>1.1-SNAPSHOT</version>
+    <version>1.0.4-SNAPSHOT</version>
   </parent>
   <artifactId>acegi-security-resin</artifactId>
   <name>Acegi Security System for Spring - Resin adapter</name>
diff --git a/core-tiger/pom.xml b/core-tiger/pom.xml
index 7e08a6afb2..b9dd9c2d43 100644
--- a/core-tiger/pom.xml
+++ b/core-tiger/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.acegisecurity</groupId>
     <artifactId>acegi-security-parent</artifactId>
-    <version>1.1-SNAPSHOT</version>
+    <version>1.0.4-SNAPSHOT</version>
   </parent>
   <artifactId>acegi-security-tiger</artifactId>
   <name>Acegi Security System for Spring - Java 5 (Tiger)</name>
diff --git a/core/pom.xml b/core/pom.xml
index 837d0f2e05..ab1273e5eb 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.acegisecurity</groupId>
 		<artifactId>acegi-security-parent</artifactId>
-		<version>1.1-SNAPSHOT</version>
+		<version>1.0.4-SNAPSHOT</version>
 	</parent>
 	<packaging>jar</packaging>
 	<artifactId>acegi-security</artifactId>
diff --git a/doc/pom.xml b/doc/pom.xml
index 906ff7572c..2937fe4fa3 100644
--- a/doc/pom.xml
+++ b/doc/pom.xml
@@ -6,9 +6,11 @@
   <parent>
     <groupId>org.acegisecurity</groupId>
     <artifactId>acegi-security-parent</artifactId>
-    <version>1.1-SNAPSHOT</version>
+    <version>1.0.4-SNAPSHOT</version>
   </parent>
   <artifactId>acegi-security-doc</artifactId>
+  <name>Acegi Security System for Spring - Documentation</name>
+  <packaging>pom</packaging>
 
   <!-- repeated here to avoid appending the artifactId -->
   <scm>
@@ -19,14 +21,14 @@
 
   <dependencies>
   </dependencies>
-
 <!--
+	There is an unresolved bug in the Maven DocBook support; see http://jira.codehaus.org/browse/MOJO-775 (BPA 23-May-07)
   <build>
     <plugins>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>docbook-maven-plugin</artifactId>
-        <version>1.0.0-alpha-2-SNAPSHOT</version>
+        <version>1.0.0-alpha-1</version>
         <configuration>
           <sourceDirectory>${basedir}/docbook</sourceDirectory>
         </configuration>
@@ -41,5 +43,6 @@
       </plugin>
     </plugins>
   </build>
--->
+  -->
+
 </project>
diff --git a/pom.xml b/pom.xml
index bb70191e5c..3be5f769bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.acegisecurity</groupId>
 	<artifactId>acegi-security-parent</artifactId>
-	<version>1.1-SNAPSHOT</version>
+	<version>1.0.4-SNAPSHOT</version>
 	<name>Acegi Security System for Spring - Parent</name>
 	<packaging>pom</packaging>
 
@@ -12,11 +12,13 @@
 		<module>core</module>
 		<module>core-tiger</module>
 		<module>adapters</module>
+		<module>samples</module>
+		<module>doc</module>
 	</modules>
 
 	<description>Acegi Security System for Spring</description>
 	<organization>
-		<name>Acegi Technology Pty Limited</name>
+		<name>Interface21, Inc</name>
 		<url>http://sourceforge.net/projects/acegisecurity</url>
 		<!--<logo>http://sourceforge.net/sflogo.php?group_id=104215&amp;type=5</logo>-->
 	</organization>
@@ -44,12 +46,10 @@
 		</url>
 	</scm>
 
-	<!--
-		<issueManagement>
-		<system>bugzilla</system>
-		<url>http://jira.codehaus.org/browse/MNG</url>
-		</issueManagement>
-	-->
+	<issueManagement>
+		<system>jira</system>
+		<url>http://opensource.atlassian.com/projects/spring/browse/SEC</url>
+	</issueManagement>
 
 	<distributionManagement>
 		<repository>
@@ -118,18 +118,6 @@
 				</otherArchive>
 			</otherArchives>
 		</mailingList>
-
-		<mailingList>
-			<name>Spring User List</name>
-			<!--
-				<subscribe>https://lists.sourceforge.net/lists/listinfo/acegisecurity-developer</subscribe>
-				<unsubscribe>users-unsubscribe@maven.apache.org</unsubscribe>
-				<post>users@maven.apache.org</post>
-			-->
-			<archive>
-				http://sourceforge.net/mailarchive/forum.php?forum_id=30287
-			</archive>
-		</mailingList>
 	</mailingLists>
 
 	<developers>
@@ -257,28 +245,18 @@
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>1.5</source>
-					<target>1.5</target>
-				</configuration>
+				<artifactId>maven-help-plugin</artifactId>
+				<version>2.0.1</version>
 			</plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-clean-plugin</artifactId>
+                <version>2.1.1</version>
+            </plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<executions>
-					<execution>
-						<goals>
-							<goal>test-jar</goal>
-						</goals>
-						<phase>package</phase>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-				<version>2.0</version>
+				<artifactId>maven-resources-plugin</artifactId>
+				<version>2.2</version>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -303,11 +281,78 @@
 					</systemProperties>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.3</source>
+					<target>1.3</target>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<version>2.1</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>test-jar</goal>
+						</goals>
+						<phase>package</phase>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
+				<version>2.0.3</version>
+				<configuration>
+					<attach>true</attach>
+				</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<!-- Other -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-war-plugin</artifactId>
+				<version>2.0.2</version>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<version>2.1</version>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-install-plugin</artifactId>
+				<version>2.2</version>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<version>2.3</version>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-release-plugin</artifactId>
+				<version>2.0-beta-5</version>
+				<configuration>
+					<tagBase>
+						https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/tags
+					</tagBase>
+				</configuration>
+			</plugin>
 			<!-- IDE -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-eclipse-plugin</artifactId>
-				<version>2.2</version>
+				<version>2.3</version>
 				<configuration>
 					<downloadSources>true</downloadSources>
 					<wtpversion>1.0</wtpversion>
@@ -325,14 +370,11 @@
 					</dependenciesAsLibraries>
 				</configuration>
 			</plugin>
-
+			<!-- Site -->
 			<plugin>
-				<artifactId>maven-release-plugin</artifactId>
-				<configuration>
-					<tagBase>
-						https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/tags
-					</tagBase>
-				</configuration>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-site-plugin</artifactId>
+				<version>2.0-beta-5</version>
 			</plugin>
 		</plugins>
 	</build>
diff --git a/samples/acegifier/pom.xml b/samples/acegifier/pom.xml
index b562f7105d..efd9492ec2 100644
--- a/samples/acegifier/pom.xml
+++ b/samples/acegifier/pom.xml
@@ -8,7 +8,7 @@
  <parent>
    <groupId>org.acegisecurity</groupId>
    <artifactId>acegi-security-samples</artifactId>
-   <version>1.1-SNAPSHOT</version>
+   <version>1.0.4-SNAPSHOT</version>
  </parent>
  <dependencies>
    <dependency>
diff --git a/samples/annotations/pom.xml b/samples/annotations/pom.xml
index f4466399dd..a17d2ca1e7 100644
--- a/samples/annotations/pom.xml
+++ b/samples/annotations/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.acegisecurity</groupId>
     <artifactId>acegi-security-samples</artifactId>
-    <version>1.1-SNAPSHOT</version>
+    <version>1.0.4-SNAPSHOT</version>
   </parent>
   <artifactId>acegi-security-sample-annotations</artifactId>
   <name>Acegi Security System for Spring - Annotations sample</name>
diff --git a/samples/attributes/pom.xml b/samples/attributes/pom.xml
index b514279b47..14b5955e79 100644
--- a/samples/attributes/pom.xml
+++ b/samples/attributes/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.acegisecurity</groupId>
     <artifactId>acegi-security-samples</artifactId>
-    <version>1.1-SNAPSHOT</version>
+    <version>1.0.4-SNAPSHOT</version>
   </parent>
   <artifactId>acegi-security-sample-attributes</artifactId>
   <name>Acegi Security System for Spring - Attributes sample</name>
diff --git a/samples/contacts-tiger/pom.xml b/samples/contacts-tiger/pom.xml
index dd1b4fc553..95da6ba311 100644
--- a/samples/contacts-tiger/pom.xml
+++ b/samples/contacts-tiger/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.acegisecurity</groupId>
     <artifactId>acegi-security-samples</artifactId>
-    <version>1.1-SNAPSHOT</version>
+    <version>1.0.4-SNAPSHOT</version>
   </parent>
   <artifactId>acegi-security-sample-contacts-tiger</artifactId>
   <name>Acegi Security System for Spring - Contacts sample</name>
diff --git a/samples/contacts/pom.xml b/samples/contacts/pom.xml
index a0952d8c36..d01e748995 100644
--- a/samples/contacts/pom.xml
+++ b/samples/contacts/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.acegisecurity</groupId>
     <artifactId>acegi-security-samples</artifactId>
-    <version>1.1-SNAPSHOT</version>
+    <version>1.0.4-SNAPSHOT</version>
   </parent>
   <artifactId>acegi-security-sample-contacts</artifactId>
   <name>Acegi Security System for Spring - Contacts sample</name>
diff --git a/samples/dms/pom.xml b/samples/dms/pom.xml
index ad76620714..4ec027d0ac 100644
--- a/samples/dms/pom.xml
+++ b/samples/dms/pom.xml
@@ -6,7 +6,7 @@
  <parent>
    <groupId>org.acegisecurity</groupId>
    <artifactId>acegi-security-samples</artifactId>
-   <version>1.1-SNAPSHOT</version>
+   <version>1.0.4-SNAPSHOT</version>
  </parent>
  <artifactId>acegi-security-sample-dms</artifactId>
  <name>Acegi Security System for Spring - dms sample</name>
diff --git a/samples/pom.xml b/samples/pom.xml
index 228eccc54a..e97a304bc5 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -1,16 +1,15 @@
 <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/maven-v4_0_0.xsd">
  <modelVersion>4.0.0</modelVersion>
- <groupId>org.acegisecurity</groupId>
- <artifactId>acegi-security-samples</artifactId>
- <packaging>pom</packaging>
- <version>1.1-SNAPSHOT</version>
- <name>acegi-security-samples</name>
  <parent>
    <groupId>org.acegisecurity</groupId>
    <artifactId>acegi-security-parent</artifactId>
-   <version>1.1-SNAPSHOT</version>
+   <version>1.0.4-SNAPSHOT</version>
  </parent>
+ <groupId>org.acegisecurity</groupId>
+ <artifactId>acegi-security-samples</artifactId>
+ <packaging>pom</packaging>
+ <name>acegi-security-samples</name>
  <modules>
 <!--
    <module>acegifier</module>
diff --git a/samples/tutorial/pom.xml b/samples/tutorial/pom.xml
index 33f4da2346..52370b051c 100644
--- a/samples/tutorial/pom.xml
+++ b/samples/tutorial/pom.xml
@@ -2,15 +2,15 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.acegisecurity</groupId>
+		<artifactId>acegi-security-samples</artifactId>
+		<version>1.0.4-SNAPSHOT</version>
+	</parent>
 	<groupId>org.acegisecurity</groupId>
 	<artifactId>acegi-security-samples-tutorial</artifactId>
 	<packaging>war</packaging>
 	<name>acegi-security-samples-tutorial</name>
-	<parent>
-		<groupId>org.acegisecurity</groupId>
-		<artifactId>acegi-security-samples</artifactId>
-		<version>1.1-SNAPSHOT</version>
-	</parent>
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -20,7 +20,7 @@
 		<dependency>
 			<groupId>org.acegisecurity</groupId>
 			<artifactId>acegi-security</artifactId>
-			<version>1.1-SNAPSHOT</version>
+			<version>1.0.4-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sf.ehcache</groupId>
diff --git a/sandbox/openid/pom.xml b/sandbox/openid/pom.xml
index 1edfd3117f..252a3b720b 100644
--- a/sandbox/openid/pom.xml
+++ b/sandbox/openid/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.acegisecurity</groupId>
         <artifactId>acegi-security-sandbox</artifactId>
-        <version>1.0.2</version>
+        <version>1.0.4-SNAPSHOT</version>
     </parent>
     <artifactId>acegi-security-openid</artifactId>
     <name>Acegi Security System for Spring - OpenID support</name>
diff --git a/sandbox/other/pom.xml b/sandbox/other/pom.xml
index 086b8890ed..69e41f9ea9 100644
--- a/sandbox/other/pom.xml
+++ b/sandbox/other/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.acegisecurity</groupId>
     <artifactId>acegi-security-sandbox</artifactId>
-    <version>1.1-SNAPSHOT</version>
+    <version>1.0.4-SNAPSHOT</version>
   </parent>
   <artifactId>acegi-security-sandbox-other</artifactId>
   <name>Acegi Security System for Spring - Sandbox other</name>
diff --git a/sandbox/pom.xml b/sandbox/pom.xml
index 7d37f589ea..bc4526b1c9 100644
--- a/sandbox/pom.xml
+++ b/sandbox/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.acegisecurity</groupId>
     <artifactId>acegi-security-parent</artifactId>
-    <version>1.1-SNAPSHOT</version>
+    <version>1.0.4-SNAPSHOT</version>
   </parent>
   <artifactId>acegi-security-sandbox</artifactId>
   <name>Acegi Security System for Spring - Sandbox</name>
diff --git a/sandbox/webwork/pom.xml b/sandbox/webwork/pom.xml
index e864c19bc2..85522743f6 100644
--- a/sandbox/webwork/pom.xml
+++ b/sandbox/webwork/pom.xml
@@ -3,12 +3,12 @@
   <parent>
     <groupId>org.acegisecurity</groupId>
     <artifactId>acegi-security-sandbox</artifactId>
-    <version>1.0.2</version>
+    <version>1.0.4-SNAPSHOT</version>
   </parent>
   <artifactId>acegi-security-webwork</artifactId>
   <name>Acegi Security System for Spring - Webwork support</name>
   <description>Acegi Security System for Spring - Support for WebWork 2</description>
-  <version>0.2-SNAPSHOT</version>
+  <version>0.3-SNAPSHOT</version>
 
   <scm>
     <connection>scm:svn:https://svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity/sandbox/webwork</connection>