|
 |
54dfb5 |
From 540698d645c4e2646c9f6b2317dc3cf71005a892 Mon Sep 17 00:00:00 2001
|
|
|
54dfb5 |
From: Michal Srb <msrb@redhat.com>
|
|
|
54dfb5 |
Date: Wed, 10 Apr 2013 09:00:22 +0200
|
|
|
54dfb5 |
Subject: [PATCH] Remove dependency on velocity-tools
|
|
|
54dfb5 |
|
|
|
54dfb5 |
---
|
|
|
54dfb5 |
.../java/org/apache/maven/plugin/announcement/AnnouncementMojo.java | 5 ++---
|
|
|
54dfb5 |
1 file changed, 2 insertions(+), 3 deletions(-)
|
|
|
54dfb5 |
|
|
|
54dfb5 |
diff --git a/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java b/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java
|
|
|
54dfb5 |
index 06d4575..33af611 100644
|
|
|
54dfb5 |
--- a/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java
|
|
|
54dfb5 |
+++ b/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java
|
|
|
54dfb5 |
@@ -50,9 +50,9 @@ import org.apache.maven.settings.Settings;
|
|
|
54dfb5 |
import org.apache.velocity.Template;
|
|
|
54dfb5 |
import org.apache.velocity.app.VelocityEngine;
|
|
|
54dfb5 |
import org.apache.velocity.context.Context;
|
|
|
54dfb5 |
+import org.apache.velocity.VelocityContext;
|
|
|
54dfb5 |
import org.apache.velocity.exception.ResourceNotFoundException;
|
|
|
54dfb5 |
import org.apache.velocity.exception.VelocityException;
|
|
|
54dfb5 |
-import org.apache.velocity.tools.ToolManager;
|
|
|
54dfb5 |
import org.codehaus.plexus.util.ReaderFactory;
|
|
|
54dfb5 |
import org.codehaus.plexus.util.StringUtils;
|
|
|
54dfb5 |
import org.codehaus.plexus.velocity.VelocityComponent;
|
|
|
54dfb5 |
@@ -518,8 +518,7 @@ public class AnnouncementMojo
|
|
|
54dfb5 |
{
|
|
|
54dfb5 |
try
|
|
|
54dfb5 |
{
|
|
|
54dfb5 |
- ToolManager toolManager = new ToolManager( true );
|
|
|
54dfb5 |
- Context context = toolManager.createContext();
|
|
|
54dfb5 |
+ Context context = new VelocityContext();
|
|
|
54dfb5 |
|
|
|
54dfb5 |
if ( getIntroduction() == null || getIntroduction().equals( "" ) )
|
|
|
54dfb5 |
{
|
|
|
54dfb5 |
--
|
|
|
54dfb5 |
1.8.1.4
|
|
|
54dfb5 |
|