diff --git a/.cvsignore b/.cvsignore index e1121d1..c0a75ef 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -maven-javadoc-plugin-2.4.tar.lzma +maven-javadoc-plugin-2.7.tar.xz diff --git a/doxia-update.patch b/doxia-update.patch deleted file mode 100644 index 7f1eb59..0000000 --- a/doxia-update.patch +++ /dev/null @@ -1,71 +0,0 @@ -Index: src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java -=================================================================== ---- src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java (revision 927422) -+++ src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java (working copy) -@@ -19,6 +19,7 @@ - * under the License. - */ - -+import org.apache.maven.doxia.sink.render.RenderingContext; - import org.apache.maven.doxia.siterenderer.Renderer; - import org.apache.maven.doxia.siterenderer.RendererException; - import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink; -@@ -217,27 +218,25 @@ - public void execute() - throws MojoExecutionException, MojoFailureException - { -- try -- { -- SiteRendererSink sink = siteRenderer.createSink( getReportOutputDirectory(), getOutputName() + ".html" ); -+ try -+ { -+ RenderingContext context = new RenderingContext( outputDirectory, getOutputName() + ".html" ); -+ SiteRendererSink sink = new SiteRendererSink( context ); -+ Locale locale = Locale.getDefault(); -+ generate( sink, locale ); -+ } -+ catch ( MavenReportException e ) -+ { - -- generate( sink, Locale.getDefault() ); -- } -- catch ( RendererException e ) -- { -- throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH ) -- + " report generation:" + e.getMessage(), e ); -- } -- catch ( IOException e ) -- { -- throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH ) -- + " report generation:" + e.getMessage(), e ); -- } -- catch ( MavenReportException e ) -- { -- throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH ) -- + " report generation:" + e.getMessage(), e ); -- } -+ getLog().error( "An error has occurred in " + getName( Locale.ENGLISH ) -+ + " report generation:" + e.getMessage(), e ); -+ } -+ catch ( RuntimeException e ) -+ { -+ -+ getLog().error( e.getMessage(), e ); -+ } -+ - } - - /** -@@ -250,4 +249,12 @@ - { - return ResourceBundle.getBundle( "javadoc-report", locale, getClass().getClassLoader() ); - } -+ -+ public void generate(org.apache.maven.doxia.sink.Sink sink, Locale locale) -+ throws MavenReportException { -+ outputDirectory = getReportOutputDirectory(); -+ -+ executeReport( locale ); -+ -+ } - } diff --git a/maven-javadoc-plugin.spec b/maven-javadoc-plugin.spec index 196e4f8..3c1fe9d 100644 --- a/maven-javadoc-plugin.spec +++ b/maven-javadoc-plugin.spec @@ -1,35 +1,38 @@ -%global bootstrap 1 +%global bootstrap 0 Name: maven-javadoc-plugin -Version: 2.4 -Release: 2%{?dist} +Version: 2.7 +Release: 1%{?dist} Summary: Maven Javadoc Plugin Group: Development/Libraries License: ASL 2.0 URL: http://maven.apache.org/plugins/maven-javadoc-plugin -# svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-javadoc-plugin-2.4 -# tar --lzma cvf maven-javadoc-plugin-2.4.tar.lzma maven-javadoc-plugin-2.4/ -Source0: %{name}-%{version}.tar.lzma -Patch0: doxia-update.patch +# svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-javadoc-plugin-2.7 +# tar caf maven-javadoc-plugin-2.7.tar.xz maven-javadoc-plugin-2.7/ +Source0: %{name}-%{version}.tar.xz +Patch0: remove-test-deps.patch Patch1: pom.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: maven2 -BuildRequires: maven2-plugin-clean -BuildRequires: maven2-plugin-compiler -BuildRequires: maven2-plugin-install -BuildRequires: maven2-plugin-jar -BuildRequires: maven2-plugin-plugin -BuildRequires: maven2-plugin-resources -BuildRequires: maven2-plugin-surefire +BuildRequires: maven-clean-plugin +BuildRequires: maven-compiler-plugin +BuildRequires: maven-install-plugin +BuildRequires: maven-jar-plugin +BuildRequires: maven-plugin-plugin +BuildRequires: maven-resources-plugin +BuildRequires: maven-surefire-maven-plugin BuildRequires: maven-doxia-sitetools BuildRequires: maven-shared-plugin-testing-harness +BuildRequires: maven-shade-plugin +BuildRequires: plexus-interactivity %if ! %{bootstrap} -BuildRequires: maven2-plugin-javadoc +BuildRequires: maven-javadoc-plugin %endif Requires: jpackage-utils +Requires: maven2 Requires(post): jpackage-utils Requires(postun): jpackage-utils @@ -55,11 +58,14 @@ API documentation for %{name}. %prep %setup -q -# Add doxia-logging-api to the dependencies %patch0 # Update source for use with newer doxia %patch1 +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 + +sed -i -e "s|model>|models>|g" pom.xml + %build export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository mvn-jpp \ @@ -125,6 +131,9 @@ rm -rf target/site/api* %endif %changelog +* Wed Jul 21 2010 Alexander Kurtakov 2.7-1 +- Update to 2.7. + * Fri May 7 2010 Mary Ellen Foster - 2.4-2 - Add jpackage-utils requirements - Update requirements of javadoc subpackage diff --git a/pom.patch b/pom.patch index 6943d96..7992f63 100644 --- a/pom.patch +++ b/pom.patch @@ -1,24 +1,14 @@ -Index: pom.xml -=================================================================== ---- pom.xml (revision 927422) -+++ pom.xml (working copy) -@@ -112,6 +112,11 @@ - doxia-sink-api - ${doxiaVersion} +--- pom.xml.sav 2010-07-21 15:03:28.000000000 +0300 ++++ pom.xml 2010-07-21 15:07:09.415984958 +0300 +@@ -203,6 +203,11 @@ under the License. + plexus-utils + 1.5.8 + -+ org.apache.maven.doxia -+ doxia-logging-api -+ ${doxiaVersion} ++ org.codehaus.plexus ++ plexus-interactivity-api ++ 1.0 + - - -@@ -134,6 +139,7 @@ - - - -+ - - + diff --git a/remove-test-deps.patch b/remove-test-deps.patch new file mode 100644 index 0000000..8953d15 --- /dev/null +++ b/remove-test-deps.patch @@ -0,0 +1,28 @@ +--- pom.xml.sav 2010-07-19 17:00:50.000000000 +0300 ++++ pom.xml 2010-07-19 17:24:35.896986800 +0300 +@@ -212,12 +212,6 @@ under the License. + test + + +- junit-addons +- junit-addons +- 1.4 +- test +- +- + org.apache.maven.plugin-testing + maven-plugin-testing-harness + 1.2 +@@ -230,12 +224,6 @@ under the License. + test + + +- org.mortbay.jetty +- jetty-client +- 6.1.19 +- test +- +- + org.apache.maven.shared + maven-common-artifact-filters + 1.2 diff --git a/sources b/sources index 38593d5..8f47c51 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -933ed96b0980038b0b43583790610a09 maven-javadoc-plugin-2.4.tar.lzma +bc81f1aa7bf6e6c25f821de3cf62536e maven-javadoc-plugin-2.7.tar.xz