diff --git a/pom.xml b/pom.xml
index 82b5c19..a0d189b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@ limitations under the License.
- 1.7.36
+ 1.7.36
2021-07-03T11:34:51Z
@@ -59,17 +59,23 @@ limitations under the License.
org.apache.velocity
velocity-engine-core
- 2.0
+ 2.3
+
+
+ junit
+ junit
+ test
org.slf4j
slf4j-api
- ${slf4j.version}
+ ${slf4jVersion}
+ test
org.slf4j
slf4j-simple
- ${slf4j.version}
+ ${slf4jVersion}
test
diff --git a/src/main/java/org/codehaus/plexus/velocity/DefaultVelocityComponent.java b/src/main/java/org/codehaus/plexus/velocity/DefaultVelocityComponent.java
index faf2b7e..71921de 100644
--- a/src/main/java/org/codehaus/plexus/velocity/DefaultVelocityComponent.java
+++ b/src/main/java/org/codehaus/plexus/velocity/DefaultVelocityComponent.java
@@ -60,8 +60,6 @@ public void initialize()
throws InitializationException
{
engine = new VelocityEngine();
- // avoid "unable to find resource 'VM_global_library.vm' in any resource loader."
- engine.setProperty( RuntimeConstants.VM_LIBRARY, "" );
if ( properties != null )
{
engine.setProperties( properties );
diff --git a/src/main/resources/META-INF/plexus/components.xml b/src/main/resources/META-INF/plexus/components.xml
index 24ff608..f2f6bd1 100644
--- a/src/main/resources/META-INF/plexus/components.xml
+++ b/src/main/resources/META-INF/plexus/components.xml
@@ -7,44 +7,44 @@
- resource.loader
+ resource.loaders
classpath,file
- classpath.resource.loader.class
+ resource.loader.classpath.class
org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
- file.resource.loader.class
+ resource.loader.file.class
org.apache.velocity.runtime.resource.loader.FileResourceLoader
- file.resource.loader.path
+ resource.loader.file.path
- runtime.log.invalid.references
+ runtime.log.log_invalid_references
false
- velocimacro.messages.on
+ resource.manager.log_when_found
false
- resource.manager.logwhenfound
- false
-
-
- eventhandler.include.class
+ event_handler.include.class
org.apache.velocity.app.event.implement.IncludeRelativePath
- velocimacro.permissions.allow.inline.to.replace.global
+ velocimacro.inline.replace_global
true
+
+ parser.space_gobbling
+ bc
+
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index 460f9d9..113fedf 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -34,18 +34,18 @@ template.merge( context, writer );
- resource.loader
+ resource.loaders
classpath
- classpath.resource.loader.class
+ resource.loader.classpath.class
org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
]]>
- See Velocity Configuration
+
See Velocity Configuration
reference documentation for details on available configurations.
diff --git a/src/test/resources/org/codehaus/plexus/velocity/DefaultVelocityComponentTest.xml b/src/test/resources/org/codehaus/plexus/velocity/DefaultVelocityComponentTest.xml
index 436932c..2c8ac81 100644
--- a/src/test/resources/org/codehaus/plexus/velocity/DefaultVelocityComponentTest.xml
+++ b/src/test/resources/org/codehaus/plexus/velocity/DefaultVelocityComponentTest.xml
@@ -7,16 +7,16 @@
- resource.loader
- classpath
+ resource.loaders
+ classpath
- classpath.resource.loader.class
- org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+ resource.loader.classpath.class
+ org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
- hello
- world
+ hello
+ world