Add atinject into poms as dependency

This commit is contained in:
Stanislav Ochotnicky 2011-03-01 14:22:27 +01:00
parent d172bc0dcb
commit cd8058f9a4
2 changed files with 21 additions and 6 deletions

View File

@ -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 <sochotnicky@redhat.com>
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
<Private-Package>
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 @@
<artifactId>guice-plexus-shim</artifactId>
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ <version>latest</version>
+ </dependency>
</dependencies>
<build>
@@ -74,9 +79,6 @@
<DynamicImport-Package>
org.slf4j,junit.framework
</DynamicImport-Package>

View File

@ -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 <sochotnicky@redhat.com> - 2.1.1-2
- Add atinject into poms as dependency
* Mon Feb 28 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 2.1.1-1
- Update to 2.1.1
- Update patch