From 7eb258284127a8805015146d0ef51facf4bd8db1 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Tue, 24 Jul 2012 18:14:39 +0200
Subject: [PATCH] Convert patches to POM macros

This should simplify future updates.
---
 0001-Remove-test-deps.patch    | 54 ----------------------------------
 0002-Fix-plexus-bundling.patch | 43 ---------------------------
 sisu.spec                      | 22 ++++++++++----
 3 files changed, 16 insertions(+), 103 deletions(-)
 delete mode 100644 0001-Remove-test-deps.patch
 delete mode 100644 0002-Fix-plexus-bundling.patch

diff --git a/0001-Remove-test-deps.patch b/0001-Remove-test-deps.patch
deleted file mode 100644
index c65620a..0000000
--- a/0001-Remove-test-deps.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 9291bbba398b0ca8e4c72cd7e26ea031cfc87843 Mon Sep 17 00:00:00 2001
-From: Stanislav Ochotnicky <sochotnicky@redhat.com>
-Date: Mon, 28 Feb 2011 13:52:40 +0100
-Subject: [PATCH 1/2] Remove test deps
-
----
- pom.xml                                            |   13 -------------
- .../guice-bean/guice-bean-containers/pom.xml       |    6 ------
- 2 files changed, 0 insertions(+), 19 deletions(-)
-
-diff --git a/pom.xml b/pom.xml
-index 80e1d17..fbb4b73 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -98,19 +98,6 @@
-     <forgeReleaseUrl>https://repository.sonatype.org/service/local/staging/deploy/maven2</forgeReleaseUrl>
-   </properties>
- 
--  <dependencies>
--    <dependency>
--      <groupId>ch.qos.logback</groupId>
--      <artifactId>logback-classic</artifactId>
--      <scope>test</scope>
--    </dependency>
--    <dependency>
--      <groupId>junit</groupId>
--      <artifactId>junit</artifactId>
--      <scope>test</scope>
--    </dependency>
--  </dependencies>
--
-   <dependencyManagement>
-     <dependencies>
- 
-diff --git a/sisu-inject/containers/guice-bean/guice-bean-containers/pom.xml b/sisu-inject/containers/guice-bean/guice-bean-containers/pom.xml
-index 5e4fe00..e62de33 100644
---- a/sisu-inject/containers/guice-bean/guice-bean-containers/pom.xml
-+++ b/sisu-inject/containers/guice-bean/guice-bean-containers/pom.xml
-@@ -71,12 +71,6 @@
-       <artifactId>testng</artifactId>
-       <optional>true</optional>
-     </dependency>
--    <dependency>
--      <groupId>org.sonatype.sisu.inject</groupId>
--      <artifactId>guice-assistedinject</artifactId>
--      <version>${sisu.guice.version}</version>
--      <scope>test</scope>
--    </dependency>
-   </dependencies>
- 
-   <build>
--- 
-1.7.5.4
-
diff --git a/0002-Fix-plexus-bundling.patch b/0002-Fix-plexus-bundling.patch
deleted file mode 100644
index 18c9ccd..0000000
--- a/0002-Fix-plexus-bundling.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 21a050cb2cd0e175a27191bd84a89167a63a0a5b Mon Sep 17 00:00:00 2001
-From: Stanislav Ochotnicky <sochotnicky@redhat.com>
-Date: Mon, 28 Feb 2011 16:41:30 +0100
-Subject: [PATCH 2/2] Fix plexus bundling
-
----
- .../containers/guice-bean/sisu-inject-bean/pom.xml |    3 ---
- .../guice-plexus/sisu-inject-plexus/pom.xml        |    5 +++++
- 2 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/sisu-inject/containers/guice-bean/sisu-inject-bean/pom.xml b/sisu-inject/containers/guice-bean/sisu-inject-bean/pom.xml
-index 255740d..3b07992 100644
---- a/sisu-inject/containers/guice-bean/sisu-inject-bean/pom.xml
-+++ b/sisu-inject/containers/guice-bean/sisu-inject-bean/pom.xml
-@@ -100,9 +100,6 @@
-               org.slf4j
-             </DynamicImport-Package>
-             <Export-Package>
--              <!-- provide these APIs as a convenience -->
--              javax.inject|javax.enterprise.inject;version=1,
--              org.aopalliance.aop|org.aopalliance.intercept;version=1,
-               <!-- our JRS330 extension API -->
-               org.sonatype.inject;-split-package:=merge-first;version=${project.version},
-               <!-- our implementation APIs -->
-diff --git a/sisu-inject/containers/guice-plexus/sisu-inject-plexus/pom.xml b/sisu-inject/containers/guice-plexus/sisu-inject-plexus/pom.xml
-index 1cdf9b9..fc2d578 100644
---- a/sisu-inject/containers/guice-plexus/sisu-inject-plexus/pom.xml
-+++ b/sisu-inject/containers/guice-plexus/sisu-inject-plexus/pom.xml
-@@ -58,6 +58,11 @@
-       <artifactId>junit</artifactId>
-       <optional>true</optional>
-     </dependency>
-+    <dependency>
-+      <groupId>javax.inject</groupId>
-+      <artifactId>javax.inject</artifactId>
-+      <version>latest</version>
-+    </dependency>
-   </dependencies>
- 
-   <build>
--- 
-1.7.5.4
-
diff --git a/sisu.spec b/sisu.spec
index 667ee27..32f794a 100644
--- a/sisu.spec
+++ b/sisu.spec
@@ -1,6 +1,6 @@
 Name:           sisu
 Version:        2.2.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Sonatype dependency injection framework
 
 
@@ -12,9 +12,6 @@ URL:            http://github.com/sonatype/sisu
 # git archive --prefix="sisu-2.2.3/" --format=tar sisu-2.1.1 | xz > sisu-2.2.3.tar.xz
 Source0:        %{name}-%{version}.tar.xz
 Source1:        %{name}-depmap.xml
-Patch0:         0001-Remove-test-deps.patch
-Patch1:         0002-Fix-plexus-bundling.patch
-
 
 BuildArch:      noarch
 
@@ -61,8 +58,18 @@ Requires:       jpackage-utils
 %prep
 %setup -q
 
-%patch0 -p1
-%patch1 -p1
+for module in . sisu-inject/containers/guice-bean/guice-bean-containers; do
+    %pom_xpath_remove "pom:dependency[pom:scope[text()='test']]" $module; done
+
+# Fix plexus bundling
+sed -i -e '/provide these APIs as a convenience/,+2d' \
+    sisu-inject/containers/guice-bean/sisu-inject-bean/pom.xml
+%pom_xpath_inject "pom:project/pom:dependencies" "
+    <dependency>
+      <groupId>javax.inject</groupId>
+      <artifactId>javax.inject</artifactId>
+      <version>latest</version>
+    </dependency>" sisu-inject/containers/guice-plexus/sisu-inject-plexus
 
 # add backward compatible location
 cp sisu-inject/containers/guice-plexus/guice-plexus-lifecycles/src/main/java/org/sonatype/guice/plexus/lifecycles/*java \
@@ -173,6 +180,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 
 
 %changelog
+* Tue Jul 24 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.2.3-6
+- Convert patches to POM macros
+
 * Mon Jul 23 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.2.3-5
 - Fix license tag