From 106bf31e0baa15585d47fbda20f58361762f0efe Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Jun 13 2016 06:33:59 +0000
Subject: Update to upstream version 2.10.4


---

diff --git a/.gitignore b/.gitignore
index f2c74c4..6eb55d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ maven-javadoc-plugin-2.8.1-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
+/maven-javadoc-plugin-2.10.4-source-release.zip
diff --git a/doxia-sitetools-1.6.patch b/doxia-sitetools-1.6.patch
index 10fa452..61ca893 100644
--- a/doxia-sitetools-1.6.patch
+++ b/doxia-sitetools-1.6.patch
@@ -1,11 +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
+--- src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java~
++++ src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
 @@ -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;
+ 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 ee37e9d..8b98af0 100644
--- a/maven-javadoc-plugin.spec
+++ b/maven-javadoc-plugin.spec
@@ -1,6 +1,6 @@
 Name:           maven-javadoc-plugin
-Version:        2.10.3
-Release:        3%{?dist}
+Version:        2.10.4
+Release:        1%{?dist}
 Summary:        Maven Javadoc Plugin
 License:        ASL 2.0
 URL:            http://maven.apache.org/plugins/maven-javadoc-plugin
@@ -88,6 +88,9 @@ rm -f src/main/java/org/apache/maven/plugin/javadoc/*FixJavadocMojo.java
 %doc LICENSE NOTICE 
 
 %changelog
+* Mon Jun 13 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.10.4-1
+- Update to upstream version 2.10.4
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.10.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
diff --git a/reduce-exceptions.patch b/reduce-exceptions.patch
index 115d809..ed5e870 100644
--- a/reduce-exceptions.patch
+++ b/reduce-exceptions.patch
@@ -1,13 +1,13 @@
---- src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java~	2015-03-18 05:08:28.705580671 +0100
-+++ src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java	2015-03-18 05:08:33.398510806 +0100
-@@ -3407,10 +3407,6 @@
-             throw new MavenReportException( "Unable to build the Maven project for the artifact:" + javadocArtifact,
-                                             e );
-         }
--        catch ( InvalidDependencyVersionException e )
--        {
--            throw new MavenReportException( "Unable to resolve artifact:" + javadocArtifact, e );
--        }
-     }
- 
-     /**
+--- src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java~
++++ src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
+@@ -3457,10 +3457,6 @@
+             throw new MavenReportException( "Unable to build the Maven project for the artifact:" + javadocArtifact,
+                                             e );
+         }
+-        catch ( InvalidDependencyVersionException e )
+-        {
+-            throw new MavenReportException( "Unable to resolve artifact:" + javadocArtifact, e );
+-        }
+     }
+ 
+     /**
diff --git a/sources b/sources
index ec63b47..8aa5df7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-42a78a3d790c737f46d930db97db025c  maven-javadoc-plugin-2.10.3-source-release.zip
+6a3beb48395eca558b188ae112f1d450  maven-javadoc-plugin-2.10.4-source-release.zip