diff --git a/0002-Fix-plexus-bundling.patch b/0002-Fix-plexus-bundling.patch index 554ead9..b3d2496 100644 --- a/0002-Fix-plexus-bundling.patch +++ b/0002-Fix-plexus-bundling.patch @@ -1,12 +1,12 @@ -From 754a250de67f064662072c87f4f3e129ee149991 Mon Sep 17 00:00:00 2001 +From 41cd3cd04bff79d15d2e4eebdc33a429f0aa41f2 Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Mon, 28 Feb 2011 16:41:30 +0100 Subject: [PATCH 2/2] Fix plexus bundling --- sisu-inject/guice-bean/sisu-inject-bean/pom.xml | 1 - - .../guice-plexus/sisu-inject-plexus/pom.xml | 3 --- - 2 files changed, 0 insertions(+), 4 deletions(-) + .../guice-plexus/sisu-inject-plexus/pom.xml | 8 +++++--- + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sisu-inject/guice-bean/sisu-inject-bean/pom.xml b/sisu-inject/guice-bean/sisu-inject-bean/pom.xml index 44f53bd..adbccd0 100644 @@ -21,10 +21,22 @@ index 44f53bd..adbccd0 100644 org.sonatype.guice.bean.* diff --git a/sisu-inject/guice-plexus/sisu-inject-plexus/pom.xml b/sisu-inject/guice-plexus/sisu-inject-plexus/pom.xml -index c49291f..6afb568 100644 +index c49291f..4552450 100644 --- a/sisu-inject/guice-plexus/sisu-inject-plexus/pom.xml +++ b/sisu-inject/guice-plexus/sisu-inject-plexus/pom.xml -@@ -74,9 +74,6 @@ +@@ -51,6 +51,11 @@ + guice-plexus-shim + true + ++ ++ javax.inject ++ javax.inject ++ latest ++ + + + +@@ -74,9 +79,6 @@ org.slf4j,junit.framework diff --git a/sisu.spec b/sisu.spec index 992f95e..76f2ee9 100644 --- a/sisu.spec +++ b/sisu.spec @@ -1,6 +1,6 @@ Name: sisu Version: 2.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Sonatype dependency injection framework @@ -138,6 +138,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : %changelog +* Tue Mar 1 2011 Stanislav Ochotnicky - 2.1.1-2 +- Add atinject into poms as dependency + * Mon Feb 28 2011 Stanislav Ochotnicky - 2.1.1-1 - Update to 2.1.1 - Update patch