5:11 a.m.
commit dead6664c70f9dadf952f7325de101826e0f1725
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Aug 4 12:10:04 2014 +0200
Port to Doxia 1.6
0001-Update-to-Doxia-1.6.patch | 53 ++++++++++++++++++++++++++++++++
maven-project-info-reports-plugin.spec | 8 ++++-
2 files changed, 60 insertions(+), 1 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..684ae1b
--- /dev/null
+++ b/0001-Update-to-Doxia-1.6.patch
@@ -0,0 +1,53 @@
+From 23c8a39366924ba79ba9a78169d815458287ca62 Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk(a)redhat.com>
+Date: Mon, 4 Aug 2014 12:09:11 +0200
+Subject: [PATCH] Update to Doxia 1.6
+
+---
+ pom.xml | 4 ++--
+ .../apache/maven/report/projectinfo/AbstractProjectInfoReport.java | 3 +--
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index c3a9070..0f56748 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -108,8 +108,8 @@ under the License.
+ </distributionManagement>
+
+ <properties>
+- <doxiaVersion>1.4</doxiaVersion>
+- <doxia-sitetoolsVersion>1.2</doxia-sitetoolsVersion>
++ <doxiaVersion>1.6</doxiaVersion>
++ <doxia-sitetoolsVersion>1.6</doxia-sitetoolsVersion>
+ <mavenVersion>2.2.1</mavenVersion>
+ <wagonVersion>1.0</wagonVersion>
+ <scmVersion>1.8</scmVersion>
+diff --git
a/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
b/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
+index 12b49cc..a1cddd1 100644
+--- a/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
++++ b/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
+@@ -23,11 +23,11 @@ import org.apache.maven.artifact.Artifact;
+ import org.apache.maven.artifact.factory.ArtifactFactory;
+ import org.apache.maven.artifact.repository.ArtifactRepository;
+ import org.apache.maven.artifact.resolver.ArtifactResolver;
+-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.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.doxia.tools.SiteTool;
+@@ -50,7 +50,6 @@ import org.codehaus.plexus.util.IOUtil;
+ import org.codehaus.plexus.util.StringUtils;
+ import org.codehaus.plexus.util.xml.Xpp3Dom;
+
+-
+ import java.io.File;
+ import java.io.FileOutputStream;
+ import java.io.IOException;
+--
+1.9.3
+
diff --git a/maven-project-info-reports-plugin.spec
b/maven-project-info-reports-plugin.spec
index 055727e..02eacd3 100644
--- a/maven-project-info-reports-plugin.spec
+++ b/maven-project-info-reports-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-project-info-reports-plugin
Version: 2.7
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Maven Project Info Reports Plugin
License: ASL 2.0
URL: http://maven.apache.org/plugins/maven-project-info-reports-plugin/
@@ -8,6 +8,8 @@ BuildArch: noarch
Source0:
http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}...
+Patch0: 0001-Update-to-Doxia-1.6.patch
+
BuildRequires: maven-local
BuildRequires: mvn(commons-validator:commons-validator)
BuildRequires: mvn(joda-time:joda-time)
@@ -69,6 +71,7 @@ API documentation for %{name}.
%prep
%setup -q -c
mv %{name}-%{version}/* .
+%patch0 -p1
# removed cvsjava provider since we don't support it anymore
%pom_remove_dep :maven-scm-provider-cvsjava
@@ -83,6 +86,9 @@ mv %{name}-%{version}/* .
%files javadoc -f .mfiles-javadoc
%changelog
+* Mon Aug 4 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.7-6
+- Port to Doxia 1.6
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
2.7-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild