52 lines
1.9 KiB
Diff
52 lines
1.9 KiB
Diff
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 | 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
|
|
--- a/sisu-inject/guice-bean/sisu-inject-bean/pom.xml
|
|
+++ b/sisu-inject/guice-bean/sisu-inject-bean/pom.xml
|
|
@@ -74,7 +74,6 @@
|
|
</DynamicImport-Package>
|
|
<Export-Package>
|
|
org.sonatype.inject;-noimport:=true;-split-package:=merge-first;version=${project.version},
|
|
- javax.*|org.aopalliance.*;version=1
|
|
</Export-Package>
|
|
<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..4552450 100644
|
|
--- a/sisu-inject/guice-plexus/sisu-inject-plexus/pom.xml
|
|
+++ b/sisu-inject/guice-plexus/sisu-inject-plexus/pom.xml
|
|
@@ -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>
|
|
- <Export-Package>
|
|
- org.codehaus.plexus.*;-noimport:=true;-split-package:=merge-first
|
|
- </Export-Package>
|
|
<Private-Package>
|
|
META-INF.plexus,org.sonatype.guice.plexus.*
|
|
</Private-Package>
|
|
--
|
|
1.7.4
|
|
|