commit 81df284ef73a56654294fa8e60855249d85f9b04
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Aug 4 12:03:29 2014 +0200
Port to Doxia 1.6
0001-Remove-dependency-on-velocity-tools.patch | 12 +++---
0002-Update-to-Doxia-1.6.patch | 46 ++++++++++++++++++++++++
maven-changes-plugin.spec | 7 +++-
3 files changed, 58 insertions(+), 7 deletions(-)
---
diff --git a/0001-Remove-dependency-on-velocity-tools.patch
b/0001-Remove-dependency-on-velocity-tools.patch
index 7b4680e..0010ff7 100644
--- a/0001-Remove-dependency-on-velocity-tools.patch
+++ b/0001-Remove-dependency-on-velocity-tools.patch
@@ -1,21 +1,21 @@
-From 540698d645c4e2646c9f6b2317dc3cf71005a892 Mon Sep 17 00:00:00 2001
+From 14f3c6586d9c476404a3c0c16e5a095b4ba866ad Mon Sep 17 00:00:00 2001
From: Michal Srb <msrb(a)redhat.com>
Date: Wed, 10 Apr 2013 09:00:22 +0200
-Subject: [PATCH] Remove dependency on velocity-tools
+Subject: [PATCH 1/2] Remove dependency on velocity-tools
---
.../java/org/apache/maven/plugin/announcement/AnnouncementMojo.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java
b/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java
-index 06d4575..33af611 100644
+index 06d4575..0f7cd2b 100644
--- a/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java
+++ b/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java
@@ -50,9 +50,9 @@ import org.apache.maven.settings.Settings;
import org.apache.velocity.Template;
import org.apache.velocity.app.VelocityEngine;
import org.apache.velocity.context.Context;
-+import org.apache.velocity.VelocityContext;
++import org.apache.velocity.VelocityContext;
import org.apache.velocity.exception.ResourceNotFoundException;
import org.apache.velocity.exception.VelocityException;
-import org.apache.velocity.tools.ToolManager;
@@ -28,10 +28,10 @@ index 06d4575..33af611 100644
{
- ToolManager toolManager = new ToolManager( true );
- Context context = toolManager.createContext();
-+ Context context = new VelocityContext();
++ Context context = new VelocityContext();
if ( getIntroduction() == null || getIntroduction().equals( "" )
)
{
--
-1.8.1.4
+1.9.3
diff --git a/0002-Update-to-Doxia-1.6.patch b/0002-Update-to-Doxia-1.6.patch
new file mode 100644
index 0000000..1b2fafd
--- /dev/null
+++ b/0002-Update-to-Doxia-1.6.patch
@@ -0,0 +1,46 @@
+From 29d76b6f385918446b0b680b97fd6bb275960d91 Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk(a)redhat.com>
+Date: Mon, 4 Aug 2014 11:54:55 +0200
+Subject: [PATCH 2/2] Update to Doxia 1.6
+
+---
+ pom.xml | 4 ++--
+ .../java/org/apache/maven/plugin/changes/AbstractChangesReport.java | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index 02f08da..7d68cb2 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -60,8 +60,8 @@ under the License.
+ </issueManagement>
+
+ <properties>
+- <doxiaVersion>1.2</doxiaVersion>
+- <doxiaSitetoolsVersion>1.2</doxiaSitetoolsVersion>
++ <doxiaVersion>1.6</doxiaVersion>
++ <doxiaSitetoolsVersion>1.6</doxiaSitetoolsVersion>
+ <mavenVersion>2.2.1</mavenVersion>
+ <sitePluginVersion>3.1</sitePluginVersion>
+ <mavenPluginPluginVersion>3.1</mavenPluginPluginVersion>
+diff --git a/src/main/java/org/apache/maven/plugin/changes/AbstractChangesReport.java
b/src/main/java/org/apache/maven/plugin/changes/AbstractChangesReport.java
+index 8f23a22..e7a19ec 100644
+--- a/src/main/java/org/apache/maven/plugin/changes/AbstractChangesReport.java
++++ b/src/main/java/org/apache/maven/plugin/changes/AbstractChangesReport.java
+@@ -28,12 +28,12 @@ import
org.apache.maven.artifact.resolver.ArtifactResolutionException;
+ import org.apache.maven.artifact.resolver.ArtifactResolver;
+ import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
+ import org.apache.maven.artifact.versioning.VersionRange;
+-import org.apache.maven.doxia.sink.render.RenderingContext;
+ import org.apache.maven.doxia.site.decoration.Body;
+ import org.apache.maven.doxia.site.decoration.DecorationModel;
+ import org.apache.maven.doxia.site.decoration.Skin;
+ import org.apache.maven.doxia.siterenderer.Renderer;
+ import org.apache.maven.doxia.siterenderer.RendererException;
++import org.apache.maven.doxia.siterenderer.RenderingContext;
+ import org.apache.maven.doxia.siterenderer.SiteRenderingContext;
+ import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
+ import org.apache.maven.plugin.MojoExecutionException;
+--
+1.9.3
+
diff --git a/maven-changes-plugin.spec b/maven-changes-plugin.spec
index b49a9fa..17dbb9d 100644
--- a/maven-changes-plugin.spec
+++ b/maven-changes-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-changes-plugin
Version: 2.8
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Plugin to support reporting of changes between releases
Group: Development/Libraries
@@ -8,6 +8,7 @@ License: ASL 2.0
URL:
http://maven.apache.org/plugins/%{name}
Source0:
http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}...
Patch0: 0001-Remove-dependency-on-velocity-tools.patch
+Patch1: 0002-Update-to-Doxia-1.6.patch
BuildArch: noarch
@@ -70,6 +71,7 @@ API documentation for %{name}.
# remove dependency on velocity-tools
%patch0 -p1
+%patch1 -p1
%pom_remove_dep :velocity-tools
# Javamail is provided by JDK
@@ -100,6 +102,9 @@ rm -rf src/main/java/org/apache/maven/plugin/github
%doc LICENSE NOTICE
%changelog
+* Mon Aug 4 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.8-9
+- Port to Doxia 1.6
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
2.8-8
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild