From 2fc8ac16671bf7df4b1a355da0f8832d9280d7dc Mon Sep 17 00:00:00 2001
From: Scott Battaglia <scott.battaglia@gmail.com>
Date: Sun, 3 Feb 2008 03:04:29 +0000
Subject: [PATCH] CAS-616 fixed dependencies and updated pom version number

---
 cas-server-compatibility/pom.xml          |  2 +-
 cas-server-core/pom.xml                   | 31 ++++++++++-------------
 cas-server-integration-berkeleydb/pom.xml |  2 +-
 cas-server-integration-jboss/pom.xml      |  2 +-
 cas-server-support-generic/pom.xml        |  2 +-
 cas-server-support-jdbc/pom.xml           |  2 +-
 cas-server-support-ldap/pom.xml           |  2 +-
 cas-server-support-legacy/pom.xml         |  2 +-
 cas-server-support-openid/pom.xml         |  2 +-
 cas-server-support-radius/pom.xml         |  2 +-
 cas-server-support-spnego/pom.xml         |  2 +-
 cas-server-support-trusted/pom.xml        |  2 +-
 cas-server-support-x509/pom.xml           |  2 +-
 cas-server-webapp/pom.xml                 | 26 ++++++++-----------
 pom.xml                                   | 24 ++----------------
 15 files changed, 38 insertions(+), 67 deletions(-)

diff --git a/cas-server-compatibility/pom.xml b/cas-server-compatibility/pom.xml
index 34aa829f0d7f..7549bb0a2887 100644
--- a/cas-server-compatibility/pom.xml
+++ b/cas-server-compatibility/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jasig.cas</groupId>
 		<artifactId>cas-server</artifactId>
-		<version>3.2-RC2</version>
+		<version>3.2-RC3</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.jasig.cas</groupId>
diff --git a/cas-server-core/pom.xml b/cas-server-core/pom.xml
index 147fcdffc483..e2b0ab4a23db 100644
--- a/cas-server-core/pom.xml
+++ b/cas-server-core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jasig.cas</groupId>
 		<artifactId>cas-server</artifactId>
-		<version>3.2-RC2</version>
+		<version>3.2-RC3</version>
 	</parent>
 	<description>CAS core</description>
 	<modelVersion>4.0.0</modelVersion>
@@ -19,23 +19,11 @@
 			<version>1.0.1</version>
 			<scope>compile</scope>
 			<exclusions>
-	  			<exclusion>
-	  				<groupId>org.springframework</groupId>
-	  				<artifactId>spring-core</artifactId>
-	  			</exclusion>
-	  			<exclusion>
-	  				<groupId>org.springframework</groupId>
-	  				<artifactId>spring-dao</artifactId>
-	  			</exclusion>
-	  			<exclusion>
-	  				<groupId>org.springframework</groupId>
-	  				<artifactId>spring-jdbc</artifactId>
-	  			</exclusion>
-	  			<exclusion>
-	  				<groupId>org.springframework</groupId>
-	  				<artifactId>spring-beans</artifactId>
-	  			</exclusion>  
-	  		</exclusions>
+				<exclusion>
+					<groupId>org.springframework</groupId>
+					<artifactId>spring-dao</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		
 		<dependency>
@@ -44,6 +32,13 @@
 			<version>1.0</version>
 			<scope>compile</scope>
 		</dependency>
+		
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-orm</artifactId>
+			<version>2.5.1</version>
+			<scope>compile</scope>
+		</dependency>
 	
 	<!-- TESTS FOR JPA -->
 		<dependency>
diff --git a/cas-server-integration-berkeleydb/pom.xml b/cas-server-integration-berkeleydb/pom.xml
index 201adf9bd5e0..c01a211d5716 100644
--- a/cas-server-integration-berkeleydb/pom.xml
+++ b/cas-server-integration-berkeleydb/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jasig.cas</groupId>
 		<artifactId>cas-server</artifactId>
-		<version>3.2-RC2</version>
+		<version>3.2-RC3</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.jasig.cas</groupId>
diff --git a/cas-server-integration-jboss/pom.xml b/cas-server-integration-jboss/pom.xml
index 90d8f39c8e3b..b78b46dac004 100644
--- a/cas-server-integration-jboss/pom.xml
+++ b/cas-server-integration-jboss/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jasig.cas</groupId>
 		<artifactId>cas-server</artifactId>
-		<version>3.2-RC2</version>
+		<version>3.2-RC3</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.jasig.cas</groupId>
diff --git a/cas-server-support-generic/pom.xml b/cas-server-support-generic/pom.xml
index cbb9f8da1db8..ff2ac2a51f2b 100644
--- a/cas-server-support-generic/pom.xml
+++ b/cas-server-support-generic/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jasig.cas</groupId>
 		<artifactId>cas-server</artifactId>
-		<version>3.2-RC2</version>
+		<version>3.2-RC3</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.jasig.cas</groupId>
diff --git a/cas-server-support-jdbc/pom.xml b/cas-server-support-jdbc/pom.xml
index 9d0afbaf74fd..b1bd01c0c6d3 100644
--- a/cas-server-support-jdbc/pom.xml
+++ b/cas-server-support-jdbc/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jasig.cas</groupId>
 		<artifactId>cas-server</artifactId>
-		<version>3.2-RC2</version>
+		<version>3.2-RC3</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.jasig.cas</groupId>
diff --git a/cas-server-support-ldap/pom.xml b/cas-server-support-ldap/pom.xml
index f79ee803501d..b77a7c5fa7a1 100644
--- a/cas-server-support-ldap/pom.xml
+++ b/cas-server-support-ldap/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jasig.cas</groupId>
 		<artifactId>cas-server</artifactId>
