rpms/maven2/devel maven2-MNG-3139.patch, NONE, 1.1 maven2-plugins-javadoc-newdoxia.patch, NONE, 1.1 maven2-plugins-jpprepolayout.patch, NONE, 1.1 maven2-plugins-project-info-reports-jdkversion.patch, NONE, 1.1 maven2-sourcetarget.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 maven2-plugins-doxiaupdatefix.patch, 1.1, 1.2 maven2.spec, 1.21, 1.22 sources, 1.3, 1.4

Andrew Overholt overholt at fedoraproject.org
Mon Aug 24 19:12:58 UTC 2009


Author: overholt

Update of /cvs/pkgs/rpms/maven2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5517

Modified Files:
	.cvsignore maven2-plugins-doxiaupdatefix.patch maven2.spec 
	sources 
Added Files:
	maven2-MNG-3139.patch maven2-plugins-javadoc-newdoxia.patch 
	maven2-plugins-jpprepolayout.patch 
	maven2-plugins-project-info-reports-jdkversion.patch 
	maven2-sourcetarget.patch 
Log Message:
* Fri Aug 21 2009 Andrew Overholt <overholt at redhat.com> 2.0.8-1.2
- Import 2.0.8 work from Deepak Bhole:
-- Fix maven-remote-resources-plugin
-- Handle artifacts other than just poms and jars
-- Cope with empty version XML tags
-- Prevent unecessary files to end up in lib
-- Fix handling of RELEASE versions
-- Added BR for java-devel
-- Fixed artifact path setting code for upstream group/artifactids
- Import these fixes from Permaine Cheung:
-- Change maven-archiver to maven-shared-archiver
-- Move misplaced Requires: maven-archiver back to maven2-plugin-jar
-- Add missing Requires: maven-archiver to maven2-plugin-jar
-- Add missing Requires: ant to maven2-plugin-ant
-- Add missing Requires: maven-shared-plugin-tools-beanshell, 
   maven-shared-plugin-tools-java to maven2-plugin-docck and
   maven2-plugin-plugin
-- Add missing Requires: to maven2-plugin-install
- Import these fixes from Yong Yang:
-- add maven2-plugins-jpprepolayout.patch
-- Add missing BR xom
-- Add missing BR maven-shared-io in non-bootstrap mode
-- Add missing Requires xom
-- Add missing Requires: maven-enforcer-rule-api in non-bootstrap mode
-- Add missing Requires: maven-shared-invoker in non-bootstrap mode
-- Add missing Requires: maven-shared-io in non-bootstrap mode
-- Add missing Requires: maven-shared-jar in non-bootstrap mode
-- Add missing Requires: maven-shared-model-converter in non-bootstrap mode
-- Add missing Requires: maven-shared-verifier in non-bootstrap mode
-- Add missing Requires: for all subpackages
- Import these fixes from Fernando Nasser:
-- Project Report Info plugin can't cope with a JAR without a JDK version on it
-- Parent poms sometimes come as type "xml", adjust JPackageRepositoryLayout
-- Test for jar in JPackageRepositoryLayout as pom may not have the
   packaging set
-- Update javadoc plugin to 2.4 to get rid of 2.3 bugs
-- Modify MJAVADOC-137 oatch to exclude part reverted by MJAVADOC-196
-- Add patch for javadoc plugin (MJAVADOC-137)
-- Remove jetty from site plugin dependencies
-- Install the model-all JAR
-- Build model-all.jar for model-v3 needed by maven-shared-model-converter
-- Add missing BRs in non-bootstrap mode:
-- Add missing BR maven-embedder
-- Add missing BR maven-shared-dependency-analyzer
-- Add missing BR maven-shared-dependency-tree
-- Add missing BR maven-shared-downloader
-- Add missing BR maven-enforcer-rule-api
-- Add missing BR maven-shared-invoker
-- Add missing BR maven-shared-jar
-- Add missing BR maven-shared-model-converter
-- Add missing BR maven-shared-plugin-testing-tools
-- Add missing BR maven-shared-plugin-tools-api
-- Add missing BR maven-shared-plugin-tools-beanshell
-- Add missing BR maven-shared-plugin-tools-java
-- Add missing BR maven-shared-reporting-impl
-- Add missing BR maven-shared-verifier
-- Add missing BR maven2-plugin-ant
-- Add missing BR maven2-plugin-clean
-- Add missing BR plexus-mail-sender
-- Add missing BR plexus-resources
-- Add missing BRs in non-bootstrap mode:
-- Add missing BR maven-doxia-sitetools
-- Add missing BR maven-surefire-provider-junit
-- Add missing BR maven2-plugin-shade in non-bootstrap mode
-- Add missing BR plexus-digest in non-bootstrap mode
-- Add missing BR  maven-shared-common-artifact-filters
-- Add missing BR  maven-shared-repository-builder
-- Rebuild with plexus-archiver rolled back to a7 to avoid compilation errors
-- Adapt for commons-logging 1.1
-- Specify source and target 1.4
-- Add missing BRs to ant-nodeps, ant-junit, aqute-bndlib and javamail
-- Remove extra maven- from maven-shared poms and jars in bootstrap binaries
-- Require newer version of plexus-archiver to match maven-archiver
-- Move maven-doxia to outside the bootstrap condition
-- Add missing BR saxpath
- Import these fixes from David Walluck:
-- add patch for MNG-3139

