From d00986afc7dca7301d2e0e07fe437e0b571c918a Mon Sep 17 00:00:00 2001
From: Scott Battaglia <scott.battaglia@gmail.com>
Date: Thu, 18 Dec 2008 04:21:15 +0000
Subject: [PATCH] NOJIRA

preparation for CAS Client for Java 3.1.5 release
---
 cas-client-core/pom.xml                  |  2 +-
 cas-client-integration-atlassian/pom.xml | 10 ++++++++--
 pom.xml                                  |  2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/cas-client-core/pom.xml b/cas-client-core/pom.xml
index 6353f8a..eb28d0e 100644
--- a/cas-client-core/pom.xml
+++ b/cas-client-core/pom.xml
@@ -2,7 +2,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
         <groupId>org.jasig.cas</groupId>
-        <version>3.1.4</version>
+        <version>3.1.5</version>
         <artifactId>cas-client</artifactId>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/cas-client-integration-atlassian/pom.xml b/cas-client-integration-atlassian/pom.xml
index 1858477..cc38cbd 100644
--- a/cas-client-integration-atlassian/pom.xml
+++ b/cas-client-integration-atlassian/pom.xml
@@ -2,7 +2,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
         <groupId>org.jasig.cas</groupId>
-        <version>3.1.4</version>
+        <version>3.1.5</version>
         <artifactId>cas-client</artifactId>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -59,7 +59,13 @@
 			<artifactId>atlassian-seraph</artifactId>
 			<groupId>com.atlassian.seraph</groupId>
 			<version>0.37</version>
-			<scope>provided</scope>
+			<scope>provided</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>opensymphony</groupId>
+					<artifactId>propertyset</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
         <dependency>
diff --git a/pom.xml b/pom.xml
index 1ac17d0..f88ed7d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
 <project>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.jasig.cas</groupId>
-    <version>3.1.4</version>
+    <version>3.1.5</version>
     <artifactId>cas-client</artifactId>
     <packaging>pom</packaging>
     <name>JA-SIG CAS Client for Java</name>