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

[noreply at shibboleth.net]

Author: scantor
Date: Sun Mar 10 23:42:24 2013
New Revision: 1631

URL: http://svn.shibboleth.net/view/java-opensaml2?rev=1631&view=rev
Log:
JOST-169 - Update Velocity Dependency

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-opensaml2/branches/REL_2/doc/RELEASE-NOTES.txt?rev=1631&r1=1630&r2=1631&view=diff
==============================================================================
--- branches/REL_2/doc/RELEASE-NOTES.txt (original)
+++ branches/REL_2/doc/RELEASE-NOTES.txt Sun Mar 10 23:42:24 2013
@@ -1,5 +1,6 @@
 Changes in Release 2.6.0
 =============================================
+[JOST-169] - Update Velocity Dependency
 [JOST-184] - It would be nice if ESAPI.encodeForURL could be made to work
 [JOST-185] - Defaultbootstrap does not initialize the providers from the WS-Trust and WS-Policy schemas in openws
 [JOST-187] - Velocity initialization code uses an invalid key for the configuration properties set

Modified: branches/REL_2/pom.xml
URL: http://svn.shibboleth.net/view/java-opensaml2/branches/REL_2/pom.xml?rev=1631&r1=1630&r2=1631&view=diff
==============================================================================
--- branches/REL_2/pom.xml (original)
+++ branches/REL_2/pom.xml Sun Mar 10 23:42:24 2013
@@ -64,15 +64,8 @@
             <version>2.6</version>
         </dependency>
         <dependency>
-            <groupId>velocity</groupId>
+            <groupId>org.apache.velocity</groupId>
             <artifactId>velocity</artifactId>
-            <version>1.5</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>oro</groupId>
-                    <artifactId>oro</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.owasp.esapi</groupId>
@@ -119,7 +112,7 @@
         <dependency>
             <groupId>joda-time</groupId>
             <artifactId>joda-time</artifactId>
-            </dependency>
+        </dependency>
 
         <!-- Provided dependencies -->
         <dependency>