diff --git a/.gitignore b/.gitignore index e62609a..ed00c31 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ /xmvn-1.1.0.tar.xz /xmvn-1.2.0.tar.xz /xmvn-1.3.0.tar.xz +/xmvn-1.4.0.tar.xz diff --git a/sources b/sources index 730d82f..5cb6b28 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -deeb6e8256622279f56061755b0bc404 xmvn-1.3.0.tar.xz +5959a1e56987bd99060afe54158832c0 xmvn-1.4.0.tar.xz diff --git a/update-to-sisu-0.1.0.patch b/update-to-sisu-0.1.0.patch deleted file mode 100644 index 6e0e5a9..0000000 --- a/update-to-sisu-0.1.0.patch +++ /dev/null @@ -1,138 +0,0 @@ -From 58a8a1f41bdbd500926b1f294b1b81709dda7466 Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -Date: Wed, 13 Nov 2013 15:10:31 +0100 -Subject: [PATCH] Update to Sisu 0.1.0 - -Sisu depends on Guice, but dependency scope changed from "compile" to -"provided" in Sisu 0.1.0. As a Sisu user, XMvn needs to have runtime -dependency on Guice. ---- - xmvn-connector/pom.xml | 11 +++++++++++ - xmvn-core/pom.xml | 11 +++++++++++ - xmvn-mojo/pom.xml | 11 +++++++++++ - xmvn-parent/pom.xml | 9 ++++++++- - xmvn-tools/pom.xml | 11 +++++++++++ - 5 files changed, 52 insertions(+), 1 deletion(-) - -diff --git a/xmvn-connector/pom.xml b/xmvn-connector/pom.xml -index 23a4cd8..e01219b 100644 ---- a/xmvn-connector/pom.xml -+++ b/xmvn-connector/pom.xml -@@ -75,5 +75,16 @@ - org.eclipse.sisu - org.eclipse.sisu.plexus - -+ -+ org.sonatype.sisu -+ sisu-guice -+ no_aop -+ -+ -+ aopalliance -+ aopalliance -+ -+ -+ - - -diff --git a/xmvn-core/pom.xml b/xmvn-core/pom.xml -index 0b1da35..36ef433 100644 ---- a/xmvn-core/pom.xml -+++ b/xmvn-core/pom.xml -@@ -50,6 +50,17 @@ - org.eclipse.sisu.plexus - - -+ org.sonatype.sisu -+ sisu-guice -+ no_aop -+ -+ -+ aopalliance -+ aopalliance -+ -+ -+ -+ - org.codehaus.plexus - plexus-utils - -diff --git a/xmvn-mojo/pom.xml b/xmvn-mojo/pom.xml -index cf7fbe2..d949bc1 100644 ---- a/xmvn-mojo/pom.xml -+++ b/xmvn-mojo/pom.xml -@@ -72,6 +72,17 @@ - org.eclipse.sisu.plexus - - -+ org.sonatype.sisu -+ sisu-guice -+ no_aop -+ -+ -+ aopalliance -+ aopalliance -+ -+ -+ -+ - org.eclipse.aether - aether-api - -diff --git a/xmvn-parent/pom.xml b/xmvn-parent/pom.xml -index 1f1a025..53ac52f 100644 ---- a/xmvn-parent/pom.xml -+++ b/xmvn-parent/pom.xml -@@ -77,12 +77,13 @@ - 0.9.0.M3 - 2.3.0 - 1.32 -+ 3.1.8 - 2.1.1 - 3.1.1 - 3.0.15 - 1.5.5 - 3.2 -- 0.0.0.M5 -+ 0.1.0 - - - 1.3.2.GA -@@ -156,6 +157,12 @@ - ${sisuVersion} - - -+ org.sonatype.sisu -+ sisu-guice -+ ${guiceVersion} -+ no_aop -+ -+ - org.codehaus.plexus - plexus-utils - ${plexusUtilsVersion} -diff --git a/xmvn-tools/pom.xml b/xmvn-tools/pom.xml -index c37b109..0aebd8d 100644 ---- a/xmvn-tools/pom.xml -+++ b/xmvn-tools/pom.xml -@@ -51,6 +51,17 @@ - org.eclipse.sisu - org.eclipse.sisu.plexus - -+ -+ org.sonatype.sisu -+ sisu-guice -+ no_aop -+ -+ -+ aopalliance -+ aopalliance -+ -+ -+ - - - --- -1.8.3.1 - diff --git a/xmvn.spec b/xmvn.spec index 770a482..e0fe7d9 100644 --- a/xmvn.spec +++ b/xmvn.spec @@ -1,12 +1,11 @@ Name: xmvn -Version: 1.3.0 -Release: 4%{?dist} +Version: 1.4.0 +Release: 1%{?dist} Summary: Local Extensions for Apache Maven License: ASL 2.0 URL: http://mizdebsk.fedorapeople.org/xmvn BuildArch: noarch Source0: https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.xz -Patch0: update-to-sisu-0.1.0.patch BuildRequires: maven >= 3.1.1-13 BuildRequires: maven-local @@ -35,8 +34,6 @@ This package provides %{summary}. %prep %setup -q -%patch0 -p1 - # remove dependency plugin maven-binaries execution # we provide apache-maven by symlink %pom_xpath_remove "pom:executions/pom:execution[pom:id[text()='maven-binaries']]" @@ -145,6 +142,9 @@ end %doc LICENSE NOTICE %changelog +* Mon Dec 9 2013 Mikolaj Izdebski - 1.4.0-1 +- Update to upstream version 1.4.0 + * Thu Nov 14 2013 Michael Simacek - 1.3.0-4 - Update to Sisu 0.1.0