rpms/maven2/devel maven2-2.0.8-excludeexternaljars.patch, NONE, 1.1 maven2-enable-bootstrap-repository.patch, NONE, 1.1 maven2-plugins-catch-uncaught-exceptions.patch, NONE, 1.1 maven2-plugins-dependency-plugin-import-fix.patch, NONE, 1.1 maven2-plugins-disablecobertura.patch, NONE, 1.1 maven2-plugins-doxiaupdatefix.patch, NONE, 1.1 maven2-shade-plugin-replacement.patch, NONE, 1.1 maven2-site-plugin-addservletdep.patch, NONE, 1.1 maven2-use-unversioned-classworlds.patch, NONE, 1.1 maven2-versionless-depmap.xml, NONE, 1.1 .cvsignore, 1.2, 1.3 maven2.spec, 1.20, 1.21 sources, 1.2, 1.3 maven2-MNG-3118.patch, 1.2, NONE maven2-addjdomtobootstrappath.patch, 1.1, NONE maven2-ant17.patch, 1.1, NONE maven2-buildallplugins.patch, 1.1, NONE maven2-commons-cli-1.1.patch, 1.1, NONE maven2-disable-itests.patch, 1.1, NONE maven2-enable-unbuilt-modules.patch, 1.1, NONE maven2-fastjar-manifest-fix.patch, 1.1, NONE maven2-jpprepolayout.patch, 1.1, NONE maven2-noexternaljavadoclinks.patch, 1.1, NONE maven2-plugins-disablecglib.patch, 1.1, NONE maven2-plugins-plexus151.patch, 1.1, NONE

Andrew Overholt overholt at fedoraproject.org
Mon Aug 24 17:57:54 UTC 2009


Author: overholt

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

Modified Files:
	.cvsignore maven2.spec sources 
Added Files:
	maven2-2.0.8-excludeexternaljars.patch 
	maven2-enable-bootstrap-repository.patch 
	maven2-plugins-catch-uncaught-exceptions.patch 
	maven2-plugins-dependency-plugin-import-fix.patch 
	maven2-plugins-disablecobertura.patch 
	maven2-plugins-doxiaupdatefix.patch 
	maven2-shade-plugin-replacement.patch 
	maven2-site-plugin-addservletdep.patch 
	maven2-use-unversioned-classworlds.patch 
	maven2-versionless-depmap.xml 
Removed Files:
	maven2-MNG-3118.patch maven2-addjdomtobootstrappath.patch 
	maven2-ant17.patch maven2-buildallplugins.patch 
	maven2-commons-cli-1.1.patch maven2-disable-itests.patch 
	maven2-enable-unbuilt-modules.patch 
	maven2-fastjar-manifest-fix.patch maven2-jpprepolayout.patch 
	maven2-noexternaljavadoclinks.patch 
	maven2-plugins-disablecglib.patch 
	maven2-plugins-plexus151.patch 
Log Message:
* 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
- Set bootstrap
- Fix up LICENSE.txt files

maven2-2.0.8-excludeexternaljars.patch:
 pom.xml |   28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

--- NEW FILE maven2-2.0.8-excludeexternaljars.patch ---
--- ./maven2/maven-core/pom.xml.sav	2007-12-12 16:21:15.000000000 -0500
+++ ./maven2/maven-core/pom.xml	2007-12-12 16:21:10.000000000 -0500
@@ -39,21 +39,23 @@
                   <exclude>junit:junit</exclude>
                   <exclude>jmock:jmock</exclude>
                   <exclude>xml-apis:xml-apis</exclude>
+                  <exclude>com.jcraft:jsch</exclude>
+                  <exclude>org.codehaus.plexus:plexus-utils</exclude>
+                  <exclude>commons-cli:commons-cli</exclude>
+                  <exclude>org.apache.maven.doxia:doxia-sink-api</exclude>
+                  <exclude>org.apache.maven.wagon:wagon-file</exclude>
+                  <exclude>org.apache.maven.wagon:wagon-http-lightweight</exclude>
+                  <exclude>org.apache.maven.wagon:wagon-http-shared</exclude>
+                  <exclude>org.apache.maven.wagon:wagon-provider-api</exclude>
+                  <exclude>org.apache.maven.wagon:wagon-ssh</exclude>
+                  <exclude>org.apache.maven.wagon:wagon-ssh-common</exclude>
+                  <exclude>org.apache.maven.wagon:wagon-ssh-external</exclude>
+                  <exclude>org.codehaus.plexus:plexus-container-default</exclude>
+                  <exclude>org.codehaus.plexus:plexus-interactivity-api</exclude>
+                  <exclude>jdom:jdom</exclude>
+                  <exclude>jtidy:jtidy</exclude>
                 </excludes>
               </artifactSet>
-              <relocations>
-                <relocation>
-                  <pattern>org.codehaus.plexus.util</pattern>
-                  <excludes>
-                    <exclude>
-                      org.codehaus.plexus.util.xml.Xpp3Dom
-                    </exclude>
-                    <exclude>
-                      org.codehaus.plexus.util.xml.pull.*
-                    </exclude>
-                  </excludes>
-                </relocation>
-              </relocations>
             </configuration>
           </execution>
         </executions>

