Upgrade to Spring 1.1.2.

project.xml

@@ -7,17 +7,14 @@
   <description>Acegi Security System for Spring</description>
   <shortDescription>Acegi Security System for Spring</shortDescription>
   <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>
@@ -60,6 +57,7 @@
       <groupId>ehcache</groupId>
       <artifactId>ehcache</artifactId>
       <version>0.7</version>
+      <type>jar</type>
       <url>http://ehcache.sourceforge.net</url>
       <properties>
         <war.bundle>true</war.bundle>
@@ -69,6 +67,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>
@@ -78,6 +77,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>
@@ -87,6 +87,7 @@
       <groupId>commons-collections</groupId>
       <artifactId>commons-collections</artifactId>
       <version>3.0</version>
+      <type>jar</type>
       <url>http://jakarta.apache.org/commons</url>
       <properties>
         <war.bundle>true</war.bundle>
@@ -96,6 +97,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>
@@ -105,6 +107,7 @@
       <groupId>jstl</groupId>
       <artifactId>jstl</artifactId>
       <version>1.0.2</version>
+      <type>jar</type>
       <properties>
         <war.bundle>true</war.bundle>
       </properties>
@@ -113,11 +116,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>
@@ -127,6 +132,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>
@@ -136,7 +142,8 @@
     <dependency>
       <groupId>springframework</groupId>
       <artifactId>spring-core</artifactId>
-      <version>1.1</version>
+      <version>1.1.2</version>
+      <type>jar</type>
       <url>http://www.springframework.org</url>
       <properties>
         <war.bundle>true</war.bundle>
@@ -145,7 +152,8 @@
     <dependency>
       <groupId>springframework</groupId>
       <artifactId>spring-dao</artifactId>
-      <version>1.1</version>
+      <version>1.1.2</version>
+      <type>jar</type>
       <url>http://www.springframework.org</url>
       <properties>
         <war.bundle>true</war.bundle>
@@ -154,7 +162,8 @@
     <dependency>
       <groupId>springframework</groupId>
       <artifactId>spring-orm</artifactId>
-      <version>1.1</version>
+      <version>1.1.2</version>
+      <type>jar</type>
       <url>http://www.springframework.org</url>
       <properties>
         <war.bundle>true</war.bundle>
@@ -163,7 +172,8 @@
     <dependency>
       <groupId>springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>1.1</version>
+      <version>1.1.2</version>
+      <type>jar</type>
       <url>http://www.springframework.org</url>
       <properties>
         <war.bundle>true</war.bundle>
@@ -172,7 +182,8 @@
     <dependency>
       <groupId>springframework</groupId>
       <artifactId>spring-aop</artifactId>
-      <version>1.1</version>
+      <version>1.1.2</version>
+      <type>jar</type>
       <url>http://www.springframework.org</url>
       <properties>
         <war.bundle>true</war.bundle>
@@ -181,7 +192,8 @@
     <dependency>
       <groupId>springframework</groupId>
       <artifactId>spring-web</artifactId>
-      <version>1.1</version>
+      <version>1.1.2</version>
+      <type>jar</type>
       <url>http://www.springframework.org</url>
       <properties>
         <war.bundle>true</war.bundle>
@@ -190,13 +202,15 @@
     <dependency>
       <groupId>springframework</groupId>
       <artifactId>spring-mock</artifactId>
-      <version>1.1</version>
+      <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>
@@ -206,12 +220,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>
@@ -221,6 +237,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>
@@ -230,6 +247,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>

samples/contacts/project.xml

@@ -1,21 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project>
-    <extend>${basedir}/../project.xml</extend>
-    <artifactId>acegi-security-sample-contacts</artifactId>
-    <name>Acegi Security System for Spring - Contacts sample</name>
+  <extend>${basedir}/../project.xml</extend>
+  <pomVersion>1</pomVersion>
+  <artifactId>acegi-security-sample-contacts</artifactId>
+  <name>Acegi Security System for Spring - Contacts sample</name>
+  <groupId>acegi-security-sample-contacts</groupId>
   <dependencies>
-    <dependency>
-      <groupId>springframework</groupId>
-      <artifactId>spring-webmvc</artifactId>
-      <version>1.1</version>
-      <url>http://www.springframework.org</url>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
     <dependency>
       <groupId>hessian</groupId>
       <artifactId>hessian</artifactId>
       <version>3.0.1</version>
+      <type>jar</type>
       <url>http://www.caucho.com</url>
       <properties>
         <war.bundle>true</war.bundle>
@@ -25,10 +20,22 @@
       <groupId>burlap</groupId>
       <artifactId>burlap</artifactId>
       <version>2.1.7</version>
+      <type>jar</type>
       <url>http://www.caucho.com</url>
       <properties>
         <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>
+