maven2-MNG-3139.patch:
 DefaultRepositoryMetadataManager.java |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE maven2-MNG-3139.patch ---
--- maven2/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java	2008/03/24 20:05:11	640549
+++ maven2/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java	2009/02/24 20:07:37	747533
@@ -195,8 +195,7 @@
             ArtifactRepositoryPolicy policy =
                 metadata.isSnapshot() ? repository.getSnapshots() : repository.getReleases();
 
-            if ( ( policy.isEnabled() && !repository.isBlacklisted() )
-                && ( loadMetadata( metadata, repository, localRepository, previousMetadata ) ) )
+            if ( policy.isEnabled() && loadMetadata( metadata, repository, localRepository, previousMetadata ) )
             {
                 metadata.setRepository( repository );
                 selected = repository;

maven2-plugins-javadoc-newdoxia.patch:
 JavadocReport.java |   17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

--- NEW FILE maven2-plugins-javadoc-newdoxia.patch ---
--- maven2-plugins/maven-javadoc-plugin-2.4/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java.orig	2009-01-31 12:28:40.393331000 -0500
+++ maven2-plugins/maven-javadoc-plugin-2.4/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java	2009-01-31 18:17:01.921601000 -0500
@@ -26,6 +26,7 @@
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.reporting.MavenReport;
 import org.apache.maven.reporting.MavenReportException;
+import org.apache.maven.doxia.module.xhtml.decoration.render.RenderingContext;
 import org.codehaus.doxia.sink.Sink;
 import org.codehaus.plexus.util.StringUtils;
 
@@ -219,24 +220,18 @@
     {
         try
         {
-            SiteRendererSink sink = siteRenderer.createSink( getReportOutputDirectory(), getOutputName() + ".html" );
-
+            RenderingContext context = new RenderingContext( outputDirectory, getOutputName() + ".html" );
+            SiteRendererSink sink = new SiteRendererSink( context );
             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 )
+        catch ( MavenReportException e )
         {
             throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH )
                 + " report generation:" + e.getMessage(), e );
         }
-        catch ( MavenReportException e )
+        catch ( RuntimeException e )
         {
-            throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH )
-                + " report generation:" + e.getMessage(), e );
+            getLog().error( e.getMessage(), e );
         }
     }
 

maven2-plugins-jpprepolayout.patch:
 maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java |    6 +++++-
 maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java                       |    6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

