[maven-javadoc-plugin] Update to latest upstream version.

Alexander Kurtakov akurtakov at fedoraproject.org
Tue Oct 23 18:29:20 UTC 2012


commit 06578240c68b20026ded33c699f612fb78999b0b
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Tue Oct 23 21:29:11 2012 +0300

    Update to latest upstream version.

 .gitignore                        |    1 +
 maven-javadoc-plugin-compat.patch |   16 ----------------
 maven-javadoc-plugin.spec         |   19 +++++++++----------
 pom.patch                         |   14 --------------
 reduce-exceptions.patch           |   10 +++++-----
 remove-test-deps.patch            |   27 ---------------------------
 sources                           |    2 +-
 7 files changed, 16 insertions(+), 73 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4ea39b0..7b53797 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 maven-javadoc-plugin-2.7.tar.xz
 /maven-javadoc-plugin-2.8-source-release.zip
 maven-javadoc-plugin-2.8.1-source-release.zip
+/maven-javadoc-plugin-2.9-source-release.zip
diff --git a/maven-javadoc-plugin.spec b/maven-javadoc-plugin.spec
index c9fadc9..171258c 100644
--- a/maven-javadoc-plugin.spec
+++ b/maven-javadoc-plugin.spec
@@ -1,18 +1,15 @@
 %global bootstrap 0
 
 Name:           maven-javadoc-plugin
-Version:        2.8.1
-Release:        2%{?dist}
+Version:        2.9
+Release:        1%{?dist}
 Summary:        Maven Javadoc Plugin
 
 Group:          Development/Libraries
 License:        ASL 2.0
 URL:            http://maven.apache.org/plugins/maven-javadoc-plugin
 Source0:        http://repo1.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip
-Patch0:         remove-test-deps.patch
-Patch1:         pom.patch
-Patch2:         reduce-exceptions.patch
-Patch3:         %{name}-compat.patch
+Patch0:         reduce-exceptions.patch
 
 BuildRequires:  maven
 BuildRequires:  maven-clean-plugin
@@ -60,11 +57,10 @@ API documentation for %{name}.
 
 %prep
 %setup -q 
-%patch0 -b .sav
 # Update source for use with newer doxia
-%patch1
-%patch2
-%patch3 -p1
+%patch0
+
+%pom_add_dep org.codehaus.plexus:plexus-interactivity-api
 
 sed -i -e "s|org.apache.maven.doxia.module.xhtml.decoration.render|org.apache.maven.doxia.sink.render|g" src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
 
@@ -108,6 +104,9 @@ rm -rf target/site/api*
 %endif
 
 %changelog
+* Tue Oct 23 2012 Alexander Kurtakov <akurtako at redhat.com> 2.9-1
+- Update to latest upstream version.
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/reduce-exceptions.patch b/reduce-exceptions.patch
index 621cc76..007e800 100644
--- a/reduce-exceptions.patch
+++ b/reduce-exceptions.patch
@@ -1,8 +1,8 @@
---- src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java.sav	2011-05-02 00:47:50.000000000 +0300
-+++ src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java	2011-12-06 00:05:38.472592169 +0200
-@@ -3238,10 +3238,6 @@ public abstract class AbstractJavadocMoj
-             throw new MavenReportException( "Unable to build the Maven project for the artifact:"
-                 + javadocArtifact, e );
+--- src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java.orig	2012-09-18 21:03:38.000000000 +0300
++++ src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java	2012-10-23 21:24:31.496976609 +0300
+@@ -3310,10 +3310,6 @@ public abstract class AbstractJavadocMoj
+             throw new MavenReportException( "Unable to build the Maven project for the artifact:" + javadocArtifact,
+                                             e );
          }
 -        catch ( InvalidDependencyVersionException e )
 -        {
diff --git a/sources b/sources
index 00f2fcd..b963d76 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3d48bf74e955b01798bf262d379e673a  maven-javadoc-plugin-2.8.1-source-release.zip
+0b0362a03ab6a71c58afffbb08027160  maven-javadoc-plugin-2.9-source-release.zip


More information about the scm-commits mailing list