[sisu] Add backward compatible package path for lifecycles

[Stanislav Ochotnicky]

commit 012cd025731439c3f37f086bf91c472e756cfacf
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Mon Aug 22 13:39:33 2011 +0200

    Add backward compatible package path for lifecycles
    
    - Remove temporary BRs/Rs

 sisu-depmap.xml |   11 +++++++++++
 sisu.spec       |   29 ++++++++++-------------------
 2 files changed, 21 insertions(+), 19 deletions(-)
---
diff --git a/sisu-depmap.xml b/sisu-depmap.xml
index 4b86523..bae76cd 100644
--- a/sisu-depmap.xml
+++ b/sisu-depmap.xml
@@ -35,4 +35,15 @@
             <artifactId>reporting-api</artifactId>
         </jpp>
     </dependency>
+    <!-- for snakeyaml -->
+    <dependency>
+      <maven>
+        <groupId>com.google.gdata</groupId>
+        <artifactId>gdata-core</artifactId>
+      </maven>
+      <jpp>
+        <groupId>JPP</groupId>
+        <artifactId>gdata/gdata-core</artifactId>
+      </jpp>
+    </dependency>
 </dependencies>
diff --git a/sisu.spec b/sisu.spec
index b9aa70b..05e2105 100644
--- a/sisu.spec
+++ b/sisu.spec
@@ -1,6 +1,6 @@
 Name:           sisu
 Version:        2.2.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Sonatype dependency injection framework
 
 
@@ -37,26 +37,8 @@ BuildRequires:  atinject
 BuildRequires:  felix-framework
 BuildRequires:  forge-parent
 BuildRequires:  maven-surefire-provider-testng
-
-# to get out of cyclic build failures, should be removed in next release
-# maven-resources-plugin
-BuildRequires:  plexus-build-api
-Requires:       plexus-build-api
-
-# maven-compiler-plugin
-BuildRequires:  plexus-compiler
-Requires:       plexus-compiler
-
-# maven-site-plugin and maven-dependency-plugin
-BuildRequires:  maven-shared-reporting-api
-Requires:       maven-shared-reporting-api
-
-# maven-surefire providers (various)
 BuildRequires:  maven-surefire-provider-junit4
-BuildRequires:  maven-surefire-provider-junit
 
-# maven-dependency-plugin
-BuildRequires:  maven-shared-file-management
 
 Requires:       forge-parent
 Requires:       google-guice
@@ -82,6 +64,11 @@ Requires:       jpackage-utils
 %patch0 -p1
 %patch1 -p1
 
+# add backward compatible location
+cp sisu-inject/containers/guice-plexus/guice-plexus-lifecycles/src/main/java/org/sonatype/guice/plexus/lifecycles/*java \
+   sisu-inject/containers/guice-plexus/guice-plexus-lifecycles/src/main/java/org/codehaus/plexus/
+sed -i 's/org.sonatype.guice.plexus.lifecycles/org.codehaus.plexus/' \
+       sisu-inject/containers/guice-plexus/guice-plexus-lifecycles/src/main/java/org/codehaus/plexus/*java
 
 # TODO enable guice-eclipse
 sed -i 's:.*guice-eclipse.*::g' sisu-inject/pom.xml
@@ -186,6 +173,10 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 
 
 %changelog
+* Fri Aug 19 2011 Stanislav Ochotnicky <sochotnicky at redhat.com> - 2.2.3-2
+- Add backward compatible package path for lifecycles
+- Remove temporary BRs/Rs
+
 * Thu Jun 23 2011 Stanislav Ochotnicky <sochotnicky at redhat.com> - 2.2.3-1
 - Update to latest upstream 2.2.3 (#683795)
 - Add forge-parent to Requires