[java-sig-commits] [maven-javadoc-plugin] FIx build in pure maven 3 environment.

[Alexander Kurtakov]

commit f392a695a04cfde16c9dd8dc6a8b21f3cfb85d5b
Author: Alexander Kurtakov < <akurtako at redhat.com>
Date:   Tue Dec 6 00:16:42 2011 +0200

    FIx build in pure maven 3 environment.

 maven-javadoc-plugin.spec |   28 ++++++++++++----------------
 reduce-exceptions.patch   |   13 +++++++++++++
 2 files changed, 25 insertions(+), 16 deletions(-)
---
diff --git a/maven-javadoc-plugin.spec b/maven-javadoc-plugin.spec
index 8d70d23..da070b9 100644
--- a/maven-javadoc-plugin.spec
+++ b/maven-javadoc-plugin.spec
@@ -2,7 +2,7 @@
 
 Name:           maven-javadoc-plugin
 Version:        2.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Maven Javadoc Plugin
 
 Group:          Development/Libraries
@@ -11,6 +11,7 @@ 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
 
 BuildRequires:  maven
 BuildRequires:  maven-clean-plugin
@@ -25,6 +26,7 @@ BuildRequires:  maven-plugin-testing-harness
 BuildRequires:  maven-shade-plugin
 BuildRequires:  plexus-interactivity
 BuildRequires:  maven-shared-invoker
+BuildRequires:  maven-enforcer-plugin
 %if ! %{bootstrap}
 BuildRequires:  maven-javadoc-plugin
 %endif        
@@ -32,8 +34,6 @@ BuildRequires:  maven-javadoc-plugin
 Requires:       jpackage-utils
 Requires:       maven
 Requires:       maven-shared-invoker
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
 
 BuildArch: noarch
 
@@ -59,7 +59,8 @@ API documentation for %{name}.
 %setup -q 
 %patch0 -b .sav
 # Update source for use with newer doxia
-#%patch1
+%patch1
+%patch2
 
 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
 
@@ -72,6 +73,7 @@ mvn-rpmbuild \
 %if ! %{bootstrap}
 mvn-rpmbuild \
         -Dmaven.test.skip=true \
+        -Dproject.build.sourceEncoding=UTF-8 \
        javadoc:javadoc
 %endif        
 
@@ -80,12 +82,11 @@ mvn-rpmbuild \
 install -d -m 0755 %{buildroot}%{_javadir}
 install -m 644 target/%{name}-%{version}.jar   %{buildroot}%{_javadir}/%{name}.jar
 
-%add_to_maven_depmap org.apache.maven.plugins maven-javadoc-plugin %{version} JPP maven-javadoc-plugin
-
 # poms
 install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml \
-    %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
 
 %if ! %{bootstrap}
 # javadoc
@@ -94,25 +95,20 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
 rm -rf target/site/api*
 %endif
 
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
 %files
-%defattr(-,root,root,-)
 %{_javadir}/*
 %{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
 
 %if ! %{bootstrap}
 %files javadoc
-%defattr(-,root,root,-)
 %{_javadocdir}/%{name}
 %endif
 
 %changelog
+* Tue Dec 6 2011 Alexander Kurtakov <akurtako at redhat.com> 2.8-2
+- FIx build in pure maven 3 environment.
+
 * Wed May 11 2011 Alexander Kurtakov <akurtako at redhat.com> 2.8-1
 - Update to latest upstream version.
 - Guidelines fixes.
diff --git a/reduce-exceptions.patch b/reduce-exceptions.patch
new file mode 100644
index 0000000..621cc76
--- /dev/null
+++ b/reduce-exceptions.patch
@@ -0,0 +1,13 @@
+--- 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 );
+         }
+-        catch ( InvalidDependencyVersionException e )
+-        {
+-            throw new MavenReportException( "Unable to resolve artifact:" + javadocArtifact, e );
+-        }
+     }
+ 
+     /**