commit 265f99d954319129e3e9bcdf18d3b6fe5c5c2306
Author: Michal Srb <msrb(a)redhat.com>
Date: Tue Apr 9 14:12:34 2013 +0200
Remove dependency on velocity-tools
0001-Remove-dependency-on-velocity-tools.patch | 36 ++++++++++++++++++++++++
maven-doxia-sitetools.spec | 15 ++++++++-
2 files changed, 49 insertions(+), 2 deletions(-)
---
diff --git a/0001-Remove-dependency-on-velocity-tools.patch
b/0001-Remove-dependency-on-velocity-tools.patch
new file mode 100644
index 0000000..e90bd26
--- /dev/null
+++ b/0001-Remove-dependency-on-velocity-tools.patch
@@ -0,0 +1,36 @@
+From 3c668780c24fb742d96b34a6046ab74cc3f709c5 Mon Sep 17 00:00:00 2001
+From: Michal Srb <msrb(a)redhat.com>
+Date: Tue, 9 Apr 2013 13:31:49 +0200
+Subject: [PATCH] Remove dependency on velocity-tools
+
+---
+ .../org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git
a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
+index f23bd7d..21f0ab2 100644
+---
a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
++++
b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
+@@ -70,8 +70,8 @@ import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
+ import org.apache.maven.doxia.util.XmlValidator;
+
+ import org.apache.velocity.Template;
++import org.apache.velocity.VelocityContext;
+ import org.apache.velocity.context.Context;
+-import org.apache.velocity.tools.ToolManager;
+
+ import org.codehaus.plexus.i18n.I18N;
+ import org.codehaus.plexus.logging.AbstractLogEnabled;
+@@ -427,8 +427,7 @@ public class DefaultSiteRenderer
+
+ private Context createVelocityContext( SiteRendererSink sink, SiteRenderingContext
siteRenderingContext )
+ {
+- ToolManager toolManager = new ToolManager( true );
+- Context context = toolManager.createContext();
++ Context context = new VelocityContext();
+
+ // ----------------------------------------------------------------------
+ // Data objects
+--
+1.8.1.4
+
diff --git a/maven-doxia-sitetools.spec b/maven-doxia-sitetools.spec
index 62fb6d4..de4d0f4 100644
--- a/maven-doxia-sitetools.spec
+++ b/maven-doxia-sitetools.spec
@@ -33,7 +33,7 @@
Name: %{parent}-%{subproj}
Version: 1.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Doxia content generation framework
License: ASL 2.0
Group: Development/Tools
@@ -43,6 +43,7 @@ Source0:
http://repo2.maven.org/maven2/org/apache/maven/doxia/doxia-sitet
Patch0: 0003-Migration-to-component-metadata.patch
+Patch1: 0001-Remove-dependency-on-velocity-tools.patch
BuildRequires: java-devel >= 1:1.7.0
BuildRequires: itext
@@ -81,7 +82,6 @@ BuildRequires: plexus-i18n
BuildRequires: plexus-utils
BuildRequires: plexus-velocity
BuildRequires: velocity
-BuildRequires: velocity-tools
BuildRequires: javamail
BuildArch: noarch
@@ -104,9 +104,17 @@ API documentation for %{name}.
%setup -q -n doxia-%{subproj}-%{version}
%patch0 -p1
+
+# upstream added support for velocity toolmanager, but it also means new
+# dependency on velocity-tools. we don't want to depend on this package
+# (it depends on struts 1) so this patch reverts upstream changes
+%patch1 -p1
+%pom_remove_dep :velocity-tools doxia-site-renderer
+
%pom_remove_plugin org.codehaus.mojo:clirr-maven-plugin
%pom_remove_dep net.sourceforge.htmlunit:htmlunit doxia-site-renderer/pom.xml
+
%pom_xpath_inject
"pom:plugin[pom:artifactId[text()='modello-maven-plugin']]/pom:configuration"
\
"<useJava5>true</useJava5>" doxia-decoration-model
@@ -123,6 +131,9 @@ API documentation for %{name}.
%files javadoc -f .mfiles-javadoc
%changelog
+* Tue Apr 09 2013 Michal Srb <msrb(a)redhat.com>
+- Remove dependency on velocity-tools
+
* Wed Feb 06 2013 Michal Srb <msrb(a)redhat.com> - 1.3-1
- Update to upstream version 1.3
- Migrate from maven-doxia to doxia subpackages (#889145)