-		<version>3.2-RC2</version>
+		<version>3.2-RC3</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.jasig.cas</groupId>
diff --git a/cas-server-support-legacy/pom.xml b/cas-server-support-legacy/pom.xml
index c11d1d2f6298..ba763a88188f 100644
--- a/cas-server-support-legacy/pom.xml
+++ b/cas-server-support-legacy/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jasig.cas</groupId>
 		<artifactId>cas-server</artifactId>
-		<version>3.2-RC2</version>
+		<version>3.2-RC3</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.jasig.cas</groupId>
diff --git a/cas-server-support-openid/pom.xml b/cas-server-support-openid/pom.xml
index 40fde59c335e..089b00da24fe 100644
--- a/cas-server-support-openid/pom.xml
+++ b/cas-server-support-openid/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jasig.cas</groupId>
 		<artifactId>cas-server</artifactId>
-		<version>3.2-RC2</version>
+		<version>3.2-RC3</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.jasig.cas</groupId>
diff --git a/cas-server-support-radius/pom.xml b/cas-server-support-radius/pom.xml
index 2e36e135a910..e8785c01ce40 100644
--- a/cas-server-support-radius/pom.xml
+++ b/cas-server-support-radius/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jasig.cas</groupId>
 		<artifactId>cas-server</artifactId>
-		<version>3.2-RC2</version>
+		<version>3.2-RC3</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.jasig.cas</groupId>
diff --git a/cas-server-support-spnego/pom.xml b/cas-server-support-spnego/pom.xml
index 7ca18fb5ac30..fc79678d4c3f 100644
--- a/cas-server-support-spnego/pom.xml
+++ b/cas-server-support-spnego/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jasig.cas</groupId>
 		<artifactId>cas-server</artifactId>
-		<version>3.2-RC2</version>
+		<version>3.2-RC3</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.jasig.cas</groupId>
diff --git a/cas-server-support-trusted/pom.xml b/cas-server-support-trusted/pom.xml
index d2d416e80dd5..8ada104193e3 100644
--- a/cas-server-support-trusted/pom.xml
+++ b/cas-server-support-trusted/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.jasig.cas</groupId>
 		<artifactId>cas-server</artifactId>
-		<version>3.2-RC2</version>
+		<version>3.2-RC3</version>
 	</parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.jasig.cas</groupId>
diff --git a/cas-server-support-x509/pom.xml b/cas-server-support-x509/pom.xml
index 420bdfb4de74..742390707c34 100644
--- a/cas-server-support-x509/pom.xml
+++ b/cas-server-support-x509/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jasig.cas</groupId>
 		<artifactId>cas-server</artifactId>
-		<version>3.2-RC2</version>
+		<version>3.2-RC3</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.jasig.cas</groupId>
diff --git a/cas-server-webapp/pom.xml b/cas-server-webapp/pom.xml
index c98cb1a76969..8d921a2000a7 100644
--- a/cas-server-webapp/pom.xml
+++ b/cas-server-webapp/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.jasig.cas</groupId>
 		<artifactId>cas-server</artifactId>
-		<version>3.2-RC2</version>
+		<version>3.2-RC3</version>
 	</parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.jasig.cas</groupId>
@@ -17,20 +17,16 @@
   			<version>1.0.6</version>
   			<scope>runtime</scope>
   			<exclusions>
-  				<exclusion>
-  					<artifactId>spring-aop</artifactId>
-  					<groupId>org.springframework</groupId>
-  				</exclusion>
-  				<exclusion>
-  					<artifactId>spring-jdbc</artifactId>
-  					<groupId>org.springframework</groupId>
-  				</exclusion>
-  				<exclusion>
-  					<artifactId>spring-dao</artifactId>
-  					<groupId>org.springframework</groupId>
-  				</exclusion>
-  			</exclusions>
-  		</dependency>
+				<exclusion>
+					<groupId>org.springframework</groupId>
+					<artifactId>spring-remoting</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.springframework</groupId>
+					<artifactId>spring-support</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
   		
   		<dependency>
   			<groupId>cas</groupId>
diff --git a/pom.xml b/pom.xml
index d219caf1cb1d..eda407b0ea63 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 	<artifactId>cas-server</artifactId>
 	<packaging>pom</packaging>
 	<name>JA-SIG Central Authentication Service</name>
-	<version>3.2-RC2</version>
+	<version>3.2-RC3</version>
 	<url>http://www.ja-sig.org/products/cas/</url>
 	<ciManagement>
 		<system>QuickBuild</system>
@@ -113,7 +113,7 @@
 		<dependency>
 			<groupId>org.inspektr</groupId>
 			<artifactId>inspektr-core</artifactId>
-			<version>0.6</version>
+			<version>0.6.1</version>
 			<scope>compile</scope>
 		</dependency>
 	
@@ -188,26 +188,6 @@
 			<version>1.0.5</version>
 			<scope>compile</scope>
 			<exclusions>
-				<exclusion>
-					<groupId>org.springframework</groupId>
-					<artifactId>spring-beans</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.springframework</groupId>
-					<artifactId>spring-context</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.springframework</groupId>
-					<artifactId>spring-core</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.springframework</groupId>
-					<artifactId>spring-web</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.springframework</groupId>
-					<artifactId>spring-webmvc</artifactId>
-				</exclusion>
 				<exclusion>
 					<artifactId>spring-portlet</artifactId>
 					<groupId>org.springframework</groupId>