diff --git a/adapters/cas/project.xml b/adapters/cas/project.xml
index 81f1d9f2e6..a725c69e99 100644
--- a/adapters/cas/project.xml
+++ b/adapters/cas/project.xml
@@ -1,15 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project>
-    <extend>${basedir}/../project.xml</extend>
-    <artifactId>acegi-security-cas</artifactId>
-    <name>Acegi Security System for Spring - CAS adapter</name>
-    <dependencies>
-        <dependency>
-            <groupId>cas</groupId>
-            <artifactId>cas</artifactId>
-            <version>2.0.12</version>
-            <type>jar</type>
-            <url>http://www.yale.edu/tp/cas</url>
-            <properties/>
-        </dependency>
-    </dependencies>
+  <extend>${basedir}/../project.xml</extend>
+  <pomVersion>1</pomVersion>
+  <artifactId>acegi-security-cas</artifactId>
+  <name>Acegi Security System for Spring - CAS adapter</name>
+  <groupId>acegi-security-cas</groupId>
+  <repository>
+    <connection>scm:cvs:pserver:anonymous@cvs.sourceforge.net:/cvsroot/acegisecurity:acegisecurity</connection>
+    <developerConnection>scm:cvs:ext:${maven.username}@cvs.sourceforge.net:/cvsroot/acegisecurity:acegisecurity</developerConnection>
+    <url>http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/acegisecurity/acegisecurity/adapters/cas/</url>
+  </repository>
+  <dependencies>
+    <dependency>
+      <groupId>cas</groupId>
+      <artifactId>cas</artifactId>
+      <version>2.0.12</version>
+      <type>jar</type>
+      <url>http://www.yale.edu/tp/cas</url>
+    </dependency>
+  </dependencies>
 </project>
+
diff --git a/adapters/catalina/project.xml b/adapters/catalina/project.xml
index 048bb92dc0..fc2283aac5 100644
--- a/adapters/catalina/project.xml
+++ b/adapters/catalina/project.xml
@@ -1,14 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project>
-    <extend>${basedir}/../project.xml</extend>
-    <artifactId>acegi-security-catalina</artifactId>
-    <name>Acegi Security System for Spring - Catalina adapter</name>
-    <dependencies>
-        <dependency>
-            <groupId>tomcat</groupId>
-            <artifactId>catalina</artifactId>
-            <version>4.1.9</version>
-            <type>jar</type>
-            <properties/>
-        </dependency>
-    </dependencies>
+  <extend>${basedir}/../project.xml</extend>
+  <pomVersion>1</pomVersion>
+  <artifactId>acegi-security-catalina</artifactId>
+  <name>Acegi Security System for Spring - Catalina adapter</name>
+  <groupId>acegi-security-catalina</groupId>
+  <repository>
+    <connection>scm:cvs:pserver:anonymous@cvs.sourceforge.net:/cvsroot/acegisecurity:acegisecurity</connection>
+    <developerConnection>scm:cvs:ext:${maven.username}@cvs.sourceforge.net:/cvsroot/acegisecurity:acegisecurity</developerConnection>
+    <url>http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/acegisecurity/acegisecurity/adapters/catalina/</url>
+  </repository>
+  <dependencies>
+    <dependency>
+      <groupId>tomcat</groupId>
+      <artifactId>catalina</artifactId>
+      <version>4.1.9</version>
+      <type>jar</type>
+    </dependency>
+  </dependencies>
 </project>
