Author: jdonnerstag
Date: Sun Jan 23 09:23:57 2011
New Revision: 1062351
URL: http://svn.apache.org/viewvc?rev=1062351&view=rev
Log:
new velocity version requires updated commons-lang
Modified:
wicket/trunk/pom.xml
wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/velocity.properties
Modified: wicket/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/pom.xml?rev=1062351&r1=1062350&r2=1062351&view=diff
==============================================================================
--- wicket/trunk/pom.xml (original)
+++ wicket/trunk/pom.xml Sun Jan 23 09:23:57 2011
@@ -401,7 +401,7 @@
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.1</version>
+ <version>2.6</version>
</dependency>
<dependency>
<groupId>joda-time</groupId>
Modified:
wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/velocity.properties
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/velocity.properties?rev=1062351&r1=1062350&r2=1062351&view=diff
==============================================================================
---
wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/velocity.properties
(original)
+++
wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/velocity.properties
Sun Jan 23 09:23:57 2011
@@ -136,7 +136,7 @@ class.resource.loader.modificationCheckI
# template path. You may remove it (either the file or this property) if
# you wish with no harm.
#----------------------------------------------------------------------------
-velocimacro.library = VM_global_library.vm
+#velocimacro.library = /WEB-INF/VM_global_library.vm
velocimacro.permissions.allow.inline = true
velocimacro.permissions.allow.inline.to.replace.global = false