maven2-enable-bootstrap-repository.patch:
 pom-4.0.0.xml |   21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

--- NEW FILE maven2-enable-bootstrap-repository.patch ---
--- maven2/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml.sav	2008-01-02 19:54:58.000000000 -0500
+++ maven2/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml	2008-01-02 19:56:27.000000000 -0500
@@ -24,6 +24,15 @@ under the License.
 
   <repositories>
     <repository>
+      <id>bootstrap_repo</id>
+      <name>Maven Bootstrap Repository</name>
+      <layout>jpp</layout>
+      <url>file:///usr/share/maven2/bootstrap_repo</url>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </repository>
+    <repository>
       <id>__jpp_repo__</id>
       <name>JPackage Maven Repository</name>
       <layout>jpp</layout>
@@ -48,6 +57,18 @@ under the License.
 
   <pluginRepositories>
      <pluginRepository>
+      <id>bootstrap_repo</id>
+      <name>Maven Bootstrap Plugin Repository</name>
+      <url>file:///usr/share/maven2/bootstrap_repo</url>
+      <layout>jpp</layout>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <releases>
+        <updatePolicy>never</updatePolicy>
+      </releases>
+     </pluginRepository>
+     <pluginRepository>
       <id>__jpp_repo__</id>
       <name>JPackage Maven Plugin Repository</name>
       <url>file:///usr/share/maven2/repository</url>

maven2-plugins-catch-uncaught-exceptions.patch:
 maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtils.java    |    5 +++++
 maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java |    5 +++++
 2 files changed, 10 insertions(+)

--- NEW FILE maven2-plugins-catch-uncaught-exceptions.patch ---
--- maven2-plugins/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java.sav	2007-10-16 10:25:00.000000000 -0400
+++ maven2-plugins/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java	2007-10-16 10:26:27.000000000 -0400
@@ -241,6 +241,11 @@ public abstract class AbstractDependency
             throw new MojoExecutionException( "Error unpacking file: " + file + " to: " + location + "\r\n"
                 + e.toString(), e );
         }
+        catch ( IOException ioe )
+        {   
+            throw new MojoExecutionException( "I/O exception when unpacking file: " + file, ioe );
+        }
+
     }
 
     private void silenceUnarchiver( UnArchiver unArchiver )
--- maven2-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtils.java.sav	2007-10-16 10:23:42.000000000 -0400
+++ maven2-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtils.java	2007-10-16 10:26:51.000000000 -0400
@@ -62,6 +62,11 @@ public final class AssemblyFileUtils
         {
             throw new ArchiveExpansionException( "Error unpacking file: " + source + "to: " + destDir, e );
         }
+        catch ( IOException ioe )
+        {   
+            throw new ArchiveExpansionException( "I/O exception when unpacking file: " + source, ioe );
+        }
+
     }
 
     /**

maven2-plugins-dependency-plugin-import-fix.patch:
 AbstractDependencyMojo.java |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE maven2-plugins-dependency-plugin-import-fix.patch ---
--- maven2-plugins/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java.sav	2007-10-17 17:23:05.000000000 -0400
+++ maven2-plugins/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java	2007-10-17 17:24:49.000000000 -0400
@@ -20,6 +20,7 @@ package org.apache.maven.plugin.dependen
  */
 
 import java.io.File;
+import java.io.IOException;
 import java.lang.reflect.Field;
 import java.util.List;
 

maven2-plugins-disablecobertura.patch:
 maven-dependency-plugin/pom.xml |   15 ---------------
 maven-enforcer-plugin/pom.xml   |   15 ---------------
 2 files changed, 30 deletions(-)

--- NEW FILE maven2-plugins-disablecobertura.patch ---
diff -up ./maven2-plugins/maven-dependency-plugin/pom.xml.sav ./maven2-plugins/maven-dependency-plugin/pom.xml
--- ./maven2-plugins/maven-dependency-plugin/pom.xml.sav	2007-07-04 12:36:14.000000000 -0400
+++ ./maven2-plugins/maven-dependency-plugin/pom.xml	2008-04-03 15:01:06.000000000 -0400
@@ -75,21 +75,6 @@
 		</license>
 	</licenses>
 	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>cobertura-maven-plugin</artifactId>
-				<version>2.0</version>
-				<executions>
-					<execution>
-						<phase>clean</phase>
-						<goals>
-							<goal>clean</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
 		<resources>
 			<!-- Include the apache process LICENSE and NOTICE files.-->
 			<!--uncomment for release. Commented out for now to enable eclipse-plugin to work-->
diff -up ./maven2-plugins/maven-enforcer-plugin/pom.xml.sav ./maven2-plugins/maven-enforcer-plugin/pom.xml
--- ./maven2-plugins/maven-enforcer-plugin/pom.xml.sav	2008-04-03 15:01:20.000000000 -0400
+++ ./maven2-plugins/maven-enforcer-plugin/pom.xml	2008-04-03 15:01:35.000000000 -0400
@@ -53,21 +53,6 @@
 		</license>
 	</licenses>
 	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>cobertura-maven-plugin</artifactId>
-				<version>2.0</version>
-				<executions>
-					<execution>
-						<phase>clean</phase>
-						<goals>
-							<goal>clean</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
 		<resources>
 			<!-- Include super-pom defined main/resources
 			Removing this section will break the build.

maven2-plugins-doxiaupdatefix.patch:
 maven-antlr-plugin/src/main/java/org/apache/maven/plugin/antlr/AntlrHtmlReport.java   |   15 ++--------
 maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java |   14 ++-------
 2 files changed, 7 insertions(+), 22 deletions(-)

--- NEW FILE maven2-plugins-doxiaupdatefix.patch ---
--- ./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;
 import java.util.List;
 import java.util.Locale;
 
+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;
@@ -218,20 +219,12 @@ public class AntlrHtmlReport
     {
         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 );
-        }
-        catch ( IOException e )
-        {
-            throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH )
-                + " report generation.", e );
-        }
         catch ( MavenReportException e )
         {
             throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH )

maven2-shade-plugin-replacement.patch:
 pom.xml |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE maven2-shade-plugin-replacement.patch ---
diff -up ./maven2/maven-core/pom.xml.sav ./maven2/maven-core/pom.xml
--- ./maven2/maven-core/pom.xml.sav	2008-04-07 20:42:34.000000000 -0400
+++ ./maven2/maven-core/pom.xml	2008-04-07 21:26:45.000000000 -0400
@@ -10,9 +10,9 @@
   <build>
     <plugins>
       <plugin>
-	    <groupId>org.codehaus.mojo</groupId>
-        <artifactId>shade-maven-plugin</artifactId>
-        <version>1.0-alpha-13</version>
+	    <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>1.0</version>
         <executions>
           <execution>
             <phase>package</phase>
@@ -28,7 +28,7 @@
                 true
               </keepDependenciesWithProvidedScope>
               <transformers>
-                <transformer implementation="org.codehaus.mojo.shade.resource.ComponentsXmlResourceTransformer" />
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer" />
               </transformers>
               <artifactSet>
                 <excludes>
@@ -196,4 +196,4 @@
       <artifactId>classworlds</artifactId>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>

maven2-site-plugin-addservletdep.patch:
 pom.xml |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE maven2-site-plugin-addservletdep.patch ---
--- ./maven2-plugins/maven-site-plugin/pom.xml.sav	2007-12-17 15:45:29.000000000 -0500
+++ ./maven2-plugins/maven-site-plugin/pom.xml	2007-12-17 15:45:44.000000000 -0500
@@ -190,6 +190,11 @@ under the License.
       <version>6.0.0rc0</version>
     </dependency>
     <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.4</version>
+    </dependency>
+    <dependency>
       <groupId>org.apache.maven.shared</groupId>
       <artifactId>maven-plugin-testing-harness</artifactId>
       <version>1.0-beta-1</version>

maven2-use-unversioned-classworlds.patch:
 mvn |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE maven2-use-unversioned-classworlds.patch ---
--- maven2/maven-core/src/bin/mvn.sav	2008-01-02 19:45:36.000000000 -0500
+++ maven2/maven-core/src/bin/mvn	2008-01-02 19:45:48.000000000 -0500
@@ -160,7 +160,7 @@ fi
 
 exec "$JAVACMD" \
   $MAVEN_OPTS \
-  -classpath "${M2_HOME}"/boot/classworlds-*.jar \
+  -classpath "${M2_HOME}"/boot/classworlds*.jar \
   "-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \
   "-Dmaven.home=${M2_HOME}"  \
   ${CLASSWORLDS_LAUNCHER} $QUOTED_ARGS


--- NEW FILE maven2-versionless-depmap.xml ---
<dependencies>
	<dependency>
		<maven>
			<groupId>commons-collections</groupId>
			<artifactId>commons-collections</artifactId>
			<version>2.1</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>commons-collections</artifactId>
			<version>2.1</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
			<groupId>commons-httpclient</groupId>
			<artifactId>commons-httpclient</artifactId>
			<version>3.0</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>commons-httpclient</artifactId>
			<version>3.0</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
			<groupId>commons-net</groupId>
			<artifactId>commons-net</artifactId>
			<version>1.1.0</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>commons-net</artifactId>
			<version>1.1.0</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
			<groupId>clover</groupId>
			<artifactId>clover</artifactId>
			<version>1.3.11</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>clover</artifactId>
			<version>1.3.11</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
			<groupId>com.cenqua.clover</groupId>
			<artifactId>clover</artifactId>
			<version>1.3.12</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>clover</artifactId>
			<version>1.3.12</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
			<groupId>doxia</groupId>
			<artifactId>doxia-sink-api</artifactId>
			<version>1.0-alpha-4</version>
		</maven>
		<jpp>
			<groupId>JPP/maven-doxia</groupId>
			<artifactId>sink-api</artifactId>
			<version>1.0-alpha-4</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
			<groupId>doxia</groupId>
			<artifactId>doxia-core</artifactId>
			<version>1.0-alpha-4</version>
		</maven>
		<jpp>
			<groupId>JPP/maven-doxia</groupId>
			<artifactId>core</artifactId>
			<version>1.0-alpha-4</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
			<groupId>bsh</groupId>
			<artifactId>bsh</artifactId>
			<version>1.3.0</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>bsh</artifactId>
			<version>1.3.0</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
			<groupId>checkstyle</groupId>
			<artifactId>checkstyle</artifactId>
			<version>4.1</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>checkstyle</artifactId>
			<version>4.1</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
			<groupId>checkstyle</groupId>
			<artifactId>checkstyle-optional</artifactId>
			<version>4.1</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>checkstyle</artifactId>
			<version>1.4</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
			<groupId>oro</groupId>
			<artifactId>oro</artifactId>
			<version>2.0.7</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>oro</artifactId>
			<version>2.0.7</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
			<groupId>commons-beanutils</groupId>
			<artifactId>commons-beanutils</artifactId>
			<version>1.7.0</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>commons-beanutils</artifactId>
			<version>1.7.0</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
			<groupId>commons-beanutils</groupId>
			<artifactId>commons-beanutils-core</artifactId>
			<version>1.7.0</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>commons-beanutils</artifactId>
			<version>1.7.0</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
			<groupId>commons-codec</groupId>
			<artifactId>commons-codec</artifactId>
			<version>1.3</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>commons-codec</artifactId>
			<version>1.3</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
			<groupId>commons-logging</groupId>
			<artifactId>commons-logging-api</artifactId>
			<version>1.0.4</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>commons-logging-api</artifactId>
			<version>1.0.4</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
			<groupId>commons-logging</groupId>
			<artifactId>commons-logging</artifactId>
			<version>1.0.4</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>commons-logging</artifactId>
			<version>1.0.4</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
			<groupId>ant</groupId>
			<artifactId>ant-launcher</artifactId>
			<version>1.6.5</version>
		</maven>
[...3660 lines suppressed...]
            <artifactId>core</artifactId>
            <version>1.0-alpha-15</version>
        </jpp>
        </dependency>

        <dependency>
        <maven>
            <groupId>org.codehaus.modello</groupId>
            <artifactId>modello-site</artifactId>
            <version>1.0-alpha-15</version>
        </maven>
        <jpp>
            <groupId>JPP/modello</groupId>
            <artifactId>site</artifactId>
            <version>1.0-alpha-15</version>
        </jpp>
        </dependency>

        <dependency>
        <maven>
            <groupId>org.codehaus.modello</groupId>
            <artifactId>modello-plugin-ojb</artifactId>
            <version>1.0-alpha-4-SNAPSHOT</version>
        </maven>
        <jpp>
            <groupId>JPP/modello</groupId>
            <artifactId>plugin-ojb</artifactId>
            <version>1.0-alpha-4-SNAPSHOT</version>
        </jpp>
        </dependency>

        <dependency>
        <maven>
            <groupId>org.codehaus.modello</groupId>
            <artifactId>modello-plugin-jpa</artifactId>
            <version>1.0-alpha-4-SNAPSHOT</version>
        </maven>
        <jpp>
            <groupId>JPP/modello</groupId>
            <artifactId>plugin-jpa</artifactId>
            <version>1.0-alpha-4-SNAPSHOT</version>
        </jpp>
        </dependency>

        <dependency>
        <maven>
            <groupId>org.codehaus.modello</groupId>
            <artifactId>modello-plugin-hibernate-store</artifactId>
            <version>1.0-alpha-4-SNAPSHOT</version>
        </maven>
        <jpp>
            <groupId>JPP/modello</groupId>
            <artifactId>plugin-hibernate-store</artifactId>
            <version>1.0-alpha-4-SNAPSHOT</version>
        </jpp>
        </dependency>

        <dependency>
        <maven>
            <groupId>org.codehaus.modello</groupId>
            <artifactId>modello-plugin-ldap</artifactId>
            <version>1.0-alpha-4-SNAPSHOT</version>
        </maven>
        <jpp>
            <groupId>JPP/modello</groupId>
            <artifactId>plugin-ldap</artifactId>
            <version>1.0-alpha-4-SNAPSHOT</version>
        </jpp>
        </dependency>

        <dependency>
        <maven>
            <groupId>org.codehaus.modello</groupId>
            <artifactId>modello-plugin-prevayler</artifactId>
            <version>1.0-alpha-4-SNAPSHOT</version>
        </maven>
        <jpp>
            <groupId>JPP/modello</groupId>
            <artifactId>plugin-prevayler</artifactId>
            <version>1.0-alpha-4-SNAPSHOT</version>
        </jpp>
        </dependency>

        <dependency>
        <maven>
            <groupId>org.codehaus.modello</groupId>
            <artifactId>modello-plugin-dom4j</artifactId>
            <version>1.0-alpha-4-SNAPSHOT</version>
        </maven>
        <jpp>
            <groupId>JPP/modello</groupId>
            <artifactId>plugin-dom4j</artifactId>
            <version>1.0-alpha-4-SNAPSHOT</version>
        </jpp>
        </dependency>

        <dependency>
        <maven>
            <groupId>org.codehaus.modello</groupId>
            <artifactId>modello-plugins-sandbox</artifactId>
            <version>1.0-alpha-4-SNAPSHOT</version>
        </maven>
        <jpp>
            <groupId>JPP/modello</groupId>
            <artifactId>plugins-sandbox</artifactId>
            <version>1.0-alpha-4-SNAPSHOT</version>
        </jpp>
        </dependency>

        <dependency>
        <maven>
            <groupId>org.codehaus.modello</groupId>
            <artifactId>modello-plugin-stash</artifactId>
            <version>1.0-alpha-4-SNAPSHOT</version>
        </maven>
        <jpp>
            <groupId>JPP/modello</groupId>
            <artifactId>plugin-stash</artifactId>
            <version>1.0-alpha-4-SNAPSHOT</version>
        </jpp>
        </dependency>

        <dependency>
        <maven>
            <groupId>org.codehaus.modello</groupId>
            <artifactId>modello-plugin-dtd</artifactId>
            <version>1.0-alpha-4-SNAPSHOT</version>
        </maven>
        <jpp>
            <groupId>JPP/modello</groupId>
            <artifactId>plugin-dtd</artifactId>
            <version>1.0-alpha-4-SNAPSHOT</version>
        </jpp>
        </dependency>

        <dependency>
        <maven>
            <groupId>org.codehaus.modello</groupId>
            <artifactId>modello-plugin-velocity</artifactId>
            <version>1.0-alpha-4-SNAPSHOT</version>
        </maven>
        <jpp>
            <groupId>JPP/modello</groupId>
            <artifactId>plugin-velocity</artifactId>
            <version>1.0-alpha-4-SNAPSHOT</version>
        </jpp>
        </dependency>

        <dependency>
        <maven>
            <groupId>org.codehaus.modello</groupId>
            <artifactId>modello-plugin-jdbc</artifactId>
            <version>1.0-alpha-4-SNAPSHOT</version>
        </maven>
        <jpp>
            <groupId>JPP/modello</groupId>
            <artifactId>plugin-jdbc</artifactId>
            <version>1.0-alpha-4-SNAPSHOT</version>
        </jpp>
        </dependency>

        <dependency>
        <maven>
            <groupId>org.codehaus.modello</groupId>
            <artifactId>modello</artifactId>
            <version>1.0-alpha-15</version>
        </maven>
        <jpp>
            <groupId>JPP/modello</groupId>
            <artifactId>modello</artifactId>
            <version>1.0-alpha-15</version>
        </jpp>
        </dependency>

    <!-- dependencies cancelled out just for maven -->
	<dependency>
		<maven>
			<groupId>jmock</groupId>
			<artifactId>jmock</artifactId>
			<version>1.0.1</version>
		</maven>
		<jpp>
			<groupId>JPP/maven2</groupId>
			<artifactId>empty-dep</artifactId>
			<version>1.0.1</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
			<groupId>jmock</groupId>
			<artifactId>jmock-cglib</artifactId>
			<version>1.0.1</version>
		</maven>
		<jpp>
			<groupId>JPP/maven2</groupId>
			<artifactId>empty-dep</artifactId>
			<version>1.0.1</version>
		</jpp>
	</dependency>
</dependencies>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/maven2/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	20 Mar 2007 00:52:40 -0000	1.2
+++ .cvsignore	24 Aug 2009 17:57:53 -0000	1.3
@@ -5,3 +5,4 @@ maven2-maven-site-plugin.tar.gz
 maven2-model-v3.jar
 maven2-plugins-060420-src.tar.gz
 maven2-src.tar.gz
+maven2-plugins-070705-src.tar.gz


View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.20 -r 1.21 maven2.specIndex: maven2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven2/devel/maven2.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- maven2.spec	25 Jul 2009 11:52:09 -0000	1.20
+++ maven2.spec	24 Aug 2009 17:57:54 -0000	1.21
@@ -28,18 +28,14 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define _with_gcj_support 1
-%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+%define gcj_support 0
 
 %define with_itests %{!?_with_itests:0}%{?_with_itests:1}
-%define without_itests %{?_with_itests:0}%{!?_with_itests:1}
 
-%define _with_bootstrap 1
+%define with_bootstrap 1
+%define without_bootstrap 0
 
-%define with_bootstrap %{!?_with_bootstrap:0}%{?_with_bootstrap:1}
-%define without_bootstrap %{?_with_bootstrap:0}%{!?_with_bootstrap:1}
-
-%define maven_version   2.0.4
+%define maven_version   2.0.8
 %define NONFREE 0
 
 %define base_name maven
@@ -50,7 +46,7 @@
 
 Name:           %{name}
 Version:        %{maven_version}
-Release:        12.19%{?dist}
+Release:        1.1%{?dist}
 Epoch:          0
 Summary:        Java project management and project comprehension tool
 
@@ -58,13 +54,13 @@ Group:          Development/Build Tools
 License:        ASL 2.0 and MIT and BSD
 URL:            http://maven.apache.org/
 
-# svn export http://svn.apache.org/repos/asf/maven/components/tags/maven-2.0.4 maven2
+# svn export http://svn.apache.org/repos/asf/maven/components/tags/maven-%{version} maven2
 # tar czf maven2-src.tar.gz maven2
 Source0:        %{name}-src.tar.gz
 
-# svn export -r {2006-04-20} http://svn.apache.org/repos/asf/maven/plugins/trunk maven2-plugins
-# tar czf maven2-plugins-060420-src.tar.gz maven2-plugins
-Source2:        %{name}-plugins-060420-src.tar.gz
+# svn export -r {2007-07-05} http://svn.apache.org/repos/asf/maven/plugins/trunk maven2-plugins
+# tar czf maven2-plugins-0700705-src.tar.gz maven2-plugins
+Source2:        %{name}-plugins-070705-src.tar.gz
 
 # No source location for these. They are ascii files generated from maven
 # repositories, and are not in cvs/svn
@@ -86,32 +82,33 @@ Source8:        %{name}-maven-site-plugi
 
 Source9:          %{name}-run-it-tests.sh
 
-# svn export http://svn.apache.org/repos/asf/maven/components/tags/maven-2.0.4/maven-model
+# svn export http://svn.apache.org/repos/asf/maven/components/tags/maven-2.0.8/maven-model
 # cd maven-model
 # mvn -P all-models package 
-# Find model jar in target/maven-model-2.0.4.jar
+# Find model jar in target/maven-model-2.0.8.jar
 Source10:       %{name}-model-v3.jar
-Source11:        %{name}-MavenJPackageDepmap.java
-Source12:        %{name}-addjdom-depmap.xml
-Source13:        %{name}-empty-dep.pom
+Source11:       %{name}-MavenJPackageDepmap.java
+Source12:       %{name}-addjdom-depmap.xml
+Source13:       %{name}-empty-dep.pom
 
 # Empty jar file with just a manifest. No source destination to specify
-Source14:        %{name}-empty-dep.jar
-Source15:        %{name}-jpp-script
-Source16:        %{name}-jpp-readme.html
-
-Patch0:          maven2-disable-itests.patch
-Patch1:          maven2-addjdomtobootstrappath.patch
-Patch2:          maven2-plugins-plexus151.patch
-Patch3:          %{name}-jpprepolayout.patch
-Patch4:          %{name}-plugins-disablecglib.patch
-Patch5:          %{name}-buildallplugins.patch
-Patch6:          %{name}-enable-unbuilt-modules.patch
-Patch7:          %{name}-fastjar-manifest-fix.patch
-Patch8:          %{name}-noexternaljavadoclinks.patch 
-Patch9:          %{name}-ant17.patch
-Patch10:         %{name}-MNG-3118.patch
-Patch11:         %{name}-commons-cli-1.1.patch
+Source14:       %{name}-empty-dep.jar
+Source15:       %{name}-jpp-script
+Source16:       %{name}-jpp-readme.html
+Source17:       %{name}-versionless-depmap.xml
+
+Patch0:         maven2-addjdomtobootstrappath.patch
+Patch1:         %{name}-jpprepolayout.patch
+Patch2:         %{name}-fastjar-manifest-fix.patch
+Patch3:         %{name}-plugins-doxiaupdatefix.patch
+Patch4:         %{name}-plugins-catch-uncaught-exceptions.patch
+Patch5:         %{name}-plugins-dependency-plugin-import-fix.patch
+Patch6:         %{name}-%{version}-excludeexternaljars.patch
+Patch7:         %{name}-site-plugin-addservletdep.patch
+Patch8:         %{name}-enable-bootstrap-repository.patch
+Patch9:         %{name}-use-unversioned-classworlds.patch
+Patch10:        %{name}-plugins-disablecobertura.patch
+Patch11:        %{name}-shade-plugin-replacement.patch
 
 BuildRequires:    jpackage-utils >= 0:1.7.2
 BuildRequires:    java-1.6.0-openjdk-devel
@@ -127,6 +124,7 @@ BuildRequires:    classworlds >= 1.1
 BuildRequires:    clover
 %endif
 BuildRequires:    dom4j >= 1.6.1
+BuildRequires:    tomcat5
 BuildRequires:    tomcat5-servlet-2.4-api
 BuildRequires:    gnu.regexp >= 1.1.4
 BuildRequires:    httpunit >= 1.6
@@ -144,12 +142,9 @@ BuildRequires:    jline >= 0.8.1
 BuildRequires:    jsch >= 0.1.20
 BuildRequires:    jtidy >= 1.0
 BuildRequires:    junit >= 3.8.2
-BuildRequires:    maven2-common-poms >= 1.0-4
-BuildRequires:    maven-doxia >= 1.0-0.a7.3
+BuildRequires:    maven2-common-poms >= 1.0-8
 BuildRequires:    maven-jxr >= 1.0-2
-BuildRequires:    maven-surefire >= 1.5.3-2
-BuildRequires:    maven-surefire-booter >= 1.5.3-2
-BuildRequires:    maven-wagon >= 1.0
+BuildRequires:    maven-wagon >= 1.0-0.1.b2
 BuildRequires:    nekohtml >= 0.9.3
 BuildRequires:    oro >= 2.0.8
 BuildRequires:    plexus-ant-factory >= 1.0-0.a1.2
