[java-shib-idp2 COMMIT] in /branches/REL_2: doc/RELEASE-NOTES.txt pom.xml

[noreply at shibboleth.net]

Author: lajoie
Date: Wed Nov  9 03:11:41 2011
New Revision: 3090

URL: http://svn.shibboleth.net/view/java-shib-idp2?rev=3090&view=rev
Log:
explicitly set Spring version in IdP POM - SIDP-530

Modified:
    branches/REL_2/doc/RELEASE-NOTES.txt
    branches/REL_2/pom.xml

Modified: branches/REL_2/doc/RELEASE-NOTES.txt
URL: http://svn.shibboleth.net/view/java-shib-idp2/branches/REL_2/doc/RELEASE-NOTES.txt?rev=3090&r1=3089&r2=3090&view=diff
==============================================================================
--- branches/REL_2/doc/RELEASE-NOTES.txt (original)
+++ branches/REL_2/doc/RELEASE-NOTES.txt Wed Nov  9 03:11:41 2011
@@ -1,6 +1,7 @@
 Changes in Release 2.3.5
 =============================================
 [SIDP-529] - NPE with isPassive
+[SIDP-530] - Spring mistakenly updated to v3 in IdP 2.3.4 build
 
 Changes in Release 2.3.4
 =============================================

Modified: branches/REL_2/pom.xml
URL: http://svn.shibboleth.net/view/java-shib-idp2/branches/REL_2/pom.xml?rev=3090&r1=3089&r2=3090&view=diff
==============================================================================
--- branches/REL_2/pom.xml (original)
+++ branches/REL_2/pom.xml Wed Nov  9 03:11:41 2011
@@ -12,7 +12,7 @@
 
     <groupId>edu.internet2.middleware</groupId>
     <artifactId>shibboleth-identityprovider</artifactId>
-    <version>2.3.4-SNAPSHOT</version>
+    <version>2.3.5</version>
 
     <!-- We bundle as a jar here, the installer creates the WAR -->
     <packaging>jar</packaging>
@@ -25,6 +25,8 @@
 
     <properties>
         <svn.relative.location>java-shib-idp2</svn.relative.location>
+        <spring.groupId>org.springframework</spring.groupId>
+        <spring.version>2.5.6.SEC02</spring.version>
     </properties>
 
     <repositories>
@@ -50,6 +52,44 @@
             <groupId>edu.internet2.middleware</groupId>
             <artifactId>shibboleth-common</artifactId>
             <version>1.3.4</version>
+        </dependency>
+        <dependency>
+            <groupId>${spring.groupId}</groupId>
+            <artifactId>spring-context-support</artifactId>
+            <version>${spring.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>aopalliance</artifactId>
+                    <groupId>aopalliance</groupId>
+                </exclusion>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-aop</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-jdbc</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-tx</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>${spring.groupId}</groupId>
+            <artifactId>spring-web</artifactId>
+            <version>${spring.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- Provided dependencies -->