diff --git a/project.xml b/project.xml
index b3da0dd871..759869a958 100644
--- a/project.xml
+++ b/project.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
  * ========================================================================
  * 
@@ -19,7 +18,6 @@
  * 
  * ========================================================================
 -->
-
 <project>
   <pomVersion>3</pomVersion>
   <groupId>acegisecurity</groupId>
@@ -35,17 +33,14 @@
   <inceptionYear>2004</inceptionYear>
   <logo>http://acegisecurity.sourceforge.net/logo.gif</logo>
   <url>http://acegisecurity.sourceforge.net/</url>
-
   <siteAddress>shell.sourceforge.net</siteAddress>
   <siteDirectory>/home/groups/a/ac/acegisecurity/htdocs</siteDirectory>
   <distributionSite>shell.sourceforge.net</distributionSite>
   <distributionDirectory>/home/groups/a/ac/acegisecurity/htdocs/maven</distributionDirectory>
-
   <repository>
     <developerConnection>scm:cvs:ext:${maven.username}@cvs.sourceforge.net:/cvsroot/acegisecurity:acegisecurity</developerConnection>
     <url>http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/acegisecurity/acegisecurity/</url>
   </repository>
-
   <mailingLists>
     <mailingList>
       <name>Acegi Developer List</name>
@@ -65,17 +60,12 @@
       <archive>http://sourceforge.net/mailarchive/forum.php?forum_id=30287</archive>
     </mailingList>
   </mailingLists>
-
   <developers>
     <developer>
       <name>Ben Alex</name>
       <id>benalex</id>
       <email>benalex at users.sourceforge.net</email>
       <organization>Acegi Technology Pty Limited (http://www.acegi.com.au)</organization>
-      <roles>
-        <role>Original developer</role>
-        <role>Project leader</role>
-      </roles>
     </developer>
     <developer>
       <name>Francois Beausoleil</name>
@@ -91,9 +81,6 @@
       <name>Carlos Sanchez</name>
       <id>carlossg</id>
       <email>carlossg at users.sourceforge.net</email>
-      <roles>
-        <role>Maven support</role>
-      </roles>
       <timezone>+1</timezone>
     </developer>
     <developer>
@@ -107,59 +94,33 @@
       <email>raykrueger at users.sourceforge.net</email>
     </developer>
   </developers>
-
   <contributors>
     <contributor>
       <name>Cameron Braid</name>
       <id>CameronBraid</id>
-      <roles>
-        <role>Commons Attributes configuration support</role>
-      </roles>
     </contributor>
     <contributor>
       <name>Patrick Burleson</name>
-      <roles>
-        <role>weblogic support</role>
-      </roles>
     </contributor>
     <contributor>
       <name>Wesley Hall</name>
-      <roles>
-        <role>Authentication exception handling</role>
-      </roles>
     </contributor>
     <contributor>
       <name>Scott Evans</name>
-      <roles>
-        <role>Taglib improvements</role>
-      </roles>
     </contributor>
     <contributor>
       <name>Travis Gregg</name>
-      <roles>
-        <role>Fix to EH-CACHE usage after web context refresh</role>
-      </roles>
     </contributor>
     <contributor>
       <name>Karel Miarka</name>
-      <roles>
-        <role>Fix for EH-CACHE NPEs, additional event handling for DaoAuthenticationProvider, and the PasswordAuthenticationProvider-related (including LDAP DAO) classes</role>
-      </roles>
     </contributor>
     <contributor>
       <name>James Monaghan</name>
-      <roles>
-        <role>ContextPropagatingRemoteInvocation support classes</role>
-      </roles>
     </contributor>
     <contributor>
       <name>Andrew Petro</name>
-      <roles>
-        <role>Documentation</role>
-      </roles>
     </contributor>
   </contributors>
-
   <dependencies>
     <dependency>
       <groupId>ehcache</groupId>
@@ -175,6 +136,7 @@
       <groupId>aopalliance</groupId>
       <artifactId>aopalliance</artifactId>
       <version>1.0</version>
+      <type>jar</type>
       <url>http://aopalliance.sourceforge.net</url>
       <properties>
         <war.bundle>true</war.bundle>
@@ -184,6 +146,7 @@
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
       <version>1.2</version>
+      <type>jar</type>
       <url>http://jakarta.apache.org/commons</url>
       <properties>
         <war.bundle>true</war.bundle>
@@ -192,7 +155,8 @@
     <dependency>
       <groupId>commons-collections</groupId>
       <artifactId>commons-collections</artifactId>
-      <version>3.0</version>
+      <version>3.1</version>
+      <type>jar</type>
       <url>http://jakarta.apache.org/commons</url>
       <properties>
         <war.bundle>true</war.bundle>
@@ -202,6 +166,7 @@
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
       <version>1.0</version>
+      <type>jar</type>
       <url>http://jakarta.apache.org/commons</url>
       <properties>
         <war.bundle>true</war.bundle>
@@ -211,6 +176,7 @@
       <groupId>jstl</groupId>
       <artifactId>jstl</artifactId>
       <version>1.0.2</version>
+      <type>jar</type>
       <properties>
         <war.bundle>true</war.bundle>
       </properties>
@@ -219,11 +185,13 @@
       <groupId>servletapi</groupId>
       <artifactId>servletapi</artifactId>
       <version>2.3</version>
+      <type>jar</type>
     </dependency>
     <dependency>
       <groupId>oro</groupId>
       <artifactId>oro</artifactId>
       <version>2.0.7</version>
+      <type>jar</type>
       <url>http://jakarta.apache.org/oro/</url>
       <properties>
         <war.bundle>true</war.bundle>
@@ -233,6 +201,7 @@
       <groupId>hsqldb</groupId>
       <artifactId>hsqldb</artifactId>
       <version>1.7.2-rc6c</version>
+      <type>jar</type>
       <url>http://hsqldb.sourceforge.net/</url>
       <properties>
         <war.bundle>true</war.bundle>
@@ -242,6 +211,7 @@
       <groupId>springframework</groupId>
       <artifactId>spring-core</artifactId>
       <version>1.1.2</version>
+      <type>jar</type>
       <url>http://www.springframework.org</url>
       <properties>
         <war.bundle>true</war.bundle>
@@ -251,6 +221,7 @@
       <groupId>springframework</groupId>
       <artifactId>spring-dao</artifactId>
       <version>1.1.2</version>
+      <type>jar</type>
       <url>http://www.springframework.org</url>
       <properties>
         <war.bundle>true</war.bundle>
@@ -260,6 +231,7 @@
       <groupId>springframework</groupId>
       <artifactId>spring-orm</artifactId>
       <version>1.1.2</version>
+      <type>jar</type>
       <url>http://www.springframework.org</url>
       <properties>
         <war.bundle>true</war.bundle>
@@ -269,6 +241,7 @@
       <groupId>springframework</groupId>
       <artifactId>spring-context</artifactId>
       <version>1.1.2</version>
+      <type>jar</type>
       <url>http://www.springframework.org</url>
       <properties>
         <war.bundle>true</war.bundle>
@@ -278,6 +251,7 @@
       <groupId>springframework</groupId>
       <artifactId>spring-aop</artifactId>
       <version>1.1.2</version>
+      <type>jar</type>
       <url>http://www.springframework.org</url>
       <properties>
         <war.bundle>true</war.bundle>
@@ -287,6 +261,7 @@
       <groupId>springframework</groupId>
       <artifactId>spring-web</artifactId>
       <version>1.1.2</version>
+      <type>jar</type>
       <url>http://www.springframework.org</url>
       <properties>
         <war.bundle>true</war.bundle>
@@ -296,12 +271,14 @@
       <groupId>springframework</groupId>
       <artifactId>spring-mock</artifactId>
       <version>1.1.2</version>
+      <type>jar</type>
       <url>http://www.springframework.org</url>
     </dependency>
     <dependency>
       <groupId>commons-attributes</groupId>
       <artifactId>commons-attributes-api</artifactId>
       <version>2.1</version>
+      <type>jar</type>
       <url>http://jakarta.apache.org/commons</url>
       <properties>
         <war.bundle>true</war.bundle>
@@ -311,12 +288,14 @@
       <groupId>commons-attributes</groupId>
       <artifactId>commons-attributes-compiler</artifactId>
       <version>2.1</version>
+      <type>jar</type>
       <url>http://jakarta.apache.org/commons</url>
     </dependency>
     <dependency>
       <groupId>taglibs</groupId>
       <artifactId>standard</artifactId>
       <version>1.0.4</version>
+      <type>jar</type>
       <url>http://jakarta.apache.org/taglibs/</url>
       <properties>
         <war.bundle>true</war.bundle>
@@ -326,6 +305,7 @@
       <groupId>cas</groupId>
       <artifactId>casclient</artifactId>
       <version>2.0.11</version>
+      <type>jar</type>
       <url>http://www.yale.edu/tp/cas</url>
       <properties>
         <war.bundle>true</war.bundle>
@@ -335,6 +315,7 @@
       <groupId>aspectj</groupId>
       <artifactId>aspectjrt</artifactId>
       <version>1.2</version>
+      <type>jar</type>
       <url>http://www.eclipse.org/aspectj</url>
       <properties>
         <war.bundle>true</war.bundle>
@@ -380,6 +361,7 @@
         <includes>
           <include>notice.txt</include>
         </includes>
+        <filtering>false</filtering>
       </resource>
       <resource>
         <directory>${basedir}/src/main/resources</directory>
@@ -404,11 +386,9 @@
     <report>maven-pmd-plugin</report>
     <report>maven-simian-plugin</report>
     <report>maven-tasklist-plugin</report>
-
     <report>maven-findbugs-plugin</report>
     <report>maven-statcvs-plugin</report>
   </reports>
-  
   <versions>
     <version>
       <id>0.3</id>
@@ -441,6 +421,5 @@
       <tag>release_0_6_1</tag>
     </version>
   </versions>
-
 </project>