@@ -168,6 +163,8 @@ BuildRequires:    saxon-scripts
 BuildRequires:    velocity >= 1.4
 BuildRequires:    xerces-j2 >= 2.7.1
 BuildRequires:    xalan-j2 >= 2.6.0
+BuildRequires:    xmlrpc
+BuildRequires:    xmlunit
 
 %if %{with_itests}
 BuildRequires:    log4j >= 1.2.13
@@ -176,6 +173,7 @@ BuildRequires:    xml-commons-apis >= 1.
 
 %if %{without_bootstrap}
 BuildRequires:    %{name} = %{epoch}:%{version}
+BuildRequires:    maven2-plugin-ant
 BuildRequires:    maven2-plugin-assembly
 BuildRequires:    maven2-plugin-clean
 BuildRequires:    maven2-plugin-compiler
@@ -183,20 +181,25 @@ BuildRequires:    maven2-plugin-install
 BuildRequires:    maven2-plugin-jar
 BuildRequires:    maven2-plugin-javadoc
 BuildRequires:    maven2-plugin-plugin
-BuildRequires:    maven2-plugin-release
 BuildRequires:    maven2-plugin-resources
 BuildRequires:    maven2-plugin-site
 BuildRequires:    maven2-plugin-surefire
+BuildRequires:    maven-archiver
+BuildRequires:    maven-doxia >= 1.0-0.a9
 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:  modello >= 1.0-0.a8.3
+BuildRequires:    maven-surefire >= 2.0
+BuildRequires:    maven-surefire-booter >= 2.0
+BuildRequires:    modello >= 1.0-0.a8.3
 BuildRequires:    modello-maven-plugin >= 1.0-0.a8.3
+BuildRequires:    plexus-maven-plugin >= 1.3.5
 %endif
 
 Requires:        ant >= 1.6.5
 Requires:        antlr >= 2.7.4
+Requires:    	 aqute-bndlib
 Requires:        bsh >= 1.3.0
 #Requires:       cglib >= 2.1.0
 Requires:        checkstyle >= 4.1
@@ -228,14 +231,10 @@ Requires:        jsch >= 0.1.20
 Requires(post):  jsch >= 0.1.20
 Requires:        jtidy >= 1.0
 Requires:        junit >= 3.8.2
-Requires:        maven2-common-poms >= 1.0-4
-Requires:        maven-doxia >= 1.0-0.a7.3
-Requires(post):  maven-doxia >= 1.0-0.a7.3
+Requires:        maven2-common-poms >= 1.0-8
 Requires:        maven-jxr >= 1.0
-Requires:        maven-surefire >= 1.5.3-2
-Requires:        maven-surefire-booter >= 1.5.3-2
-Requires:        maven-wagon >= 1.0
-Requires(post):  maven-wagon >= 1.0
+Requires:        maven-wagon >= 1.0-0.1.b2
+Requires(post):  maven-wagon >= 1.0-0.1.b2
 Requires:        nekohtml >= 0.9.3
 Requires:        oro >= 2.0.8
 Requires:        plexus-ant-factory >= 1.0-0.a1.2
@@ -256,16 +255,28 @@ Requires:        rhino >= 1.5
[...1806 lines suppressed...]
+%{_datadir}/%{name}/plugins/javadoc-plugin*.jar
 
 %if %{gcj_support}
 %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/jxr-plugin.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/javadoc-plugin*.jar.*
 %endif
 
 
 %files plugin-one
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
-%{_datadir}/%{name}/plugins/one-plugin.jar
+%{_datadir}/%{name}/plugins/one-plugin*.jar
 
 %if %{gcj_support}
 %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/one-plugin.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/one-plugin*.jar.*
 %endif
 
 
 %files plugin-plugin
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
-%{_datadir}/%{name}/plugins/plugin-plugin.jar
+%{_datadir}/%{name}/plugins/plugin-plugin*.jar
 
 %if %{gcj_support}
 %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/plugin-plugin.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/plugin-plugin*.jar.*
 %endif
 
 
 %files plugin-pmd
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
-%{_datadir}/%{name}/plugins/pmd-plugin.jar
+%{_datadir}/%{name}/plugins/pmd-plugin*.jar
 
 %if %{gcj_support}
 %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/pmd-plugin.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/pmd-plugin*.jar.*
 %endif
 
 
 %files plugin-project-info-reports
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
-%{_datadir}/%{name}/plugins/project-info-reports-plugin.jar
+%{_datadir}/%{name}/plugins/project-info-reports-plugin*.jar
 
 %if %{gcj_support}
 %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/project-info-reports-plugin.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/project-info-reports-plugin*.jar.*
 %endif
 
 
 %files plugin-rar
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
-%{_datadir}/%{name}/plugins/rar-plugin.jar
+%{_datadir}/%{name}/plugins/rar-plugin*.jar
 
 %if %{gcj_support}
 %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/rar-plugin.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/rar-plugin*.jar.*
 %endif
 
 
