[java-sig-commits] [apache-commons-launcher] - Fix build due to changed ant groupId.

[Alexander Kurtakov]

commit 7cafdf885697ebb5026073162e42913cf65dd644
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Wed Dec 8 11:44:33 2010 +0200

    - Fix build due to changed ant groupId.

 apache-commons-launcher.spec |   23 +++++++++++++----------
 commons-launcher-pom.patch   |   13 ++++++++++---
 2 files changed, 23 insertions(+), 13 deletions(-)
---
diff --git a/apache-commons-launcher.spec b/apache-commons-launcher.spec
index 33f0924..7d9a794 100644
--- a/apache-commons-launcher.spec
+++ b/apache-commons-launcher.spec
@@ -3,7 +3,7 @@
 
 Name:          apache-%{short_name}
 Version:       1.1
-Release:       5.20100521svn936225%{?dist}
+Release:       6.20100521svn936225%{?dist}
 Summary:       A cross platform Java application launcher
 Group:         Development/Libraries
 License:       ASL 2.0
@@ -36,14 +36,14 @@ BuildArch:     noarch
 
 BuildRequires: java-devel >= 1:1.6.0
 BuildRequires: jpackage-utils
-BuildRequires: maven2-plugin-antrun
-BuildRequires: maven2-plugin-assembly
-BuildRequires: maven2-plugin-compiler
-BuildRequires: maven2-plugin-idea
-BuildRequires: maven2-plugin-install
-BuildRequires: maven2-plugin-jar
-BuildRequires: maven2-plugin-javadoc
-BuildRequires: maven2-plugin-resources
+BuildRequires: maven-antrun-plugin
+BuildRequires: maven-assembly-plugin
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-idea-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-javadoc-plugin
+BuildRequires: maven-resources-plugin
 BuildRequires: maven-doxia-sitetools
 BuildRequires: maven-plugin-bundle
 BuildRequires: maven-surefire-maven-plugin
@@ -97,6 +97,7 @@ Obsoletes:     jakarta-%{short_name}-javadoc < %{version}-%{release}
 %patch0 -p0 -b .orig
 
 sed -i 's/\r//' README.txt LICENSE.txt NOTICE.txt
+sed -i "s|\<groupId\>ant\<\/groupId\>|<groupId>org.apache.ant</groupId>|g" build.xml
 
 %build
 export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
@@ -148,6 +149,9 @@ rm -rf %{buildroot}
 %{_javadocdir}/%{name}
 
 %changelog
+* Wed Dec 8 2010 Alexander Kurtakov <akurtako at redhat.com> 1.1-6.20100521svn936225
+- Fix build due to changed ant groupId.
+
 * Fri May 21 2010 Mat Booth <fedora at matbooth.co.uk> - 1.1-5.20100521svn936225
 - Version like a post release snapshot, not a pre release snapshot.
 - Correct dep-map names.
@@ -188,4 +192,3 @@ rm -rf %{buildroot}
 
 * Fri Nov 17 2006 Jason Corley <jason.corley at gmail.com> - 0:1.1-1jpp
 - 1.1
-
diff --git a/commons-launcher-pom.patch b/commons-launcher-pom.patch
index 9276cd4..c897426 100644
--- a/commons-launcher-pom.patch
+++ b/commons-launcher-pom.patch
@@ -1,5 +1,5 @@
---- pom.xml.orig	2010-04-21 10:02:56.000000000 +0100
-+++ pom.xml	2010-05-21 16:35:38.349719596 +0100
+--- pom.xml.orig	2010-04-21 12:02:56.000000000 +0300
++++ pom.xml	2010-12-08 11:41:04.149160219 +0200
 @@ -27,7 +27,7 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>commons-launcher</groupId>
@@ -9,7 +9,14 @@
    <name>Commons Launcher</name>
    <inceptionYear>2002</inceptionYear>
    <description>
-@@ -83,12 +83,6 @@
+@@ -77,18 +77,12 @@
+ 
+   <dependencies>
+     <dependency>
+-      <groupId>ant</groupId>
++      <groupId>org.apache.ant</groupId>
+       <artifactId>ant</artifactId>
+       <version>1.5.3-1</version>
        <scope>provided</scope>
      </dependency>
      <dependency>