sisu/0002-Fix-plexus-bundling.patch
Stanislav Ochotnicky 0669aa6325 Update to latest upstream 2.2.3 (#683795)
- Add forge-parent to Requires
- Rework spec to be more simple, update patches
2011-06-23 16:17:14 +02:00

44 lines
1.8 KiB
Diff

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