-%files plugin-release
+%files plugin-remote-resources
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
-%{_datadir}/%{name}/plugins/release-plugin.jar
+%{_datadir}/%{name}/plugins/remote-resources-plugin*.jar
 
 %if %{gcj_support}
 %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/release-plugin.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/remote-resources-plugin.jar.*
 %endif
 
 
@@ -2216,90 +2603,84 @@ fi
 %defattr(-,root,root,-)
 %doc maven2-plugins/maven-repository-plugin/LICENSE.txt
 %dir %{_datadir}/%{name}/plugins
-%{_datadir}/%{name}/plugins/repository-plugin.jar
+%{_datadir}/%{name}/plugins/repository-plugin*.jar
 
 %if %{gcj_support}
 %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/repository-plugin.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/repository-plugin*.jar.*
 %endif
 
 %files plugin-resources
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
-%{_datadir}/%{name}/plugins/resources-plugin.jar
+%{_datadir}/%{name}/plugins/resources-plugin*.jar
 
 %if %{gcj_support}
 %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/resources-plugin.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/resources-plugin*.jar.*
 %endif
 
 
 %files plugin-site
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
-%{_datadir}/%{name}/plugins/site-plugin.jar
+%{_datadir}/%{name}/plugins/site-plugin*.jar
 
 %if %{gcj_support}
 %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/site-plugin.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/site-plugin*.jar.*
 %endif
 
 
 %files plugin-source
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
-%{_datadir}/%{name}/plugins/source-plugin.jar
+%{_datadir}/%{name}/plugins/source-plugin*.jar
 
 %if %{gcj_support}
 %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/source-plugin.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/source-plugin*.jar.*
 %endif
 
 
-%files plugin-surefire
+%files plugin-stage
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
-%{_datadir}/%{name}/plugins/surefire-plugin.jar
+%{_datadir}/%{name}/plugins/stage-plugin*.jar
 
 %if %{gcj_support}
 %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/surefire-plugin.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/stage-plugin*.jar.*
 %endif
 
-
-%files plugin-surefire-report
-%defattr(-,root,root,-)
-%dir %{_datadir}/%{name}/plugins
-%{_datadir}/%{name}/plugins/surefire-report-plugin.jar
-
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/surefire-report-plugin.jar.*
-%endif
-
-
 %files plugin-verifier
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
-%{_datadir}/%{name}/plugins/verifier-plugin.jar
+%{_datadir}/%{name}/plugins/verifier-plugin*.jar
 
 %if %{gcj_support}
 %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/verifier-plugin.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/verifier-plugin*.jar.*
 %endif
 
 
 %files plugin-war
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
-%{_datadir}/%{name}/plugins/war-plugin.jar
+%{_datadir}/%{name}/plugins/war-plugin*.jar
 
 %if %{gcj_support}
 %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/war-plugin.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/war-plugin*.jar.*
 %endif
 
 %changelog
+* 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
+- Set bootstrap
+- Fix up LICENSE.txt files
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:2.0.4-12.19
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maven2/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	20 Mar 2007 00:52:40 -0000	1.2
+++ sources	24 Aug 2009 17:57:54 -0000	1.3
@@ -1,7 +1,8 @@
-e6ad023874fce8fec9f8f975b96685c1  m2_jar_repo.tar.gz
-357c94ddd53c899169ff6da4d1b95b40  m2_pom_repo.tar.gz
 dc36ce1fbefedbdd27fa93c8584ba91a  maven2-empty-dep.jar
 de45a278b88554bb545f092e2f82c56d  maven2-maven-site-plugin.tar.gz
-1b28906cd308ed60db75e2973f0fbb22  maven2-model-v3.jar
 d556f5883f89a7348de42767fcb1aabe  maven2-plugins-060420-src.tar.gz
-36465a60f5d7542c79df98ec6369205f  maven2-src.tar.gz
+13c1088b7b9535b9e4fb31317f79491a  maven2-model-v3.jar
+a9b9ce42ffbba60eb1833f0a773f7aa7  maven2-plugins-070705-src.tar.gz
+ffd6fcb439b5b7e143a31a4fd5af9902  maven2-src.tar.gz
+b94d6c2bd76523470a39ff7083a253bd  m2_jar_repo.tar.gz
+e1dcb37943da8c0f1767891f00f6dc44  m2_pom_repo.tar.gz


--- maven2-MNG-3118.patch DELETED ---


--- maven2-addjdomtobootstrappath.patch DELETED ---


--- maven2-ant17.patch DELETED ---


--- maven2-buildallplugins.patch DELETED ---


--- maven2-commons-cli-1.1.patch DELETED ---


--- maven2-disable-itests.patch DELETED ---


--- maven2-enable-unbuilt-modules.patch DELETED ---


--- maven2-fastjar-manifest-fix.patch DELETED ---


--- maven2-jpprepolayout.patch DELETED ---


--- maven2-noexternaljavadoclinks.patch DELETED ---


--- maven2-plugins-disablecglib.patch DELETED ---


--- maven2-plugins-plexus151.patch DELETED ---




More information about the fedora-extras-commits mailing list