[aether-ant-tasks] Update to upstream version 0.9.0.M3

[Mikolaj Izdebski]

commit 13980311efe93ca8127b6945c45e65d5b6050dc8
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Mon Aug 12 07:33:50 2013 +0200

    Update to upstream version 0.9.0.M3

 .gitignore            |    1 +
 aether-ant-tasks.spec |   53 +++++++++++++++++++++++++++---------------------
 sources               |    3 +-
 3 files changed, 32 insertions(+), 25 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0eef8f3..8ac0352 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /epl-v10.html
 /aether-ant.tar.xz
+/aether-ant-tasks-0.9.0.M3.tar.bz2
diff --git a/aether-ant-tasks.spec b/aether-ant-tasks.spec
index f81b35b..9c3c1d4 100644
--- a/aether-ant-tasks.spec
+++ b/aether-ant-tasks.spec
@@ -1,34 +1,44 @@
+%global vertag M3
+
 Name:           aether-ant-tasks
 Epoch:          1
-Version:        0.9
-Release:        0.1.SNAPSHOT%{?dist}
+Version:        0.9.0
+Release:        0.2.%{vertag}%{?dist}
 Summary:        Ant tasks using Aether to resolve, install and deploy artifacts
 Group:          Development/Libraries
 BuildArch:      noarch
 
 License:        EPL
 URL:            http://www.eclipse.org/aether
-# git clone http://git.eclipse.org/gitroot/aether/aether-ant.git
-# tar -cJf aether-ant.tar.xz aether-ant
-Source0:        aether-ant.tar.xz
-Source1:        http://www.eclipse.org/legal/epl-v10.html
+Source0:        http://git.eclipse.org/c/aether/aether-ant.git/snapshot/%{name}-%{version}.%{vertag}.tar.bz2
 
 BuildRequires:  maven-local
-BuildRequires:  ant-testutil
-BuildRequires:  mvn(org.apache.maven:maven-aether-provider)
+BuildRequires:  mvn(junit:junit)
+BuildRequires:  mvn(org.apache.ant:ant)
+BuildRequires:  mvn(org.apache.ant:ant-launcher)
+BuildRequires:  mvn(org.apache.ant:ant-testutil)
+BuildRequires:  mvn(org.apache.maven:maven-aether-provider) >= 3.1.0
 BuildRequires:  mvn(org.apache.maven:maven-settings-builder)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-component-annotations)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-interpolation)
 BuildRequires:  mvn(org.eclipse.aether:aether-api)
-BuildRequires:  mvn(org.eclipse.aether:aether-util)
+BuildRequires:  mvn(org.eclipse.aether:aether-connector-basic)
 BuildRequires:  mvn(org.eclipse.aether:aether-impl)
-BuildRequires:  mvn(org.eclipse.aether:aether-connector-asynchttpclient)
-BuildRequires:  mvn(org.eclipse.aether:aether-connector-file)
 BuildRequires:  mvn(org.eclipse.aether:aether-test-util)
-BuildRequires:  mvn(org.sonatype.forge:forge-parent)
+BuildRequires:  mvn(org.eclipse.aether:aether-transport-classpath)
+BuildRequires:  mvn(org.eclipse.aether:aether-transport-file)
+BuildRequires:  mvn(org.eclipse.aether:aether-transport-http)
+BuildRequires:  mvn(org.eclipse.aether:aether-util)
+BuildRequires:  mvn(org.eclipse.sisu:org.eclipse.sisu.plexus)
+BuildRequires:  mvn(org.hamcrest:hamcrest-core)
+BuildRequires:  mvn(org.hamcrest:hamcrest-library)
+
+# Workaround for rhbz#996062
+BuildRequires:  ant-testutil
+
 
 %description
-The Aether Ant Tasks enable build scripts for Apache Ant 1.7+ to use Sonatype
+The Aether Ant Tasks enable build scripts for Apache Ant 1.7+ to use Eclipse
 Aether to resolve dependencies and install and deploy locally built artifacts.
 
 %package javadoc
@@ -39,18 +49,11 @@ Group:          Documentation
 This package contains the API documentation for %{name}.
 
 %prep
-%setup -q -n aether-ant
-cp -p %{SOURCE1} LICENSE
-
-# Not sure what the deal is with tesla...
-sed -i -e 's at io\.tesla at org.apache@g' pom.xml
+%setup -q -n %{name}-%{version}.%{vertag}
 
 # Use junit since junit-dep is obselete and equivilent to junit since 4.11
 sed -i -e 's at junit-dep@junit at g' pom.xml
 
-# Fix build deps
-%pom_add_dep "org.codehaus.plexus:plexus-component-api"
-%pom_remove_dep "org.sonatype.sisu:sisu-inject-plexus"
 %pom_remove_plugin ":maven-shade-plugin"
 %pom_remove_plugin ":maven-enforcer-plugin"
 
@@ -62,12 +65,16 @@ sed -i -e 's at junit-dep@junit at g' pom.xml
 %mvn_install
 
 %files -f .mfiles
-%doc LICENSE README.md
+%doc README.md
+%doc epl-v10.html notice.html
 
 %files javadoc -f .mfiles-javadoc
-%doc LICENSE
+%doc epl-v10.html notice.html
 
 %changelog
+* Mon Aug 12 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 1:0.9.0-0.2.M3
+- Update to upstream version 0.9.0.M3
+
 * Mon Jul 29 2013 Mat Booth <fedora at matbooth.co.uk> - 1:0.9-0.1.SNAPSHOT
 - Upstream has moved to Eclipse, update to upstream 0.9-SNAPSHOT
 - Run tests now all deps are in Fedora
diff --git a/sources b/sources
index 8fb20a8..deb0bb4 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-d0fc088e4e5216422c217d39853d8601  epl-v10.html
-91002861d20307aad3816c904b7531ad  aether-ant.tar.xz
+90abee576c0ef1500722c452261356bc  aether-ant-tasks-0.9.0.M3.tar.bz2