Skip to content
Browse files

Extract common felix properties to the parent pom + manually merge in…

… Christiano's drools package-import/exports that make sense
  • Loading branch information...
1 parent 6671de0 commit b151c1026aeab59caed965b7ada03c6e68e7127a @ge0ffrey ge0ffrey committed Mar 26, 2013
Showing with 37 additions and 30 deletions.
  1. +12 −7 drools-compiler/pom.xml
  2. +8 −6 drools-core/pom.xml
  3. +3 −6 drools-decisiontables/pom.xml
  4. +11 −5 drools-persistence-jpa/pom.xml
  5. +3 −6 drools-templates/pom.xml
View
19 drools-compiler/pom.xml
@@ -249,18 +249,23 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
<configuration>
<instructions>
- <_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.compiler.*,!javax.enterprise.context.*,!javax.enterprise.inject.*,!javax.enterprise.event.*,!javax.enterprise.util.*,
+ <Import-Package>
+ !org.drools.compiler.*,
+ !javax.enterprise.context.*,
+ !javax.enterprise.inject.*,
+ !javax.enterprise.event.*,
+ !javax.enterprise.util.*,
<!-- java compilers are optional: only need one at most -->
- org.codehaus.janino.*;resolution:=optional,org.eclipse.jdt.*;resolution:=optional,*
+ org.codehaus.janino.*;resolution:=optional,
+ org.eclipse.jdt.*;resolution:=optional,
+ *
</Import-Package>
- <Export-Package>org.drools.compiler.lang.descr,!org.drools.commons.*,!org.drools.compiler.lang.*,!org.drools.compiler.cdi.*,org.drools.core.builder.impl,org.drools.compiler.*,org.kie.*</Export-Package>
- <DynamicImport-Package>*</DynamicImport-Package>
+ <Export-Package>
+ org.drools.compiler.*
+ </Export-Package>
<Bundle-Activator>org.drools.compiler.osgi.Activator</Bundle-Activator>
</instructions>
</configuration>
View
14 drools-core/pom.xml
@@ -170,15 +170,17 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
<configuration>
<instructions>
- <_removeheaders>Ignore-Package</_removeheaders>
<Bundle-SymbolicName>org.drools.core</Bundle-SymbolicName>
- <Require-Bundle>org.kie.internalapi;visibility:=reexport;bundle-version="${drools.osgi.version}"</Require-Bundle>
- <Import-Package>!org.drools.*,*,org.osgi.util.tracker</Import-Package>
- <Export-Package>org.drools.*</Export-Package>
- <DynamicImport-Package>*</DynamicImport-Package>
+ <Import-Package>
+ !org.drools.*,
+ org.osgi.util.tracker,
+ *
+ </Import-Package>
+ <Export-Package>
+ org.drools.core.*
+ </Export-Package>
<Bundle-Activator>org.drools.core.osgi.Activator</Bundle-Activator>
</instructions>
</configuration>
View
9 drools-decisiontables/pom.xml
@@ -65,15 +65,12 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>org.drools.decisiontables;singleton:=true</Bundle-SymbolicName>
- <_removeheaders>Ignore-Package</_removeheaders>
- <Require-Bundle>org.drools.core;bundle-version="${drools.osgi.version}"</Require-Bundle>
- <Import-Package>!org.drools.*,*</Import-Package>
- <Export-Package>org.drools.*</Export-Package>
- <DynamicImport-Package>org.drools.*</DynamicImport-Package>
+ <Export-Package>
+ org.drools.decisiontable.*
+ </Export-Package>
<Bundle-Activator>org.drools.decisiontable.osgi.Activator</Bundle-Activator>
</instructions>
</configuration>
View
16 drools-persistence-jpa/pom.xml
@@ -34,11 +34,17 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <_removeheaders>Ignore-Package</_removeheaders>
- <Require-Bundle>org.drools.core;bundle-version="${drools.osgi.version}", org.drools.compiler;bundle-version="${drools.osgi.version}"</Require-Bundle>
- <Import-Package>!org.drools.*,*</Import-Package>
- <Export-Package>org.drools.*</Export-Package>
- <DynamicImport-Package>*</DynamicImport-Package>
+ <Bundle-SymbolicName>org.drools.persistence;singleton:=true</Bundle-SymbolicName>
+ <Import-Package>
+ javax.transaction;resolution:=optional,
+ javax.naming;resolution:=optional,
+ org.osgi.framework.*;resolution:=optional,
+ javax.naming;resolution:=optional,
+ *
+ </Import-Package>
+ <Export-Package>
+ org.drools.persistence.*
+ </Export-Package>
<Bundle-Activator>org.drools.persistence.osgi.Activator</Bundle-Activator>
</instructions>
</configuration>
View
9 drools-templates/pom.xml
@@ -36,15 +36,12 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>org.drools.templates;singleton:=true</Bundle-SymbolicName>
- <_removeheaders>Ignore-Package</_removeheaders>
- <Require-Bundle>org.drools.core;bundle-version="${drools.osgi.version}"</Require-Bundle>
- <Import-Package>!org.drools.*,*</Import-Package>
- <Export-Package>org.drools.*</Export-Package>
- <DynamicImport-Package>org.drools.*</DynamicImport-Package>
+ <Export-Package>
+ org.drools.template.*
+ </Export-Package>
</instructions>
</configuration>
</plugin>

0 comments on commit b151c10

Please sign in to comment.
Something went wrong with that request. Please try again.