+
diff --git a/adapters/jboss/project.xml b/adapters/jboss/project.xml
index 3d228c0842..72d08a59f3 100644
--- a/adapters/jboss/project.xml
+++ b/adapters/jboss/project.xml
@@ -1,30 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project>
-    <extend>${basedir}/../project.xml</extend>
-    <artifactId>acegi-security-jboss</artifactId>
-    <name>Acegi Security System for Spring - JBoss adapter</name>
-    <dependencies>
-        <dependency>
-            <groupId>jboss</groupId>
-            <artifactId>jboss-jmx</artifactId>
-            <version>3.2.1</version>
-            <type>jar</type>
-            <properties/>
-        </dependency>
-        <dependency>
-            <groupId>jboss</groupId>
-            <artifactId>jboss-common</artifactId>
-            <version>3.2.3</version>
-            <type>jar</type>
-            <properties/>
-        </dependency>
-        <dependency>
-            <groupId>jboss</groupId>
-            <artifactId>jbosssx</artifactId>
-            <version>3.2.3</version>
-            <type>jar</type>
-            <properties/>
-        </dependency>
-    </dependencies>
+  <extend>${basedir}/../project.xml</extend>
+  <pomVersion>1</pomVersion>
+  <artifactId>acegi-security-jboss</artifactId>
+  <name>Acegi Security System for Spring - JBoss adapter</name>
+  <groupId>acegi-security-jboss</groupId>
+  <repository>
+    <connection>scm:cvs:pserver:anonymous@cvs.sourceforge.net:/cvsroot/acegisecurity:acegisecurity</connection>
+    <developerConnection>scm:cvs:ext:${maven.username}@cvs.sourceforge.net:/cvsroot/acegisecurity:acegisecurity</developerConnection>
+    <url>http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/acegisecurity/acegisecurity/adapters/jboss/</url>
+  </repository>
+  <dependencies>
+    <dependency>
+      <groupId>jboss</groupId>
+      <artifactId>jboss-jmx</artifactId>
+      <version>3.2.1</version>
+      <type>jar</type>
+    </dependency>
+    <dependency>
+      <groupId>jboss</groupId>
+      <artifactId>jboss-common</artifactId>
+      <version>3.2.3</version>
+      <type>jar</type>
+    </dependency>
+    <dependency>
+      <groupId>jboss</groupId>
+      <artifactId>jbosssx</artifactId>
+      <version>3.2.3</version>
+      <type>jar</type>
+    </dependency>
+  </dependencies>
   <build>
     <unitTest>
       <includes>
@@ -42,3 +47,4 @@
     </unitTest>
   </build>
 </project>
+
diff --git a/adapters/jetty/project.xml b/adapters/jetty/project.xml
index b5b080a935..f19a814782 100644
--- a/adapters/jetty/project.xml
+++ b/adapters/jetty/project.xml
@@ -1,14 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project>
-    <extend>${basedir}/../project.xml</extend>
-    <artifactId>acegi-security-jetty</artifactId>
-    <name>Acegi Security System for Spring - Jetty adapter</name>
-    <dependencies>
-        <dependency>
-            <groupId>jetty</groupId>
-            <artifactId>org.mortbay.jetty</artifactId>
-            <version>4.2.20</version>
-        </dependency>
-    </dependencies>
+  <extend>${basedir}/../project.xml</extend>
+  <pomVersion>1</pomVersion>
+  <artifactId>acegi-security-jetty</artifactId>
+  <name>Acegi Security System for Spring - Jetty adapter</name>
+  <groupId>acegi-security-jetty</groupId>
+  <repository>
+    <connection>scm:cvs:pserver:anonymous@cvs.sourceforge.net:/cvsroot/acegisecurity:acegisecurity</connection>
+    <developerConnection>scm:cvs:ext:${maven.username}@cvs.sourceforge.net:/cvsroot/acegisecurity:acegisecurity</developerConnection>
+    <url>http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/acegisecurity/acegisecurity/adapters/jetty/</url>
+  </repository>
+  <dependencies>
+    <dependency>
+      <groupId>jetty</groupId>
+      <artifactId>org.mortbay.jetty</artifactId>
+      <version>4.2.22</version>
+      <type>jar</type>
+    </dependency>
+  </dependencies>
   <build>
     <unitTest>
       <includes>
@@ -26,3 +35,4 @@
     </unitTest>
   </build>
 </project>
+
diff --git a/adapters/project.xml b/adapters/project.xml
index 38cd412c4d..fb50aa0ff4 100644
--- a/adapters/project.xml
+++ b/adapters/project.xml
@@ -1,15 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project>
-    <extend>${basedir}/../project.xml</extend>
-    <dependencies>
-        <dependency>
-            <groupId>acegisecurity</groupId>
-            <artifactId>acegi-security</artifactId>
-            <version>0.7-SNAPSHOT</version>
-            <url>http://acegisecurity.sourceforge.net</url>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-    </dependencies>
+  <extend>${basedir}/../project.xml</extend>
+  <pomVersion>3</pomVersion>
+  <artifactId>null</artifactId>
+  <groupId>null</groupId>
+  <repository>
+    <connection>scm:cvs:pserver:anonymous@cvs.sourceforge.net:/cvsroot/acegisecurity:acegisecurity</connection>
+    <developerConnection>scm:cvs:ext:${maven.username}@cvs.sourceforge.net:/cvsroot/acegisecurity:acegisecurity</developerConnection>
+    <url>http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/acegisecurity/acegisecurity/adapters/</url>
+  </repository>
+  <dependencies>
+    <dependency>
+      <groupId>acegisecurity</groupId>
+      <artifactId>acegi-security</artifactId>
+      <version>0.7-SNAPSHOT</version>
+      <url>http://acegisecurity.sourceforge.net</url>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+  </dependencies>
 </project>
+
diff --git a/adapters/resin/project.xml b/adapters/resin/project.xml
index c53bb31636..3b62898b07 100644
--- a/adapters/resin/project.xml
+++ b/adapters/resin/project.xml
@@ -1,19 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project>
-    <extend>${basedir}/../project.xml</extend>
-    <artifactId>acegi-security-resin</artifactId>
-    <name>Acegi Security System for Spring - Resin adapter</name>
-    <dependencies>
-        <dependency>
-            <groupId>resin</groupId>
-            <artifactId>resin</artifactId>
-            <version>3.0.9</version>
-        </dependency>
-        <dependency>
-            <groupId>retroweaver</groupId>
-            <artifactId>retroweaver</artifactId>
-            <version>1.0fcs</version>
-        </dependency>
-    </dependencies>
+  <extend>${basedir}/../project.xml</extend>
+  <pomVersion>1</pomVersion>
+  <artifactId>acegi-security-resin</artifactId>
+  <name>Acegi Security System for Spring - Resin adapter</name>
+  <groupId>acegi-security-resin</groupId>
+  <repository>
+    <connection>scm:cvs:pserver:anonymous@cvs.sourceforge.net:/cvsroot/acegisecurity:acegisecurity</connection>
+    <developerConnection>scm:cvs:ext:${maven.username}@cvs.sourceforge.net:/cvsroot/acegisecurity:acegisecurity</developerConnection>
+    <url>http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/acegisecurity/acegisecurity/adapters/resin/</url>
+  </repository>
+  <dependencies>
+    <dependency>
+      <groupId>resin</groupId>
+      <artifactId>resin</artifactId>
+      <version>3.0.9</version>
+      <type>jar</type>
+    </dependency>
+    <dependency>
+      <groupId>retroweaver</groupId>
+      <artifactId>retroweaver</artifactId>
+      <version>1.0fcs</version>
+      <type>jar</type>
+    </dependency>
+  </dependencies>
   <build>
     <unitTest>
       <includes>
@@ -31,3 +41,4 @@
     </unitTest>
   </build>
 </project>
+
diff --git a/core/project.xml b/core/project.xml
index 621485c3aa..1d3dffbd3b 100644
--- a/core/project.xml
+++ b/core/project.xml
@@ -1,16 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project>
-    <extend>${basedir}/../project.xml</extend>
-    <artifactId>acegi-security</artifactId>
-    <name>Acegi Security System for Spring</name>
-    <build>
-	    <resources>
-	      <resource>
-	        <directory>${basedir}/src/main/resources/net/sf/acegisecurity/taglibs</directory>
-	        <targetPath>META-INF</targetPath>
-	        <includes>
-	          <include>*.tld</include>
-	        </includes>
-	      </resource>
-	    </resources>
-    </build>
+  <extend>${basedir}/../project.xml</extend>
+  <pomVersion>3</pomVersion>
+  <artifactId>acegi-security</artifactId>
+  <name>Acegi Security System for Spring</name>
+  <groupId>acegi-security</groupId>
+  <repository>
+    <connection>scm:cvs:pserver:anonymous@cvs.sourceforge.net:/cvsroot/acegisecurity:acegisecurity</connection>
+    <developerConnection>scm:cvs:ext:${maven.username}@cvs.sourceforge.net:/cvsroot/acegisecurity:acegisecurity</developerConnection>
+    <url>http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/acegisecurity/acegisecurity/core/</url>
+  </repository>
+  <build>
+    <resources>
+      <resource>
+        <directory>${basedir}/src/main/resources/net/sf/acegisecurity/taglibs</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>*.tld</include>
+        </includes>
+        <filtering>false</filtering>
+      </resource>
+    </resources>
+  </build>
 </project>
