Update to upstream version 2.4
This commit is contained in:
parent
8364bb55d1
commit
3edf7d027e
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,3 +1,4 @@
|
||||
/maven-reporting-impl-2.2.tar.xz
|
||||
/LICENSE-2.0.txt
|
||||
/maven-reporting-impl-2.3-source-release.zip
|
||||
/maven-reporting-impl-2.4-source-release.zip
|
||||
|
||||
@ -1,42 +0,0 @@
|
||||
From 482abdc1f3887cc9a0f71888fc30bd50547b527a Mon Sep 17 00:00:00 2001
|
||||
From: Mikolaj Izdebski <mizdebsk@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
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
Name: maven-reporting-impl
|
||||
Version: 2.3
|
||||
Release: 2%{?dist}
|
||||
Version: 2.4
|
||||
Release: 1%{?dist}
|
||||
Summary: Abstract classes to manage report generation
|
||||
License: ASL 2.0
|
||||
URL: http://maven.apache.org/shared/%{name}
|
||||
@ -8,9 +8,6 @@ BuildArch: noarch
|
||||
|
||||
Source0: http://repo1.maven.org/maven2/org/apache/maven/reporting/%{name}/%{version}/%{name}-%{version}-source-release.zip
|
||||
|
||||
# Forwarded upstream: https://issues.apache.org/jira/browse/MSHARED-344
|
||||
Patch0: 0001-Update-to-Doxia-1.6.patch
|
||||
|
||||
BuildRequires: maven-local
|
||||
BuildRequires: mvn(commons-validator:commons-validator)
|
||||
BuildRequires: mvn(junit:junit)
|
||||
@ -43,7 +40,6 @@ API documentation for %{name}.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
%mvn_build %{!?fedora:-f}
|
||||
@ -52,6 +48,7 @@ API documentation for %{name}.
|
||||
%mvn_install
|
||||
|
||||
%files -f .mfiles
|
||||
%{!?_licensedir:%global license %%doc}
|
||||
%dir %{_javadir}/%{name}
|
||||
%doc LICENSE NOTICE
|
||||
|
||||
@ -59,6 +56,9 @@ API documentation for %{name}.
|
||||
%doc LICENSE NOTICE
|
||||
|
||||
%changelog
|
||||
* Wed Jul 08 2015 Michal Srb <msrb@redhat.com> - 2.4-1
|
||||
- Update to upstream version 2.4
|
||||
|
||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user