commit c1d96424cd17be0cb16ed715727d52f5fa698491
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Aug 4 10:31:58 2014 +0200
Port to Doxia 1.6
0001-Update-to-Doxia-1.6.patch | 42 ++++++++++++++++++++++++++++++++++++++++
maven-reporting-impl.spec | 6 +++++
2 files changed, 48 insertions(+), 0 deletions(-)
---
diff --git a/0001-Update-to-Doxia-1.6.patch b/0001-Update-to-Doxia-1.6.patch
new file mode 100644
index 0000000..6e870c7
--- /dev/null
+++ b/0001-Update-to-Doxia-1.6.patch
@@ -0,0 +1,42 @@
+From 482abdc1f3887cc9a0f71888fc30bd50547b527a Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk(a)redhat.com>
+Date: Mon, 4 Aug 2014 10:31:15 +0200
+Subject: [PATCH] Update to Doxia 1.6
+
+---
+ pom.xml | 2 +-
+ src/main/java/org/apache/maven/reporting/AbstractMavenReport.java | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index ba0fb78..b880637 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -58,7 +58,7 @@
+
+ <properties>
+ <mavenVersion>2.2.1</mavenVersion>
+- <doxiaVersion>1.2</doxiaVersion>
++ <doxiaVersion>1.6</doxiaVersion>
+ </properties>
+
+ <dependencies>
+diff --git a/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
b/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
+index ba44b38..ae6b921 100644
+--- a/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
++++ b/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
+@@ -21,10 +21,10 @@ package org.apache.maven.reporting;
+
+ import org.apache.maven.doxia.sink.Sink;
+ import org.apache.maven.doxia.sink.SinkFactory;
+-import org.apache.maven.doxia.sink.render.RenderingContext;
+ import org.apache.maven.doxia.site.decoration.DecorationModel;
+ 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.AbstractMojo;
+--
+1.9.3
+
diff --git a/maven-reporting-impl.spec b/maven-reporting-impl.spec
index 754d0d5..e6230eb 100644
--- a/maven-reporting-impl.spec
+++ b/maven-reporting-impl.spec
@@ -9,6 +9,10 @@ URL:
http://maven.apache.org/shared/maven-reporting-impl
Source0: %{name}-%{version}.tar.xz
# ASL mandates that the licence file be included in redistributed source
Source1:
http://www.apache.org/licenses/LICENSE-2.0.txt
+
+# Forwarded upstream:
http://jira.codehaus.org/browse/MSHARED-344
+Patch0: 0001-Update-to-Doxia-1.6.patch
+
BuildArch: noarch
BuildRequires: maven-local
@@ -43,6 +47,7 @@ API documentation for %{name}.
%prep
%setup -q
+%patch0 -p1
cp -p %{SOURCE1} LICENSE.txt
%build
@@ -61,6 +66,7 @@ cp -p %{SOURCE1} LICENSE.txt
%changelog
* Mon Aug 4 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.2-11
- Fix build-requires on parent POM
+- Port to Doxia 1.6
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
2.2-10
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild