From fa78a2f6262bb244371ef74477f581206bec92c5 Mon Sep 17 00:00:00 2001
From: Scott Battaglia <scott.battaglia@gmail.com>
Date: Fri, 11 Apr 2008 18:45:08 +0000
Subject: [PATCH] NOJIRA

updated pom
---
 cas-client-core/pom.xml                  |  64 +--
 cas-client-integration-atlassian/pom.xml | 487 ++++++++++++++++++++++-
 pom.xml                                  |  30 +-
 3 files changed, 533 insertions(+), 48 deletions(-)

diff --git a/cas-client-core/pom.xml b/cas-client-core/pom.xml
index 11fe725..b2fe8f5 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.2</version>
+        <version>3.1.3-SNAPSHOT</version>
         <artifactId>cas-client</artifactId>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -60,7 +60,7 @@
 			<groupId>xml-security</groupId>
 			<artifactId>xmlsec</artifactId>
 			<version>1.3.0</version>
-			<scope>runtime</scope>
+			<scope>runtime</scope>
 			<optional>true</optional>
 		</dependency>
 
@@ -69,36 +69,36 @@
 			<artifactId>opensaml</artifactId>
 			<version>1.1b</version>
 			<type>jar</type>
-			<scope>provided</scope>
+			<scope>provided</scope>
 			<optional>true</optional>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-beans</artifactId>
-			<version>2.5.1</version>
-			<scope>provided</scope>
-		</dependency>		
-
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-test</artifactId>
-			<version>2.5.1</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-core</artifactId>
-			<version>2.5.1</version>
-			<scope>test</scope>
-		</dependency>		
-
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-context</artifactId>
-			<version>2.5.1</version>
-			<scope>test</scope>
-		</dependency>		
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-beans</artifactId>
+			<version>2.5.1</version>
+			<scope>provided</scope>
+		</dependency>		
+
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-test</artifactId>
+			<version>2.5.1</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-core</artifactId>
+			<version>2.5.1</version>
+			<scope>test</scope>
+		</dependency>		
+
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context</artifactId>
+			<version>2.5.1</version>
+			<scope>test</scope>
+		</dependency>		
     </dependencies>
 </project>
diff --git a/cas-client-integration-atlassian/pom.xml b/cas-client-integration-atlassian/pom.xml
index 6da089d..c5f5fde 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.2</version>
+        <version>3.1.3-SNAPSHOT</version>
         <artifactId>cas-client</artifactId>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -61,6 +61,491 @@
 			<version>0.37</version>
 			<scope>compile</scope>
 		</dependency>
+
+        <dependency>
+            <groupId>com.atlassian.confluence</groupId>
+            <artifactId>confluence</artifactId>
+            <version>2.7.3</version>
+            <exclusions>
+               <exclusion>
+                   <groupId>com.atlassian.mail</groupId>
+                   <artifactId>atlassian-mail</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>com.atlassian.velocity</groupId>
+                   <artifactId>atlassian-velocity</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>com.atlassian.core</groupId>
+                   <artifactId>atlassian-core</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>com.atlassian.config</groupId>
+                   <artifactId>atlassian-config</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>com.atlassian.spring</groupId>
+                   <artifactId>atlassian-spring</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>com.atlassian.event</groupId>
+                   <artifactId>atlassian-event</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>com.atlassian.bucket</groupId>
+                   <artifactId>atlassian-bucket</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>com.atlassian.profiling</groupId>
+                   <artifactId>atlassian-profiling</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>atlassian-trackback</groupId>
+                   <artifactId>atlassian-trackback</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>com.atlassian.extras</groupId>
+                   <artifactId>atlassian-extras</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>com.atlassian.johnson</groupId>
+                   <artifactId>atlassian-johnson</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>atlassian-cache-servlet</groupId>
+                   <artifactId>atlassian-cache-servlet</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>com.atlassian.plugins</groupId>
+                   <artifactId>atlassian-plugins</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>atlassian-bandana</groupId>
+                   <artifactId>atlassian-bandana</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>atlassian-gregory</groupId>
+                   <artifactId>atlassian-gregory</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>com.atlassian.user</groupId>
+                   <artifactId>atlassian-user</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>com.atlassian.renderer</groupId>
+                   <artifactId>atlassian-renderer</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>com.atlassian.bonnie</groupId>
+                   <artifactId>atlassian-bonnie</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>joda-time</groupId>
+                   <artifactId>joda-time</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>backport-util-concurrent</groupId>
+                   <artifactId>backport-util-concurrent</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>com.atlassian.seraph</groupId>
+                   <artifactId>atlassian-seraph</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>javax.activation</groupId>
+                   <artifactId>activation</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>log4j</groupId>
+                   <artifactId>log4j</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>commons-lang</groupId>
+                   <artifactId>commons-lang</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>commons-io</groupId>
+                   <artifactId>commons-io</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>commons-beanutils</groupId>
+                   <artifactId>commons-beanutils</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>dwr</groupId>
+                   <artifactId>dwr</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>hibernate</groupId>
+                   <artifactId>hibernate</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>cglib</groupId>
+                   <artifactId>cglib</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>dom4j</groupId>
+                   <artifactId>dom4j</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>odmg</groupId>
+                   <artifactId>odmg</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>c3p0</groupId>
+                   <artifactId>c3p0</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>ant</groupId>
+                   <artifactId>ant</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>jta</groupId>
+                   <artifactId>jta</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>opensymphony</groupId>
+                   <artifactId>webwork</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>opensymphony</groupId>
+                   <artifactId>xwork</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>ognl</groupId>
+                   <artifactId>ognl</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>opensymphony</groupId>
+                   <artifactId>oscore</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>oscache</groupId>
+                   <artifactId>oscache</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>osuser</groupId>
+                   <artifactId>osuser</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>propertyset</groupId>
+                   <artifactId>propertyset</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>velocity</groupId>
+                   <artifactId>velocity</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>javax.servlet</groupId>
+                   <artifactId>servlet-api</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>aspectj</groupId>
+                   <artifactId>aspectjweaver</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>ldaptemplate</groupId>
+                   <artifactId>ldaptemplate</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>opensymphony</groupId>
+                   <artifactId>sitemesh</artifactId>
+               </exclusion>
+
+               <exclusion>
+                   <groupId>velocity-tools</groupId>
+                   <artifactId>velocity-tools</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>radeox</groupId>
+                   <artifactId>radeox</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>jython</groupId>
+                   <artifactId>jython</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>lucene</groupId>
+                   <artifactId>lucene-core</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>lucene</groupId>
+                   <artifactId>lucene-analyzers</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>commons-digester</groupId>
+                   <artifactId>commons-digester</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>tm-extractors</groupId>
+                   <artifactId>tm-extractors</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>pdfbox</groupId>
+                   <artifactId>pdfbox</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>bouncycastle</groupId>
+                   <artifactId>bcprov-jdk14</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>FontBox</groupId>
+                   <artifactId>FontBox</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>poi</groupId>
+                   <artifactId>poi</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>fop</groupId>
+                   <artifactId>fop</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>xmlgraphics-commons</groupId>
+                   <artifactId>xmlgraphics-commons</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>batik</groupId>
+                   <artifactId>batik-all</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>avalon-framework</groupId>
+                   <artifactId>avalon-framework</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>com.sun</groupId>
+                   <artifactId>jai_core</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>com.sun</groupId>
+                   <artifactId>jai_codec</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>css2parser</groupId>
+                   <artifactId>ss_css2</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>saxon</groupId>
+                   <artifactId>saxon</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>org.hibernate</groupId>
+                   <artifactId>jtidy</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>quartz</groupId>
+                   <artifactId>quartz</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>hsqldb</groupId>
+                   <artifactId>hsqldb</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>mockobjects</groupId>
+                   <artifactId>mockobjects-core</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>mockobjects</groupId>
+                   <artifactId>mockobjects</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>alt</groupId>
+                   <artifactId>alt-0.07</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>alt</groupId>
+                   <artifactId>alt</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>exml</groupId>
+                   <artifactId>exml</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>rome</groupId>
+                   <artifactId>rome</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>jdom</groupId>
+                   <artifactId>jdom</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>commons-jrcs</groupId>
+                   <artifactId>commons-jrcs</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>commons-httpclient</groupId>
+                   <artifactId>commons-httpclient</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>httpunit</groupId>
+                   <artifactId>httpunit</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>nekohtml</groupId>
+                   <artifactId>nekohtml</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>xerces</groupId>
+                   <artifactId>xercesImpl</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>xerces</groupId>
+                   <artifactId>xmlParserAPIs</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>xmlrpc</groupId>
+                   <artifactId>xmlrpc</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>glue</groupId>
+                   <artifactId>glue</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>axis</groupId>
+                   <artifactId>axis</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>axis</groupId>
+                   <artifactId>axis-jaxrpc</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>axis</groupId>
+                   <artifactId>axis-saaj</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>commons-discovery</groupId>
+                   <artifactId>commons-discovery</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>commons-codec</groupId>
+                   <artifactId>commons-codec</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>oro</groupId>
+                   <artifactId>oro</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>slide</groupId>
+                   <artifactId>slide</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>xstream</groupId>
+                   <artifactId>xstream</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>xpp3</groupId>
+                   <artifactId>xpp3</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>concurrent</groupId>
+                   <artifactId>concurrent</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>bsf</groupId>
+                   <artifactId>bsf</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>jfree</groupId>
+                   <artifactId>jfreechart</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>xalan</groupId>
+                   <artifactId>xalan</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>jcaptcha</groupId>
+                   <artifactId>jcaptcha</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>tangosol-coherence</groupId>
+                   <artifactId>tangosol</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>tangosol-coherence</groupId>
+                   <artifactId>coherence</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>net.sourceforge.jtds</groupId>
+                   <artifactId>jtds</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>net.java.dev.urlrewrite</groupId>
+                   <artifactId>urlrewrite</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>commons-collections</groupId>
+                   <artifactId>commons-collections</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>net.sf.ehcache</groupId>
+                   <artifactId>ehcache</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>stax</groupId>
+                   <artifactId>stax-api</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>woodstox</groupId>
+                   <artifactId>wstx-asl</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>org.codehaus.xfire</groupId>
+                   <artifactId>xfire-all</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>junit</groupId>
+                   <artifactId>junit</artifactId>
+               </exclusion>
+               <exclusion>
+                   <groupId>org.springframework</groupId>
+                   <artifactId>spring-aop</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-beans</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-context</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-support</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>aopalliance</groupId>
+                    <artifactId>aopalliance</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>spring</groupId>
+                    <artifactId>spring-aopalliance</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>pell</groupId>
+                    <artifactId>pell</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>bouncycastle</groupId>
+                    <artifactId>bcprov-jdk14</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jasig.cas</groupId>
+            <artifactId>cas-client-core</artifactId>
+            <version>3.1.2</version>
+            <scope>compile</scope>
+        </dependency>
+
     </dependencies>
     
     <repositories>
