From d7e5e3743bffb6336599eeb64932f75e11a1066b Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Mon, 10 Sep 2007 19:25:50 +0000
Subject: [PATCH] Tidied up portlet pom and added acegi dependency

---
 portlet/pom.xml | 33 +++++++++------------------------
 1 file changed, 9 insertions(+), 24 deletions(-)

diff --git a/portlet/pom.xml b/portlet/pom.xml
index 9197aca1f0..70bf9d3d7b 100644
--- a/portlet/pom.xml
+++ b/portlet/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.acegisecurity</groupId>
-        <artifactId>acegi-security-sandbox</artifactId>
+        <artifactId>acegi-security-parent</artifactId>
         <version>2.0-SNAPSHOT</version>
     </parent>
     <artifactId>acegi-security-portlet</artifactId>
@@ -11,27 +11,12 @@
     <description>Acegi Security System for Spring - Support for JSR 168 Portlets</description>
     <version>0.1-SNAPSHOT</version>
 
-    <repositories>
-        <repository>
-            <id>AcegiMaven</id>
-            <name>Acegi 3rd party repository</name>
-            <url>http://acegisecurity.sourceforge.net/maven</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-        </repository>
-    </repositories>
-
-    <scm>
-        <connection>scm:svn:https://svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity/sandbox/portlet
-        </connection>
-        <developerConnection>
-            scm:svn:https://svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity/sandbox/portlet
-        </developerConnection>
-        <url>http://svn.sourceforge.net/viewcvs.cgi/acegisecurity/trunk/acegisecurity/sandbox/portlet/</url>
-    </scm>
-
     <dependencies>
+        <dependency>
+            <groupId>org.acegisecurity</groupId>
+            <artifactId>acegi-security</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
@@ -47,17 +32,17 @@
         <dependency>
           <groupId>org.springframework</groupId>
           <artifactId>spring-dao</artifactId>
-          <version>2.0.4</version>
+          <version>${spring.version}</version>
         </dependency>
         <dependency>
           <groupId>org.springframework</groupId>
           <artifactId>spring-portlet</artifactId>
-          <version>2.0.4</version>
+          <version>${spring.version}</version>
         </dependency>
         <dependency>
           <groupId>org.springframework</groupId>
           <artifactId>spring-mock</artifactId>
-          <version>2.0.4</version>
+          <version>${spring.version}</version>
           <optional>true</optional>
         </dependency>
         <dependency>