--- NEW FILE maven2-plugins-jpprepolayout.patch ---
diff -up maven2-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java.sav maven2-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
--- maven2-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java.sav	2007-05-18 09:25:57.000000000 -0400
+++ maven2-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java	2009-05-05 16:38:37.000000000 -0400
@@ -118,7 +118,11 @@ public abstract class AbstractProjectInf
         {
             if ( version == null )
             {
-                version = Artifact.RELEASE_VERSION;
+                if (System.getProperty("maven2.ignore.versions") != null) {
+                    version = "2.0.8";
+                } else {
+                    version = Artifact.RELEASE_VERSION;
+                }
             }
             VersionRange versionSpec = VersionRange.createFromVersionSpec( version );
             artifact = factory.createDependencyArtifact( skin.getGroupId(), skin.getArtifactId(), versionSpec, "jar",
diff -up maven2-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java.sav maven2-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
--- maven2-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java.sav	2009-05-05 16:36:38.000000000 -0400
+++ maven2-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java	2009-05-05 16:36:47.000000000 -0400
@@ -376,7 +376,11 @@ public abstract class AbstractSiteRender
         {
             if ( version == null )
             {
-                version = Artifact.RELEASE_VERSION;
+                if (System.getProperty("maven2.ignore.versions") != null) {
+                    version = "2.0.8";
+                } else {
+                    version = Artifact.RELEASE_VERSION;
+                }
             }
             VersionRange versionSpec = VersionRange.createFromVersionSpec( version );
             artifact = artifactFactory.createDependencyArtifact( skin.getGroupId(), skin.getArtifactId(), versionSpec,

maven2-plugins-project-info-reports-jdkversion.patch:
 DependenciesRenderer.java |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE maven2-plugins-project-info-reports-jdkversion.patch ---
--- maven2-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java.orig	2009-02-05 18:41:35.075639000 -0500
+++ maven2-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java	2009-02-05 18:50:43.416432000 -0500
@@ -372,7 +372,10 @@
 
                         try
                         {
-                            highestjdk = Math.max( highestjdk, Double.parseDouble( jarDetails.getJdkRevision() ) );
+                            String jdkrevision = jarDetails.getJdkRevision();
+                            if (jdkrevision != null) {
+                                highestjdk = Math.max( highestjdk, Double.parseDouble( jdkrevision ) );
+                            }
                         }
                         catch ( NumberFormatException e )
                         {

maven2-sourcetarget.patch:
 pom.xml |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE maven2-sourcetarget.patch ---
--- maven2/pom.xml.orig	2008-12-15 19:25:32.425274000 -0500
+++ maven2/pom.xml	2008-12-15 19:25:38.498479000 -0500
@@ -66,6 +66,10 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
           <version>2.0.2</version>
+          <configuration>
+             <source>1.4</source>
+             <target>1.4</target>
+          </configuration>
         </plugin>
         <plugin>
           <artifactId>maven-assembly-plugin</artifactId>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/maven2/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	24 Aug 2009 17:57:53 -0000	1.3
+++ .cvsignore	24 Aug 2009 19:12:57 -0000	1.4
@@ -6,3 +6,4 @@ maven2-model-v3.jar
 maven2-plugins-060420-src.tar.gz
 maven2-src.tar.gz
 maven2-plugins-070705-src.tar.gz
+maven-javadoc-plugin-2.4-src.tar.gz

maven2-plugins-doxiaupdatefix.patch:
 AntlrHtmlReport.java |   15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

Index: maven2-plugins-doxiaupdatefix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/maven2/devel/maven2-plugins-doxiaupdatefix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- maven2-plugins-doxiaupdatefix.patch	24 Aug 2009 17:57:54 -0000	1.1
+++ maven2-plugins-doxiaupdatefix.patch	24 Aug 2009 19:12:57 -0000	1.2
@@ -1,36 +1,3 @@
---- ./maven2-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java.sav	2007-10-15 16:29:04.000000000 -0400
-+++ ./maven2-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java	2007-10-15 17:15:42.000000000 -0400
-@@ -19,6 +19,7 @@ package org.apache.maven.plugin.javadoc;
-  * under the License.
-  */
- 
-+import org.apache.maven.doxia.module.xhtml.decoration.render.RenderingContext;
- import org.apache.maven.doxia.siterenderer.Renderer;
- import org.apache.maven.doxia.siterenderer.RendererException;
- import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
-@@ -214,20 +215,11 @@ public class JavadocReport
-     {
-         try
-         {
--            SiteRendererSink sink = siteRenderer.createSink( getReportOutputDirectory(), getOutputName() + ".html" );
-+            RenderingContext context = new RenderingContext( getReportOutputDirectory(), getOutputName() + ".html" );
-+            SiteRendererSink sink = new SiteRendererSink( context );
- 
-             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 )
 --- ./maven2-plugins/maven-antlr-plugin/src/main/java/org/apache/maven/plugin/antlr/AntlrHtmlReport.java.sav	2007-10-15 16:27:27.000000000 -0400
 +++ ./maven2-plugins/maven-antlr-plugin/src/main/java/org/apache/maven/plugin/antlr/AntlrHtmlReport.java	2007-10-15 17:15:23.000000000 -0400
 @@ -25,6 +25,7 @@ import java.util.Iterator;


Index: maven2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven2/devel/maven2.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- maven2.spec	24 Aug 2009 17:57:54 -0000	1.21
+++ maven2.spec	24 Aug 2009 19:12:57 -0000	1.22
@@ -46,7 +46,7 @@
 
 Name:           %{name}
 Version:        %{maven_version}
-Release:        1.1%{?dist}
+Release:        1.2%{?dist}
 Epoch:          0
 Summary:        Java project management and project comprehension tool
 
@@ -62,6 +62,12 @@ Source0:        %{name}-src.tar.gz
 # tar czf maven2-plugins-0700705-src.tar.gz maven2-plugins
 Source2:        %{name}-plugins-070705-src.tar.gz
 
+# We need to replace the javadoc plugin as the 2.3-SNAPSHOT included above 
+# has several bugs
+# svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-javadoc-plugin-2.4
+# tar czf maven-javadoc-plugin-2.4-src.tar.gz maven-javadoc-plugin-2.4
+Source22: maven-javadoc-plugin-2.4-src.tar.gz
+
 # No source location for these. They are ascii files generated from maven
 # repositories, and are not in cvs/svn
 # The files were originally aquired from: http://repo1.maven.org/maven2/
@@ -109,13 +115,22 @@ Patch8:         %{name}-enable-bootstrap
 Patch9:         %{name}-use-unversioned-classworlds.patch
 Patch10:        %{name}-plugins-disablecobertura.patch
 Patch11:        %{name}-shade-plugin-replacement.patch
+Patch12:        %{name}-sourcetarget.patch
+# javadoc 2.4 uses an old doxia method
+Patch15:        %{name}-plugins-javadoc-newdoxia.patch
+# This plugin can't cope with a JAR without a JDK version on it
+Patch16:        %{name}-plugins-project-info-reports-jdkversion.patch
+Patch17:        %{name}-MNG-3139.patch
+Patch18:	%{name}-plugins-jpprepolayout.patch
 
-BuildRequires:    jpackage-utils >= 0:1.7.2
 BuildRequires:    java-1.6.0-openjdk-devel
+BuildRequires:    jpackage-utils >= 0:1.7.2
 BuildRequires:    /bin/ls,/usr/bin/head,/usr/bin/find,/usr/bin/awk,/bin/grep,/bin/sed
 
 BuildRequires:    ant >= 1.6.5
+BuildRequires:    ant-junit
 BuildRequires:    antlr >= 2.7.4
+BuildRequires:    aqute-bndlib
 BuildRequires:    bsh >= 1.3.0
 #BuildRequires:   cglib >= 2.1.0
 BuildRequires:    checkstyle >= 4.1
@@ -145,6 +160,7 @@ BuildRequires:    junit >= 3.8.2
 BuildRequires:    maven2-common-poms >= 1.0-8
 BuildRequires:    maven-jxr >= 1.0-2
 BuildRequires:    maven-wagon >= 1.0-0.1.b2
+BuildRequires:    maven-doxia >= 1.0-0.a9
 BuildRequires:    nekohtml >= 0.9.3
 BuildRequires:    oro >= 2.0.8
 BuildRequires:    plexus-ant-factory >= 1.0-0.a1.2
@@ -160,11 +176,17 @@ BuildRequires:    pmd >= 3.6
 BuildRequires:    qdox >= 1.5
 BuildRequires:    rhino >= 1.5
 BuildRequires:    saxon-scripts
+BuildRequires:    saxpath
 BuildRequires:    velocity >= 1.4
 BuildRequires:    xerces-j2 >= 2.7.1
 BuildRequires:    xalan-j2 >= 2.6.0
 BuildRequires:    xmlrpc
 BuildRequires:    xmlunit
+BuildRequires:    xom
+
+# FIXME these should be Requires for commons-logging 1.1
+BuildRequires:    avalon-framework
+BuildRequires:    avalon-logkit
 
 %if %{with_itests}
 BuildRequires:    log4j >= 1.2.13
@@ -182,19 +204,41 @@ BuildRequires:    maven2-plugin-jar
 BuildRequires:    maven2-plugin-javadoc
 BuildRequires:    maven2-plugin-plugin
 BuildRequires:    maven2-plugin-resources
+BuildRequires:    maven2-plugin-shade
 BuildRequires:    maven2-plugin-site
 BuildRequires:    maven2-plugin-surefire
-BuildRequires:    maven-archiver
-BuildRequires:    maven-doxia >= 1.0-0.a9
+BuildRequires:    maven-shared-archiver
+BuildRequires:    maven-doxia-sitetools
+BuildRequires:    maven-embedder
 BuildRequires:    maven-scm >= 0:1.0-0.b3.2
 BuildRequires:    maven-scm-test >= 0:1.0-0.b3.2
-BuildRequires:    maven-shared-file-management >= 1.0-4
-BuildRequires:    maven-shared-plugin-testing-harness >= 1.0-4
+BuildRequires:    maven-shared-common-artifact-filters
+BuildRequires:    maven-shared-dependency-analyzer
+BuildRequires:    maven-shared-dependency-tree
+BuildRequires:    maven-shared-downloader
+BuildRequires:    maven-enforcer-rule-api
+BuildRequires:    maven-shared-file-management >= 1.0
+BuildRequires:	  maven-shared-io
+BuildRequires:    maven-shared-plugin-testing-harness >= 1.0
+BuildRequires:    maven-shared-repository-builder
+BuildRequires:    maven-shared-invoker
+BuildRequires:    maven-shared-jar
+BuildRequires:    maven-shared-model-converter
+BuildRequires:    maven-shared-plugin-testing-tools
+BuildRequires:    maven-shared-plugin-tools-api
+BuildRequires:    maven-shared-plugin-tools-beanshell
+BuildRequires:    maven-shared-plugin-tools-java
+BuildRequires:    maven-shared-reporting-impl
+BuildRequires:    maven-shared-verifier
 BuildRequires:    maven-surefire >= 2.0
+BuildRequires:    maven-surefire-provider-junit
 BuildRequires:    maven-surefire-booter >= 2.0
 BuildRequires:    modello >= 1.0-0.a8.3
 BuildRequires:    modello-maven-plugin >= 1.0-0.a8.3
+BuildRequires:    plexus-digest
 BuildRequires:    plexus-maven-plugin >= 1.3.5
+BuildRequires:    plexus-mail-sender
+BuildRequires:    plexus-resources
 %endif
 
 Requires:        ant >= 1.6.5
@@ -257,6 +301,7 @@ Requires:        xerces-j2 >= 2.7.1
 Requires:        xalan-j2 >= 2.6.0
 Requires:        xmlrpc
 Requires:        xmlunit
+Requires:        xom
 
 %if %{without_bootstrap}
 Requires:		 %{name} = %{epoch}:%{version}
@@ -264,8 +309,13 @@ Requires:        maven-doxia >= 1.0-0.a9
 Requires(post):  maven-doxia >= 1.0-0.a9
 Requires:        maven-scm >= 0:1.0-0.b3.2
 Requires:        maven-scm-test >= 0:1.0-0.b3.2
+Requires:        maven-enforcer-rule-api
+Requires:        maven-shared-invoker
+Requires:	 maven-shared-io
 Requires:        maven-shared-file-management >= 1.0-4
-Requires:        maven-shared-plugin-testing-harness >= 1.0-4
+Requires:        maven-shared-jar
+Requires:        maven-shared-model-converter
+Requires:        maven-shared-verifier
 Requires:        maven-surefire >= 2.0
 Requires:        maven-surefire-booter >= 2.0
 Requires:        modello >= 1.0-0.a8.3
@@ -314,6 +364,15 @@ Group:          Development/Documentatio
 %package        plugin-ant
 Summary:        Ant plugin for maven
 Group:          Development/Build Tools
+Requires:       ant >= 1.6.5
+Requires:       ant-junit
+Requires:       ant-nodeps
+Requires:       junit >= 3.8.2
+Requires:       maven-wagon >= 1.0-0.1.b2
+Requires:       plexus-utils >= 1.2
+Requires:       xalan-j2 >= 2.6.0
+Requires:    	xml-commons-apis >= 1.3.02
+Requires:	plexus-container-default
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 
@@ -330,6 +389,13 @@ Generates an Ant build file for the proj
 Summary:        Antlr plugin for maven
 Group:          Development/Build Tools
 Requires:       antlr >= 2.7.4
+Requires:	plexus-container-default
+Requires:       plexus-i18n >= 1.0
+%if %{without_bootstrap}
+Requires:       maven-doxia >= 1.0-0.a9
+Requires:       maven-doxia-sitetools >= 1.0
+%endif
+Requires:       plexus-utils >= 1.2
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 
@@ -346,8 +412,10 @@ Generates sources from an Antlr grammar.
 Summary:        Antrun plugin for maven
 Group:          Development/Build Tools
 Requires:       ant >= 1.6.5
+Requires:    	maven-embedder
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
+Requires:    	maven-shared-reporting-impl
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -369,6 +437,18 @@ Requires:       modello >= 1.0-0.a8.3
 %endif
 Requires:       plexus-archiver >= 1.0
 Requires:       plexus-utils >= 1.2
+Requires:    	maven-shared-file-management >= 1.0
+Requires:    	maven-shared-archiver
+Requires:	plexus-container-default
+Requires:    	maven-shared-repository-builder
+Requires:    	maven-shared-common-artifact-filters
+Requires:	maven-shared-plugin-testing-tools
+Requires:	maven-shared-test-tools
+Requires:       jmock >= 1.0.1
+Requires:       jdom >= 1.0
+Requires:       jaxen >= 1.1
+Requires:    	saxpath
+Requires:       junit >= 3.8.2
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -387,6 +467,10 @@ Requires:       maven-scm
 %endif
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
+Requires:       maven-doxia >= 1.0-0.a9
+Requires:       maven-doxia-sitetools >= 1.0
+Requires:       maven-scm >= 0:1.0-0.b3.2
+Requires:    	maven-shared-reporting-impl
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -403,11 +487,18 @@ Summary:        Changes plugin for maven
 Group:          Development/Build Tools
 %if %{without_bootstrap}
 Requires:       maven-doxia
+Requires:       maven-doxia-sitetools >= 1.0
 %endif
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 Requires:       velocity
 Requires:       commons-httpclient
+Requires:       plexus-velocity >= 1.1.2
+Requires:       plexus-mail-sender
+Requires:       glassfish-javamail
+Requires:       jakarta-commons-lang
+Requires:       velocity
+Requires:    	maven-shared-reporting-impl
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -423,10 +514,13 @@ occured between different releases of yo
 Summary:        Checkstyle plugin for maven
 Group:          Development/Build Tools
 Requires:       checkstyle >= 4.1
+Requires:	checkstyle-optional >= 4.1
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 Requires:       plexus-utils >= 1.2
 Requires:       plexus-velocity >= 1.1.2
+Requires:       plexus-resources
+Requires:    	maven-shared-reporting-impl
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -465,6 +559,9 @@ Requires:       junit >= 3.8.2
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 Requires:       plexus-compiler >= 1.5.1
+Requires:       plexus-resources
+Requires:       clover
+Requires:    	maven-shared-reporting-impl
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -502,6 +599,12 @@ Requires:       maven2 = %{epoch}:%{vers
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 Requires:       plexus-archiver >= 1.0
 Requires:       plexus-utils >= 1.2
+Requires:       maven-shared-file-management >= 1.0-4
+Requires:       junit >= 3.8.2
+Requires:       plexus-container-default
+Requires:       maven-shared-dependency-analyzer
+Requires:       maven-shared-dependency-tree
+
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -553,6 +656,13 @@ Group:          Development/Build Tools
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 Requires:       plexus-utils
+Requires:       maven-shared-plugin-tools-beanshell >= 2.2
+Requires:       maven-shared-plugin-tools-java >= 2.2
+Requires:       commons-httpclient
+Requires:       jakarta-commons-logging >= 1.0.4
+Requires:       maven-shared-file-management >= 1.0-4
+Requires:       maven-shared-plugin-tools-api
+Requires:    	maven-shared-reporting-impl
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -571,6 +681,8 @@ Group:          Development/Build Tools
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 Requires:       plexus-utils >= 1.2
+Requires:       maven-shared-verifier
+Requires:       xmlunit
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -588,6 +700,15 @@ Group:          Development/Build Tools
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 Requires:       plexus-utils >= 1.2
+Requires:       plexus-archiver >= 1.0
+Requires:       jmock >= 1.0.1
+Requires:       jdom >= 1.0
+Requires:       jaxen >= 1.1
+Requires:    	saxpath
+Requires:       plexus-interactivity >= 1.0
+Requires:	maven-shared-plugin-testing-tools
+Requires:	maven-shared-test-tools
+Requires:       aqute-bndlib
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -625,6 +746,7 @@ Requires:       maven-shared
 %endif
 Requires:       plexus-utils
 Requires:       bsh
+Requires:       maven-enforcer-rule-api
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -644,6 +766,8 @@ Requires:       maven2 = %{epoch}:%{vers
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 Requires:       jakarta-commons-lang
 Requires:       plexus-utils
+Requires:       jakarta-commons-lang
+Requires:       junit >= 3.8.2
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -660,6 +784,7 @@ Summary:        Help plugin for maven
 Group:          Development/Build Tools
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
+Requires:       maven-shared-plugin-tools-api
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -679,6 +804,7 @@ Requires:       maven2 = %{epoch}:%{vers
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 Requires:       maven-wagon >= 1.0-0.1.b2
 Requires:       plexus-utils >= 1.2
+Requires:       jmock >= 1.0.1
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -694,6 +820,7 @@ Creates/updates an IDEA workspace for th
 %package        plugin-install
 Summary:        Install plugin for maven
 Group:          Development/Build Tools
+Requires:       plexus-digest >= 1.0
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 
@@ -713,6 +840,9 @@ Requires:       maven2 = %{epoch}:%{vers
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 %if %{without_bootstrap}
 Requires:       maven-shared
+Requires:       maven-shared-invoker
+Requires:       maven-shared-file-management >= 1.0-4
+Requires:	maven-shared-io
 %endif
 Requires:       bsh
 
@@ -732,7 +862,9 @@ Summary:        Jar plugin for maven
 Group:          Development/Build Tools
 Requires:       jakarta-commons-lang >= 2.1
 Requires:       maven2 = %{epoch}:%{version}-%{release}
+Requires:       maven-shared-archiver >= 2.3
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
+Requires:       plexus-utils >= 1.2
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -754,6 +886,8 @@ Requires(postun): maven2 = %{epoch}:%{ve
 Requires:       modello >= 1.0-0.a8.3
 %endif
 Requires:       plexus-archiver >= 1.0
+Requires:       plexus-utils >= 1.2
+Requires:    	maven-shared-reporting-impl
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -772,6 +906,8 @@ Requires:       maven2 = %{epoch}:%{vers
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 Requires:       plexus-archiver >= 1.0
 Requires:       plexus-utils >= 1.2
+Requires:       junit >= 3.8.2
+Requires:       maven-shared-model-converter
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -788,6 +924,12 @@ Summary:        Plugin plugin for maven
 Group:          Development/Build Tools
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
+Requires:       maven-shared-plugin-tools-beanshell >= 2.2
+Requires:       maven-shared-plugin-tools-java >= 2.2
+Requires:    	maven-shared-reporting-impl
+Requires:       maven-doxia >= 1.0-0.a9
+Requires:       plexus-utils >= 1.2
+Requires:       plexus-container-default
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -806,7 +948,11 @@ Group:          Development/Build Tools
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 Requires:       plexus-utils >= 1.2
+Requires:       plexus-resources
 Requires:       pmd >= 3.3
+Requires:       jaxen >= 1.1
+Requires:       xom
+Requires:    	maven-shared-reporting-impl
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -826,6 +972,13 @@ Requires:       jakarta-commons-validato
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 Requires:       plexus-i18n >= 1.0
+Requires:    	maven-shared-reporting-impl
+Requires:       maven-shared-jar
+Requires:       maven-shared-dependency-tree
+Requires:       maven-wagon
+Requires:       maven-scm >= 0:1.0-0.b3.2
+Requires:       maven-doxia >= 1.0-0.a9
+Requires:       maven-doxia-sitetools >= 1.0
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -863,6 +1016,7 @@ Requires:       plexus-velocity
 Requires:       velocity
 %if %{without_bootstrap}
 Requires:       maven-shared
+Requires:       maven-shared-downloader
 Requires:       plexus-resources
 %endif
 
@@ -897,7 +1051,8 @@ Plugin to help with repository-based tas
 %package        plugin-resources
 Summary:        Resources plugin for maven
 Group:          Development/Build Tools
-Requires:       jakarta-commons-io >= 1.1
+#Requires:       jakarta-commons-io >= 1.1
+Requires:       plexus-utils >= 1.2
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 
@@ -916,7 +1071,8 @@ Group:          Development/Build Tools
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 %if %{without_bootstrap}
-Requires:       maven-doxia >= 1.0
+Requires:       maven-doxia >= 1.0-0.a9
+Requires:       maven-doxia-sitetools >= 1.0
 %endif
 Requires:       plexus-utils >= 1.2
 
@@ -935,7 +1091,9 @@ Group:          Development/Build Tools
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 Requires:       plexus-archiver >= 1.0
+Requires:       plexus-utils >= 1.2
 Requires:       plexus-container-default >= 1.0
+Requires:       junit >= 3.8.2
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -945,6 +1103,7 @@ Requires(postun):    java-gcj-compat
 
 %description    plugin-source
 Builds a JAR of sources for use in IDEs and distribution to the repository.
+
 %package        plugin-stage
 Summary:        Stage plugin for maven
 Group:          Development/Build Tools
@@ -952,6 +1111,7 @@ Requires:       maven2 = %{epoch}:%{vers
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 Requires:       maven-wagon
 Requires:       plexus-utils
+Requires:       junit >= 3.8.2
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -989,6 +1149,7 @@ Group:          Development/Build Tools
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 Requires:       plexus-utils >= 1.2
+Requires:       junit >= 3.8.2
 
 %if %{gcj_support}
 BuildRequires:       java-gcj-compat-devel
@@ -1005,12 +1166,29 @@ Builds a WAR from the current project.
 # Extract the plugins
 tar xzf %{SOURCE2}
 
+# We need to replace the javadoc plugin as the 2.3-SNAPSHOT included above 
+# has several bugs
+rm -rf maven2-plugins/maven-javadoc-plugin
+pushd maven2-plugins
+tar xzf %{SOURCE22}
+popd
+
 # Use an older version of site plugin because newer one requires newer doxia 
 # (1.0a8) which is not compatible with the older one (1.0a7) which is needed 
 # by other parts of maven
 #rm -rf maven2-plugins/maven-site-plugin
 #tar xzf %{SOURCE8}
 
+# javadoc 2.4 uses an old doxia method
+%patch15 -b .sav
+
+# This plugin can't cope with a JAR without a JDK version on it
+%patch16 -b .sav
+
+%patch17 -b .sav
+
+%patch18 -b .sav
+
 # Remove dependencies on org.codehaus.doxia.* (it is now
 # org.apache.maven.doxia, and in the interest of maintaining just one
 # doxia jar, we substitute things accordingly)
@@ -1018,7 +1196,7 @@ tar xzf %{SOURCE2}
 for i in    maven2-plugins/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/FileActivityReport.java \
             maven2-plugins/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java \
             maven2-plugins/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/DeveloperActivityReport.java \
-            maven2-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java \
+            maven2-plugins/maven-javadoc-plugin-2.4/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java \
             maven2-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java \
             maven2/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/MavenReport.java \
             maven2-plugins/maven-antlr-plugin/src/main/java/org/apache/maven/plugin/antlr/AntlrHtmlReport.java \
@@ -1058,6 +1236,7 @@ done
 %patch9 -b .sav
 %patch10 -b .sav
 %patch11 -b .sav
+%patch12 -b .sav
 
 # FIXME: Maven eclipse plugin tests are disabled for now, until a way
 # is found to stop it from connecting to the web despite offline mode.
@@ -1121,6 +1300,9 @@ cp -p %{SOURCE13} m2_repo/repository/JPP
 cp -p %{SOURCE14} m2_repo/repository/JPP/maven2/empty-dep.jar
 
 %build
+# Fix maven-remote-resources-plugin
+# we now use plexus-velocity 1.1.7 which has the correct descriptor with a hint.
+rm -f maven2-plugins/maven-remote-resources-plugin/src/main/resources/META-INF/plexus/components.xml
 
 # Wire in jdom dependency
 cp -p maven2/maven-artifact/pom.xml maven2/maven-artifact/pom.xml.withoutjdom
@@ -1183,7 +1365,7 @@ cp ../../../../m2_home_local/repository/
 cp ../../../../m2_home_local/repository/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar jtidy.jar
 )
 
-build-jar-repository -s -p $M2_HOME/lib jdom maven-wagon/wagon-file maven-wagon/http-lightweight maven-wagon/http-shared maven-wagon/provider-api maven-wagon/ssh maven-wagon/ssh-common maven-wagon/ssh-external
+build-jar-repository -s -p $M2_HOME/lib jdom maven-wagon/file maven-wagon/http-lightweight maven-wagon/http-shared maven-wagon/provider-api maven-wagon/ssh maven-wagon/ssh-common maven-wagon/ssh-external
 %endif
 
 # Build plugins
@@ -1206,11 +1388,21 @@ sed -i -e s:"<module>maven-clover-plugin
 
 # Now build everything
 # FIXME: Need to build in two stages to get around gcj bug that causes plugin reload to fail
-$M2_HOME/bin/mvn -e --batch-mode -s %{maven_settings_file} $MAVEN_OPTS -Dmaven.test.skip=true -npu --no-plugin-registry -fn verify  
+#$M2_HOME/bin/mvn -e --batch-mode -s %{maven_settings_file} $MAVEN_OPTS -Dmaven.test.skip=true -npu --no-plugin-registry -fn verify  
+$M2_HOME/bin/mvn -e --batch-mode -s %{maven_settings_file} $MAVEN_OPTS -Dmaven.test.skip=true -npu --no-plugin-registry verify  
 $M2_HOME/bin/mvn -e --batch-mode -s %{maven_settings_file} $MAVEN_OPTS -Dmaven.test.skip=true -npu --no-plugin-registry --fail-at-end jar:jar install:install
 
 popd >& /dev/null
 
+%if ! %{with_bootstrap}
+# Build model-all JAR  (for model-v3 classes)
+pushd maven2/maven-model >& /dev/null
+
+$M2_HOME/bin/mvn -e -s %{maven_settings_file} $MAVEN_OPTS -P all-models package
+
+popd >& /dev/null
+%endif
+
 # Build complete. Run it tests.
 
 %if %{with_itests}
@@ -1348,6 +1540,9 @@ pushd %{name}
 
         install -m 644 $project/target/$project-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$artifactname-%{version}.jar
 
+        if [ "$project" == "maven-model" ]; then
+          install -m 644 $project/target/$project-%{version}-all.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$artifactname-all-%{version}.jar
+        fi
     done
 popd
 
@@ -2375,8 +2570,6 @@ fi
 
 %files plugin-dependency
 %defattr(-,root,root,-)
-# No longer there in 2.0.8
-#%doc maven2-plugins/maven-dependency-plugin/LICENSE.txt
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/dependency-plugin*.jar
 
@@ -2595,7 +2788,7 @@ fi
 
 %if %{gcj_support}
 %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/remote-resources-plugin.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/remote-resources-plugin*.jar.*
 %endif
 
 
@@ -2675,6 +2868,84 @@ fi
 %endif
 
 %changelog
+* Fri Aug 21 2009 Andrew Overholt <overholt at redhat.com> 2.0.8-1.2
+- Import 2.0.8 work from Deepak Bhole:
+-- Fix maven-remote-resources-plugin
+-- Handle artifacts other than just poms and jars
+-- Cope with empty version XML tags
+-- Prevent unecessary files to end up in lib
+-- Fix handling of RELEASE versions
+-- Added BR for java-devel
+-- Fixed artifact path setting code for upstream group/artifactids
+- Import these fixes from Permaine Cheung:
+-- Change maven-archiver to maven-shared-archiver
+-- Move misplaced Requires: maven-archiver back to maven2-plugin-jar
+-- Add missing Requires: maven-archiver to maven2-plugin-jar
+-- Add missing Requires: ant to maven2-plugin-ant
+-- Add missing Requires: maven-shared-plugin-tools-beanshell, 
+   maven-shared-plugin-tools-java to maven2-plugin-docck and
+   maven2-plugin-plugin
+-- Add missing Requires: to maven2-plugin-install
+- Import these fixes from Yong Yang:
+-- add maven2-plugins-jpprepolayout.patch
+-- Add missing BR xom
+-- Add missing BR maven-shared-io in non-bootstrap mode
+-- Add missing Requires xom
+-- Add missing Requires: maven-enforcer-rule-api in non-bootstrap mode
+-- Add missing Requires: maven-shared-invoker in non-bootstrap mode
+-- Add missing Requires: maven-shared-io in non-bootstrap mode
+-- Add missing Requires: maven-shared-jar in non-bootstrap mode
+-- Add missing Requires: maven-shared-model-converter in non-bootstrap mode
+-- Add missing Requires: maven-shared-verifier in non-bootstrap mode
+-- Add missing Requires: for all subpackages
+- Import these fixes from Fernando Nasser:
+-- Project Report Info plugin can't cope with a JAR without a JDK version on it
+-- Parent poms sometimes come as type "xml", adjust JPackageRepositoryLayout
+-- Test for jar in JPackageRepositoryLayout as pom may not have the
+   packaging set
+-- Update javadoc plugin to 2.4 to get rid of 2.3 bugs
+-- Modify MJAVADOC-137 oatch to exclude part reverted by MJAVADOC-196
+-- Add patch for javadoc plugin (MJAVADOC-137)
+-- Remove jetty from site plugin dependencies
+-- Install the model-all JAR
+-- Build model-all.jar for model-v3 needed by maven-shared-model-converter
+-- Add missing BRs in non-bootstrap mode:
+-- Add missing BR maven-embedder
+-- Add missing BR maven-shared-dependency-analyzer
+-- Add missing BR maven-shared-dependency-tree
+-- Add missing BR maven-shared-downloader
+-- Add missing BR maven-enforcer-rule-api
+-- Add missing BR maven-shared-invoker
+-- Add missing BR maven-shared-jar
+-- Add missing BR maven-shared-model-converter
+-- Add missing BR maven-shared-plugin-testing-tools
+-- Add missing BR maven-shared-plugin-tools-api
+-- Add missing BR maven-shared-plugin-tools-beanshell
+-- Add missing BR maven-shared-plugin-tools-java
+-- Add missing BR maven-shared-reporting-impl
+-- Add missing BR maven-shared-verifier
+-- Add missing BR maven2-plugin-ant
+-- Add missing BR maven2-plugin-clean
+-- Add missing BR plexus-mail-sender
+-- Add missing BR plexus-resources
+-- Add missing BRs in non-bootstrap mode:
+-- Add missing BR maven-doxia-sitetools
+-- Add missing BR maven-surefire-provider-junit
+-- Add missing BR maven2-plugin-shade in non-bootstrap mode
+-- Add missing BR plexus-digest in non-bootstrap mode
+-- Add missing BR  maven-shared-common-artifact-filters
+-- Add missing BR  maven-shared-repository-builder
+-- Rebuild with plexus-archiver rolled back to a7 to avoid compilation errors
+-- Adapt for commons-logging 1.1
+-- Specify source and target 1.4
+-- Add missing BRs to ant-nodeps, ant-junit, aqute-bndlib and javamail
+-- Remove extra maven- from maven-shared poms and jars in bootstrap binaries
+-- Require newer version of plexus-archiver to match maven-archiver
+-- Move maven-doxia to outside the bootstrap condition
+-- Add missing BR saxpath
+- Import these fixes from David Walluck:
+-- add patch for MNG-3139
+
 * Fri Aug 21 2009 Andrew Overholt <overholt at redhat.com> 2.0.8-1.1
 - Import 2.0.8 work from Deepak Bhole
 - Explicitly disable gcj support


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maven2/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	24 Aug 2009 17:57:54 -0000	1.3
+++ sources	24 Aug 2009 19:12:57 -0000	1.4
@@ -6,3 +6,4 @@ a9b9ce42ffbba60eb1833f0a773f7aa7  maven2
 ffd6fcb439b5b7e143a31a4fd5af9902  maven2-src.tar.gz
 b94d6c2bd76523470a39ff7083a253bd  m2_jar_repo.tar.gz
 e1dcb37943da8c0f1767891f00f6dc44  m2_pom_repo.tar.gz
+7e6b7b8d83ae3498fe2c55a999278445  maven-javadoc-plugin-2.4-src.tar.gz




More information about the scm-commits mailing list