commit 39fddbe176e2714ff466b8f43cc82468c91128d8 Author: Mikolaj Izdebski mizdebsk@redhat.com Date: Wed Feb 4 13:37:35 2015 +0100
Update to upstream version 1.0.1
.gitignore | 1 + 0001-Add-support-for-XMvn-workspace-reader.patch | 6 +++--- ...3.2.3.patch => 0002-Update-to-Maven-3.2.3.patch | 12 ++++++------ aether-ant-tasks.spec | 11 +++++++---- sources | 2 +- 5 files changed, 18 insertions(+), 14 deletions(-) --- diff --git a/.gitignore b/.gitignore index 1d0a15c..b3b2dca 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /aether-ant-tasks-0.9.0.M4.tar.bz2 /aether-ant-tasks-0.9.0.v20140226.tar.bz2 /aether-ant-tasks-1.0.0.v20140518.tar.bz2 +/aether-ant-tasks-1.0.1.v20141111.tar.bz2 diff --git a/0001-Add-support-for-XMvn-workspace-reader.patch b/0001-Add-support-for-XMvn-workspace-reader.patch index 86e6389..bc71a10 100644 --- a/0001-Add-support-for-XMvn-workspace-reader.patch +++ b/0001-Add-support-for-XMvn-workspace-reader.patch @@ -1,7 +1,7 @@ -From 59f7850fd2cde1c5af1aaa6f2a8a50585e490ff8 Mon Sep 17 00:00:00 2001 +From 5b975bc4bb0d61c686fb3f0fbdbf4a8f6d23e26c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski mizdebsk@redhat.com Date: Wed, 11 Sep 2013 18:31:04 +0200 -Subject: [PATCH] Add support for XMvn workspace reader +Subject: [PATCH 1/2] Add support for XMvn workspace reader
--- .../org/eclipse/aether/internal/ant/AntRepoSys.java | 21 +++++++++++++++++++++ @@ -61,5 +61,5 @@ index 76cc927..ee1d444 100644 }
-- -1.9.0 +2.1.0
diff --git a/0001-Update-to-Maven-3.2.3.patch b/0002-Update-to-Maven-3.2.3.patch similarity index 91% rename from 0001-Update-to-Maven-3.2.3.patch rename to 0002-Update-to-Maven-3.2.3.patch index 28ef4e9..fb2d49c 100644 --- a/0001-Update-to-Maven-3.2.3.patch +++ b/0002-Update-to-Maven-3.2.3.patch @@ -1,7 +1,7 @@ -From a31528c40665cefc216a2cf8a37f1b00a29a55f8 Mon Sep 17 00:00:00 2001 +From 240b4be7a73fb83f14065cca917615a06a3b4fb0 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski mizdebsk@redhat.com Date: Fri, 7 Nov 2014 14:48:21 +0100 -Subject: [PATCH] Update to Maven 3.2.3 +Subject: [PATCH 2/2] Update to Maven 3.2.3
--- pom.xml | 2 +- @@ -9,16 +9,16 @@ Subject: [PATCH] Update to Maven 3.2.3 2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml -index 7f0eb73..03ef826 100644 +index 7d22ca6..18ce0d3 100644 --- a/pom.xml +++ b/pom.xml -@@ -114,7 +114,7 @@ +@@ -117,7 +117,7 @@ <surefire.redirectTestOutputToFile>true</surefire.redirectTestOutputToFile> <sonatypeOssDistMgmtSnapshotsId>sonatype-nexus-snapshots</sonatypeOssDistMgmtSnapshotsId> <sonatypeOssDistMgmtSnapshotsUrl>https://oss.sonatype.org/content/repositories/snapshots/</sonatypeOssDistMgmtSnapshotsUrl> - <mavenVersion>3.1.0</mavenVersion> + <mavenVersion>3.2.3</mavenVersion> - <aetherVersion>1.0.0.v20140518</aetherVersion> + <aetherVersion>1.0.1.v20141111</aetherVersion> </properties>
diff --git a/src/main/java/org/eclipse/aether/internal/ant/AntModelResolver.java b/src/main/java/org/eclipse/aether/internal/ant/AntModelResolver.java @@ -60,5 +60,5 @@ index dc7ef72..e0d40c5 100644 + } -- -1.9.3 +2.1.0
diff --git a/aether-ant-tasks.spec b/aether-ant-tasks.spec index 63b3971..a26eb4e 100644 --- a/aether-ant-tasks.spec +++ b/aether-ant-tasks.spec @@ -1,9 +1,9 @@ -%global vertag v20140518 +%global vertag v20141111
Name: aether-ant-tasks Epoch: 1 -Version: 1.0.0 -Release: 3%{?dist} +Version: 1.0.1 +Release: 1%{?dist} Summary: Ant tasks using Aether to resolve, install and deploy artifacts Group: Development/Libraries BuildArch: noarch @@ -14,7 +14,7 @@ Source0: http://git.eclipse.org/c/aether/aether-ant.git/snapshot/%%7Bname%7D- Source5: ant-classpath
Patch0001: 0001-Add-support-for-XMvn-workspace-reader.patch -Patch0002: 0001-Update-to-Maven-3.2.3.patch +Patch0002: 0002-Update-to-Maven-3.2.3.patch
BuildRequires: maven-local BuildRequires: mvn(junit:junit) @@ -80,6 +80,9 @@ install -p -m 644 %{SOURCE5} %{buildroot}/%{_sysconfdir}/ant.d/%{name} %doc epl-v10.html notice.html
%changelog +* Wed Feb 4 2015 Mikolaj Izdebski mizdebsk@redhat.com - 1:1.0.1-1 +- Update to upstream version 1.0.1 + * Fri Nov 7 2014 Mikolaj Izdebski mizdebsk@redhat.com - 1:1.0.0-3 - Update to Maven 3.2.3
diff --git a/sources b/sources index 1246244..13c3363 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8d257385d092f579585ab423f27a25a0 aether-ant-tasks-1.0.0.v20140518.tar.bz2 +37c2b83c5dd2ed2d23853a2e1e2cba5a aether-ant-tasks-1.0.1.v20141111.tar.bz2
java-sig-commits@lists.fedoraproject.org