diff --git a/0001-Update-to-Maven-3.2.3.patch b/0001-Update-to-Maven-3.2.3.patch new file mode 100644 index 0000000..28ef4e9 --- /dev/null +++ b/0001-Update-to-Maven-3.2.3.patch @@ -0,0 +1,64 @@ +From a31528c40665cefc216a2cf8a37f1b00a29a55f8 Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Fri, 7 Nov 2014 14:48:21 +0100 +Subject: [PATCH] Update to Maven 3.2.3 + +--- + pom.xml | 2 +- + .../org/eclipse/aether/internal/ant/AntModelResolver.java | 15 ++++++++++++++- + 2 files changed, 15 insertions(+), 2 deletions(-) + +diff --git a/pom.xml b/pom.xml +index 7f0eb73..03ef826 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -114,7 +114,7 @@ + true + sonatype-nexus-snapshots + https://oss.sonatype.org/content/repositories/snapshots/ +- 3.1.0 ++ 3.2.3 + 1.0.0.v20140518 + + +diff --git a/src/main/java/org/eclipse/aether/internal/ant/AntModelResolver.java b/src/main/java/org/eclipse/aether/internal/ant/AntModelResolver.java +index dc7ef72..e0d40c5 100644 +--- a/src/main/java/org/eclipse/aether/internal/ant/AntModelResolver.java ++++ b/src/main/java/org/eclipse/aether/internal/ant/AntModelResolver.java +@@ -16,6 +16,7 @@ import java.util.HashSet; + import java.util.List; + import java.util.Set; + ++import org.apache.maven.model.Parent; + import org.apache.maven.model.Repository; + import org.apache.maven.model.building.FileModelSource; + import org.apache.maven.model.building.ModelSource; +@@ -77,7 +78,13 @@ class AntModelResolver + public void addRepository( Repository repository ) + throws InvalidRepositoryException + { +- if ( !repositoryIds.add( repository.getId() ) ) ++ addRepository( repository, false ); ++ } ++ ++ public void addRepository( Repository repository, boolean replace ) ++ throws InvalidRepositoryException ++ { ++ if ( !repositoryIds.add( repository.getId() ) && !replace ) + { + return; + } +@@ -145,4 +152,10 @@ class AntModelResolver + return new FileModelSource( pomFile ); + } + ++ public ModelSource resolveModel( Parent parent ) ++ throws UnresolvableModelException ++ { ++ return resolveModel( parent.getGroupId(), parent.getArtifactId(), parent.getVersion() ); ++ } ++ + } +-- +1.9.3 + diff --git a/aether-ant-tasks.spec b/aether-ant-tasks.spec index 15d3bfe..63b3971 100644 --- a/aether-ant-tasks.spec +++ b/aether-ant-tasks.spec @@ -3,7 +3,7 @@ Name: aether-ant-tasks Epoch: 1 Version: 1.0.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Ant tasks using Aether to resolve, install and deploy artifacts Group: Development/Libraries BuildArch: noarch @@ -14,6 +14,7 @@ Source0: http://git.eclipse.org/c/aether/aether-ant.git/snapshot/%{name}- Source5: ant-classpath Patch0001: 0001-Add-support-for-XMvn-workspace-reader.patch +Patch0002: 0001-Update-to-Maven-3.2.3.patch BuildRequires: maven-local BuildRequires: mvn(junit:junit) @@ -52,6 +53,7 @@ This package contains the API documentation for %{name}. %prep %setup -q -n %{name}-%{version}.%{vertag} %patch0001 -p1 +%patch0002 -p1 # Use junit since junit-dep is obselete and equivilent to junit since 4.11 sed -i -e 's@junit-dep@junit@g' pom.xml @@ -78,6 +80,9 @@ install -p -m 644 %{SOURCE5} %{buildroot}/%{_sysconfdir}/ant.d/%{name} %doc epl-v10.html notice.html %changelog +* Fri Nov 7 2014 Mikolaj Izdebski - 1:1.0.0-3 +- Update to Maven 3.2.3 + * Sat Jun 07 2014 Fedora Release Engineering - 1:1.0.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild