mizdebsk pushed to maven-javadoc-plugin (master). "Update to upstream version 2.10.3"
notifications at fedoraproject.org
notifications at fedoraproject.org
Fri Apr 10 08:32:10 UTC 2015
>From 1f076d1d1eba46500228056f1f4dfd00a99a3af0 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Fri, 10 Apr 2015 10:24:51 +0200
Subject: Update to upstream version 2.10.3
diff --git a/.gitignore b/.gitignore
index da589cd..f2c74c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ maven-javadoc-plugin-2.8.1-source-release.zip
/maven-javadoc-plugin-2.10-source-release.zip
/maven-javadoc-plugin-2.10.1-source-release.zip
/maven-javadoc-plugin-2.10.2-source-release.zip
+/maven-javadoc-plugin-2.10.3-source-release.zip
diff --git a/doxia-sitetools-1.6.patch b/doxia-sitetools-1.6.patch
new file mode 100644
index 0000000..10fa452
--- /dev/null
+++ b/doxia-sitetools-1.6.patch
@@ -0,0 +1,11 @@
+--- src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java~ 2015-04-09 14:51:50.000000000 +0200
++++ src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java 2015-04-10 10:24:02.875694254 +0200
+@@ -24,7 +24,7 @@
+ import java.util.Locale;
+ import java.util.ResourceBundle;
+
+-import org.apache.maven.doxia.sink.render.RenderingContext;
++import org.apache.maven.doxia.siterenderer.RenderingContext;
+ import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
+ import org.apache.maven.plugin.MojoExecutionException;
+ import org.apache.maven.plugin.MojoFailureException;
diff --git a/maven-javadoc-plugin.spec b/maven-javadoc-plugin.spec
index 0cd1a94..4329f53 100644
--- a/maven-javadoc-plugin.spec
+++ b/maven-javadoc-plugin.spec
@@ -1,5 +1,5 @@
Name: maven-javadoc-plugin
-Version: 2.10.2
+Version: 2.10.3
Release: 1%{?dist}
Summary: Maven Javadoc Plugin
License: ASL 2.0
@@ -7,7 +7,9 @@ URL: http://maven.apache.org/plugins/maven-javadoc-plugin
BuildArch: noarch
Source0: http://repo1.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip
+
Patch0: reduce-exceptions.patch
+Patch1: doxia-sitetools-1.6.patch
BuildRequires: maven-local
BuildRequires: apache-commons-io
@@ -46,8 +48,8 @@ API documentation for %{name}.
%prep
%setup -q
-# Update source for use with newer doxia
%patch0
+%patch1
# Remove test dependencies because tests are skipped anyways.
%pom_xpath_remove "pom:dependency[pom:scope[text()='test']]"
@@ -86,6 +88,9 @@ rm -f src/main/java/org/apache/maven/plugin/javadoc/*FixJavadocMojo.java
%doc LICENSE NOTICE
%changelog
+* Fri Apr 10 2015 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.10.3-1
+- Update to upstream version 2.10.3
+
* Wed Mar 18 2015 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.10.2-1
- Update to upstream version 2.10.2
diff --git a/sources b/sources
index 57ccb52..ec63b47 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-72360fcde53e9b556add0e7f5a992541 maven-javadoc-plugin-2.10.2-source-release.zip
+42a78a3d790c737f46d930db97db025c maven-javadoc-plugin-2.10.3-source-release.zip
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/maven-javadoc-plugin.git/commit/?h=master&id=1f076d1d1eba46500228056f1f4dfd00a99a3af0
More information about the scm-commits
mailing list