rpms/maven2/devel maven2-MNG-3118.patch, NONE, 1.1 maven2.spec, 1.7, 1.8

[Deepak Bhole (dbhole)]

Author: dbhole

Update of /cvs/extras/rpms/maven2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12183

Modified Files:
	maven2.spec 
Added Files:
	maven2-MNG-3118.patch 
Log Message:

- Resolve bz# 432508 - added patch for MNG-3118



maven2-MNG-3118.patch:

--- NEW FILE maven2-MNG-3118.patch ---
Index: src/main/java/org/apache/maven/project/MavenProject.java
===================================================================
--- src/main/java/org/apache/maven/project/MavenProject.java	(revision 558713)
+++ src/main/java/org/apache/maven/project/MavenProject.java	(working copy)
@@ -555,9 +555,9 @@
     {
         List list = new ArrayList( getArtifacts().size() + 1 );
 
+        list.add( getBuild().getTestOutputDirectory() );
+
         list.add( getBuild().getOutputDirectory() );
-
-        list.add( getBuild().getTestOutputDirectory() );
         
         for ( Iterator i = getArtifacts().iterator(); i.hasNext(); )
         {



Index: maven2.spec
===================================================================
RCS file: /cvs/extras/rpms/maven2/devel/maven2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- maven2.spec	19 Feb 2008 00:49:52 -0000	1.7
+++ maven2.spec	28 Feb 2008 18:52:50 -0000	1.8
@@ -48,7 +48,7 @@
 
 Name:           %{name}
 Version:        %{maven_version}
-Release:        11jpp.8%{?dist}
+Release:        10jpp.9%{?dist}
 Epoch:          0
 Summary:        Java project management and project comprehension tool
 
@@ -108,6 +108,7 @@
 Patch7:          %{name}-fastjar-manifest-fix.patch
 Patch8:          %{name}-noexternaljavadoclinks.patch 
 Patch9:          %{name}-ant17.patch
+Patch10:         %{name}-MNG-3118.patch
 
 BuildRequires:    jpackage-utils >= 0:1.7.2
 BuildRequires:    /bin/ls,/usr/bin/head,/usr/bin/find,/usr/bin/awk,/bin/grep,/bin/sed
@@ -923,6 +924,7 @@
 %patch7 -b .sav
 %patch8 -b .sav
 %patch9 -b .sav
+%patch10 -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.
@@ -2294,8 +2296,8 @@
 %endif
 
 %changelog
-* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0:2.0.4-11jpp.8
-- Autorebuild for GCC 4.3
+* Tue Feb 12 2008 Deepak Bhole <dbhole at redhat.com> 0:2.0.4-10jpp.9
+- Resolve bz# 432508 - added patch for MNG-3118
 
 * Fri Sep 21 2007 Deepak Bhole <dbhole at redhat.com> 0:2.0.4-10jpp.8
 - Rebuild without bootstrap