Fix OSGi failing tests: part 1, exclude CDI and weld from OSGi

ursmma · Oct 16, 2012 · 7847172 · 7847172
1 parent 670fc08
commit 7847172
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/drools-compiler/pom.xml b/drools-compiler/pom.xml
@@ -134,10 +134,16 @@
       <artifactId>logback-classic</artifactId>
       <scope>test</scope>
     </dependency>
-
+
+    <dependency>
+      <groupId>javax.enterprise</groupId>
+      <artifactId>cdi-api</artifactId>
+      <scope>provided</scope><!-- HACK for OSGi: should be <optional>true</optional> instead -->
+    </dependency>
     <dependency>
-        <groupId>org.jboss.weld.se</groupId>
-        <artifactId>weld-se-core</artifactId>
+      <groupId>org.jboss.weld.se</groupId>
+      <artifactId>weld-se-core</artifactId>
+      <scope>provided</scope><!-- HACK for OSGi: should be <optional>true</optional> instead -->
     </dependency>     
   </dependencies>
 
@@ -256,12 +262,12 @@
             <_removeheaders>Ignore-Package</_removeheaders>
             <Bundle-SymbolicName>org.drools.compiler;singleton:=true</Bundle-SymbolicName>
             <Require-Bundle>org.drools.core;visibility:=reexport;bundle-version="${drools.osgi.version}"</Require-Bundle>
-            <Import-Package>!org.drools.*,
+            <Import-Package>!org.drools.*,!javax.enterprise.context.*,!javax.enterprise.inject.*,!javax.enterprise.event.*,!javax.enterprise.util.*,!org.jboss.weld.*,
               <!-- java compilers are optional: only need one at most -->
-              org.codehaus.janino.*;resolution:=optional,org.eclipse.jdt.*;resolution:=optional,org.jboss.weld.*;resolution:=optional,
+              org.codehaus.janino.*;resolution:=optional,org.eclipse.jdt.*;resolution:=optional,
                *
-            </Import-Package>              
-            <Export-Package>org.drools.lang.descr,!org.drools.commons.*, !org.drools.lang.*, org.drools.builder.impl,
+            </Import-Package>
+            <Export-Package>org.drools.lang.descr,!org.drools.commons.*,!org.drools.lang.*,!org.drools.cdi.*,org.drools.builder.impl,
               <!-- add this one manually as BND seems to miss it out -->
               org.drools.*</Export-Package>
             <DynamicImport-Package>*</DynamicImport-Package>