+
diff --git a/samples/attributes/project.xml b/samples/attributes/project.xml
index 31e1ce86bf..55c6e4b8bd 100644
--- a/samples/attributes/project.xml
+++ b/samples/attributes/project.xml
@@ -1,27 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project>
-    <extend>${basedir}/../project.xml</extend>
-    <artifactId>acegi-security-sample-attributes</artifactId>
-    <name>Acegi Security System for Spring - Attributes sample</name>
-    <dependencies>
-        <dependency>
-            <groupId>commons-attributes</groupId>
-            <artifactId>commons-attributes-compiler</artifactId>
-            <version>2.1</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-attributes</groupId>
-            <artifactId>commons-attributes-api</artifactId>
-            <version>2.1</version>
-        </dependency>
-        <dependency>
-            <groupId>xjavadoc</groupId>
-            <artifactId>xjavadoc</artifactId>
-            <version>1.0</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-            <version>3.1</version>
-        </dependency>
-    </dependencies>
+  <extend>${basedir}/../project.xml</extend>
+  <pomVersion>3</pomVersion>
+  <artifactId>acegi-security-sample-attributes</artifactId>
+  <name>Acegi Security System for Spring - Attributes sample</name>
+  <groupId>acegi-security-sample-attributes</groupId>
+  <repository>
+    <connection>scm:cvs:pserver:anonymous@cvs.sourceforge.net:/cvsroot/acegisecurity:acegisecurity</connection>
+    <developerConnection>scm:cvs:ext:${maven.username}@cvs.sourceforge.net:/cvsroot/acegisecurity:acegisecurity</developerConnection>
+    <url>http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/acegisecurity/acegisecurity/samples/attributes/</url>
+  </repository>
+  <dependencies>
+    <dependency>
+      <groupId>xjavadoc</groupId>
+      <artifactId>xjavadoc</artifactId>
+      <version>1.0</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+      <version>3.1</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-attributes</groupId>
+      <artifactId>commons-attributes-compiler</artifactId>
+      <version>2.1</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-attributes</groupId>
+      <artifactId>commons-attributes-api</artifactId>
+      <version>2.1</version>
+    </dependency>
+  </dependencies>
 </project>
+
diff --git a/samples/contacts/project.xml b/samples/contacts/project.xml
index e4a3bad9d1..32b793be32 100644
--- a/samples/contacts/project.xml
+++ b/samples/contacts/project.xml
@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project>
   <extend>${basedir}/../project.xml</extend>
-  <pomVersion>1</pomVersion>
+  <pomVersion>3</pomVersion>
   <artifactId>acegi-security-sample-contacts</artifactId>
   <name>Acegi Security System for Spring - Contacts sample</name>
   <groupId>acegi-security-sample-contacts</groupId>
+  <repository>
+    <connection>scm:cvs:pserver:anonymous@cvs.sourceforge.net:/cvsroot/acegisecurity:acegisecurity</connection>
+    <developerConnection>scm:cvs:ext:${maven.username}@cvs.sourceforge.net:/cvsroot/acegisecurity:acegisecurity</developerConnection>
+    <url>http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/acegisecurity/acegisecurity/samples/contacts/</url>
+  </repository>
   <dependencies>
     <dependency>
       <groupId>hessian</groupId>
@@ -26,16 +31,6 @@
         <war.bundle>true</war.bundle>
       </properties>
     </dependency>
-    <dependency>
-      <groupId>springframework</groupId>
-      <artifactId>spring-webmvc</artifactId>
-      <version>1.1.2</version>
-      <type>jar</type>
-      <url>http://www.springframework.org</url>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
   </dependencies>
 </project>
 
diff --git a/samples/project.xml b/samples/project.xml
index 087316b56e..e761c5e295 100644
--- a/samples/project.xml
+++ b/samples/project.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project>
   <extend>${basedir}/../project.xml</extend>
+  <pomVersion>3</pomVersion>
+  <repository>
+    <connection>scm:cvs:pserver:anonymous@cvs.sourceforge.net:/cvsroot/acegisecurity:acegisecurity</connection>
+    <developerConnection>scm:cvs:ext:${maven.username}@cvs.sourceforge.net:/cvsroot/acegisecurity:acegisecurity</developerConnection>
+    <url>http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/acegisecurity/acegisecurity/samples/</url>
+  </repository>
   <dependencies>
     <dependency>
       <groupId>acegisecurity</groupId>