diff --git a/pom.xml b/pom.xml
index 6d6a61c..3544775 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.2</version>
+    <version>3.1.3-SNAPSHOT</version>
     <artifactId>cas-client</artifactId>
     <packaging>pom</packaging>
     <name>JA-SIG CAS Client for Java</name>
@@ -12,12 +12,12 @@
     <issueManagement>
         <system>JIRA</system>
         <url>http://www.ja-sig.org/issues</url>
-    </issueManagement>
-	<scm>
-	    <connection>scm:svn:https://www.ja-sig.org/svn/cas-clients/java-client</connection>
-	    <developerConnection>scm:svn:https://www.ja-sig.org/svn/cas-clients/java-client</developerConnection>
-	    <tag>HEAD</tag>
-	    <url>https://www.ja-sig.org/svn/cas-clients/java-client</url>
+    </issueManagement>
+	<scm>
+	    <connection>scm:svn:https://www.ja-sig.org/svn/cas-clients/java-client</connection>
+	    <developerConnection>scm:svn:https://www.ja-sig.org/svn/cas-clients/java-client</developerConnection>
+	    <tag>HEAD</tag>
+	    <url>https://www.ja-sig.org/svn/cas-clients/java-client</url>
 	</scm>
     <inceptionYear>2006</inceptionYear>
     <mailingLists>
@@ -121,13 +121,13 @@
     <modules>
         <module>cas-client-core</module>
         <module>cas-client-integration-atlassian</module>
-    </modules>
-    
-	<distributionManagement>
-		<repository>
-			<id>acegi.repo</id>
-			<name>Acegi Repository</name>
-			<url>scp://shell.sf.net/home/groups/a/ac/acegisecurity/htdocs/repository/releases</url>
-		</repository>
+    </modules>
+    
+	<distributionManagement>
+		<repository>
+			<id>acegi.repo</id>
+			<name>Acegi Repository</name>
+			<url>scp://shell.sf.net/home/groups/a/ac/acegisecurity/htdocs/repository/releases</url>
+		</repository>
 	</distributionManagement>
 </project>
\ No newline at end of file