[java-sig-commits] [maven-ant-tasks] - Fix ant groupId to org.apache.ant, resolves FTBFS bug 660901

[Orion Poplawski]

commit b29c5e2c1b36b5a79a60af7300f0985f3bdf9156
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Tue Dec 7 14:04:44 2010 -0700

    - Fix ant groupId to org.apache.ant, resolves FTBFS bug 660901

 maven-ant-tasks-2.1.1-ant-groupId.patch  |   20 ++++++++++++++++++++
 maven-ant-tasks-2.1.1-ant-launcher.patch |   16 ----------------
 maven-ant-tasks.spec                     |   10 +++++++---
 3 files changed, 27 insertions(+), 19 deletions(-)
---
diff --git a/maven-ant-tasks-2.1.1-ant-groupId.patch b/maven-ant-tasks-2.1.1-ant-groupId.patch
new file mode 100644
index 0000000..0e8f746
--- /dev/null
+++ b/maven-ant-tasks-2.1.1-ant-groupId.patch
@@ -0,0 +1,20 @@
+diff -up maven-ant-tasks-2.1.1/pom.xml.ant-groupId maven-ant-tasks-2.1.1/pom.xml
+diff -up maven-ant-tasks-2.1.1/src/it/ant-run-plugin-with-ant-1.6/pom.xml.ant-groupId maven-ant-tasks-2.1.1/src/it/ant-run-plugin-with-ant-1.6/pom.xml
+--- maven-ant-tasks-2.1.1/src/it/ant-run-plugin-with-ant-1.6/pom.xml.ant-groupId	2010-07-19 22:36:30.000000000 -0600
++++ maven-ant-tasks-2.1.1/src/it/ant-run-plugin-with-ant-1.6/pom.xml	2010-12-07 13:57:13.189223154 -0700
+@@ -32,12 +32,12 @@
+         <version>1.2</version>
+         <dependencies>
+           <dependency>
+-            <groupId>ant</groupId>
++            <groupId>org.apache.ant</groupId>
+             <artifactId>ant</artifactId>
+             <version>1.6</version>
+           </dependency>
+           <dependency>
+-            <groupId>ant</groupId>
++            <groupId>org.apache.ant</groupId>
+             <artifactId>ant-launcher</artifactId>
+             <version>1.6</version>
+             <scope>runtime</scope>
+diff -up maven-ant-tasks-2.1.1/src/it/ant-run-plugin-with-ant-1.8.0/pom.xml.ant-groupId maven-ant-tasks-2.1.1/src/it/ant-run-plugin-with-ant-1.8.0/pom.xml
diff --git a/maven-ant-tasks.spec b/maven-ant-tasks.spec
index b6b327c..e9a81c4 100644
--- a/maven-ant-tasks.spec
+++ b/maven-ant-tasks.spec
@@ -1,6 +1,6 @@
 Name:           maven-ant-tasks
 Version:        2.1.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Allow Maven artifact handling features to be used from within an Ant build
 
 Group:          Development/Libraries
@@ -9,7 +9,8 @@ URL:            http://maven.apache.org/ant-tasks/index.html
 #The ant-tasks-in-ant-run-plugin test needs a dependency on ant-launcher
 Source0:        http://www.apache.org/dist/maven/source/maven-ant-tasks-%{version}-src.zip
 Source1:        %{name}.depmap
-Patch0:         maven-ant-tasks-2.1.1-ant-launcher.patch
+#Fix up ant groupId
+Patch0:         maven-ant-tasks-2.1.1-ant-groupId.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -58,7 +59,7 @@ This package contains the API documentation for %{name}.
 
 %prep
 %setup -q
-%patch0 -p1 -b .ant-launcher
+%patch0 -p1 -b .ant-groupId
 #Need to tell maven invoker to run in jpp mode, write test.properties files
 for f in src/it/*/invoker.properties
 do
@@ -124,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 7 2010 Orion Poplawski <orion at cora.nwra.com> 2.1.1-5
+- Fix ant groupId to org.apache.ant, resolves FTBFS bug 660901
+
 * Wed Sep 1 2010 Orion Poplawski <orion at cora.nwra.com> 2.1.1-4
 - Re-order defattr/doc
 - Use _mavenpomdir everywhere