[maven2] Remove incorrect testcase failing with ant 1.8

[Stanislav Ochotnicky]

commit 987b21ec6db5318b49f2ec39757dfdf7a1339fa9
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Thu Aug 26 17:29:09 2010 +0200

    Remove incorrect testcase failing with ant 1.8
    
    + whitespace cleanup

 maven2.spec |   40 ++++++++++++++++++++++++----------------
 1 files changed, 24 insertions(+), 16 deletions(-)
---
diff --git a/maven2.spec b/maven2.spec
index 738534a..a4c865f 100644
--- a/maven2.spec
+++ b/maven2.spec
@@ -2,9 +2,9 @@
 %define bootstrap 0
 %define __jar_repack 0
 
-Name:	    maven2	
+Name:	    maven2
 Version:	2.2.1
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	Java project management and project comprehension tool
 
 Group:		Development/Build Tools
@@ -16,9 +16,9 @@ URL:		http://maven.apache.org
 Source0:	%{name}-%{version}.tar.gz
 
 # Since we are using the entire dependency set "as is", we need to atleast try
-# and make it so that only one version is packaged in the binary blob. This 
-# server an additional (and more important) purpose ... it ensures that a 
-# single version of each module is enough; because if not, versioned rpm names 
+# and make it so that only one version is packaged in the binary blob. This
+# server an additional (and more important) purpose ... it ensures that a
+# single version of each module is enough; because if not, versioned rpm names
 # would be needed for those dependencies. The idea is as follows:
 
 # Required by maven:
@@ -28,7 +28,7 @@ Source0:	%{name}-%{version}.tar.gz
 #  org/codehaus/plexus/1.1/plexus-1.1.jar
 #  org/codehaus/plexus/1.0/plexus-1.0.jar -> ../1.1/plexus-1.1.jar
 
-# Doing this for the hundreds of jars is a huge pain.. so we do the only 
+# Doing this for the hundreds of jars is a huge pain.. so we do the only
 # thing sane people can. Crazy scripting magic! To generate the tarball
 
 # rm -rf ~/.m2
@@ -43,7 +43,7 @@ Source1:    %{name}-%{version}-bootstrapdeps.tar.gz
 
 # 1xx for non-upstream/created sources
 Source100:    %{name}-%{version}-settings.xml
-Source101:    %{name}-JPackageRepositoryLayout.java  
+Source101:    %{name}-JPackageRepositoryLayout.java
 Source102:    %{name}-MavenJPackageDepmap.java
 Source103:    %{name}-%{version}-depmap.xml
 Source104:    %{name}-empty-dep.pom
@@ -70,7 +70,7 @@ BuildRequires: ant
 BuildRequires: apache-resource-bundles
 BuildRequires: objectweb-asm
 BuildRequires: backport-util-concurrent
-BuildRequires: buildnumber-maven-plugin 
+BuildRequires: buildnumber-maven-plugin
 BuildRequires: bsh
 BuildRequires: jsch
 BuildRequires: jakarta-commons-cli
@@ -116,8 +116,8 @@ BuildRequires: maven-wagon
 BuildRequires: modello
 BuildRequires: multithreadedtc
 BuildRequires: oro
-BuildRequires: plexus-active-collections 
-BuildRequires: plexus-ant-factory 
+BuildRequires: plexus-active-collections
+BuildRequires: plexus-ant-factory
 BuildRequires: plexus-archiver
 BuildRequires: plexus-cipher
 BuildRequires: plexus-bsh-factory
@@ -190,8 +190,8 @@ Requires: maven-wagon
 Requires: modello
 Requires: multithreadedtc
 Requires: oro
-Requires: plexus-active-collections 
-Requires: plexus-ant-factory 
+Requires: plexus-active-collections
+Requires: plexus-ant-factory
 Requires: plexus-archiver
 Requires: plexus-cipher
 Requires: plexus-bsh-factory
@@ -256,15 +256,15 @@ mkdir $M2_REPO
 
   tar xzf %{SOURCE1}
 
-  # maven-remote-resources-plugin (m-r-r-p) is used side-by-side with 
+  # maven-remote-resources-plugin (m-r-r-p) is used side-by-side with
   # plexus-velocity (p-v) 1.1.3 upstream.. we collapse to a single p-v version
-  # of 1.1.7. 1.1.7 however has a component descriptor that conflicts 
-  # with the one in m-r-r-p. We therefore need to remove the descriptor 
+  # of 1.1.7. 1.1.7 however has a component descriptor that conflicts
+  # with the one in m-r-r-p. We therefore need to remove the descriptor
   # from m-r-r-p first
   zip -d repository/org/apache/maven/plugins/maven-remote-resources-plugin/1.0-beta-2/maven-remote-resources-plugin-1.0-beta-2.jar \
          META-INF/plexus/components.xml
 
-  # resource bundle 1.3 is needed during build, but not when done via 
+  # resource bundle 1.3 is needed during build, but not when done via
   # upstream, for some reason
   mkdir -p repository/org/apache/apache-jar-resource-bundle/1.3
   ln -s ../1.4/apache-jar-resource-bundle-1.4.jar \
@@ -280,6 +280,10 @@ cp %{SOURCE102} maven-artifact/src/main/java/org/apache/maven/artifact/repositor
 # disable parallel artifact resolution
 %patch5 -p1 -b .parallel-artifacts-resolution
 
+# test case is incorrectly assuming that target executed by antcall
+# can propagate references to its parent (stopped working with ant 1.8)
+rm maven-script/maven-script-ant/src/test/java/org/apache/maven/script/ant/AntMojoWrapperTest.java
+
 %build
 export M2_REPO=`pwd`/.m2
 export M2_HOME=`pwd`/installation/apache-maven-%{version}
@@ -508,6 +512,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc
 
 %changelog
+* Thu Aug 26 2010 Stanislav Ochotnicky <sochotnicky at redhat.com> - 2.2.1-8
+- Remove incorrect testcase failing with ant 1.8
+- Cleanup whitespace
+
 * Tue Jun 29 2010 Stanislav Ochotnicky <sochotnicky at redhat.com> - 2.2.1-7
 - Updated previous patch to only modify behaviour in JPP mode