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

… Christiano's drools package-import/exports that make sense
kiegroup · Mar 26, 2013 · 33457fc · 33457fc
1 parent 9b41b22
commit 33457fc
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 28 deletions.
diff --git a/jbpm-bpmn2-emfextmodel/pom.xml b/jbpm-bpmn2-emfextmodel/pom.xml
@@ -21,15 +21,12 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
         <configuration>
           <instructions>
-            <_nouses>true</_nouses>
-            <_snapshot>${osgi-version-qualifier}</_snapshot>
             <Bundle-SymbolicName>org.jbpm.bpmn2.emfextmodel;singleton:=true</Bundle-SymbolicName>
-            <Bundle-Version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.${osgi-version-qualifier}</Bundle-Version>
-            <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
-            <Export-Package>org.jboss.drools.*</Export-Package>
+            <Export-Package>
+              org.jboss.drools.*
+            </Export-Package>
           </instructions>
         </configuration>
       </plugin>

diff --git a/jbpm-bpmn2/pom.xml b/jbpm-bpmn2/pom.xml
@@ -120,14 +120,9 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
         <configuration>
           <instructions>
-            <_nouses>true</_nouses>
-            <_snapshot>${osgi-version-qualifier}</_snapshot>
             <Bundle-SymbolicName>org.jbpm.bpmn2</Bundle-SymbolicName>
-            <Bundle-Version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.${osgi-version-qualifier}</Bundle-Version>
-            <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
             <Bundle-Activator>org.jbpm.osgi.bpmn2.Activator</Bundle-Activator>
           </instructions>
         </configuration>

diff --git a/jbpm-flow-builder/pom.xml b/jbpm-flow-builder/pom.xml
@@ -21,14 +21,9 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
         <configuration>
           <instructions>
-            <_nouses>true</_nouses>
-            <_snapshot>${osgi-version-qualifier}</_snapshot>
             <Bundle-SymbolicName>org.jbpm.flow.builder;singleton:=true</Bundle-SymbolicName>
-            <Bundle-Version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.${osgi-version-qualifier}</Bundle-Version>
-            <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
             <Bundle-Activator>org.jbpm.osgi.flow.compiler.Activator</Bundle-Activator>
           </instructions>
         </configuration>

diff --git a/jbpm-flow/pom.xml b/jbpm-flow/pom.xml
@@ -21,14 +21,9 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
         <configuration>
           <instructions>
-            <_nouses>true</_nouses>
-            <_snapshot>${osgi-version-qualifier}</_snapshot>
             <Bundle-SymbolicName>org.jbpm.flow.core;singleton:=true</Bundle-SymbolicName>
-            <Bundle-Version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.${osgi-version-qualifier}</Bundle-Version>
-            <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
             <Import-Package>
                 javax.swing.*;resolution:=optional,
                 *

diff --git a/jbpm-persistence-jpa/pom.xml b/jbpm-persistence-jpa/pom.xml
@@ -116,16 +116,16 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
         <configuration>
           <instructions>
-            <_nouses>true</_nouses>
-            <_snapshot>${osgi-version-qualifier}</_snapshot>
             <Bundle-SymbolicName>org.jbpm.flow-persistence-jpa;singleton:=true</Bundle-SymbolicName>
-            <Bundle-Version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.${osgi-version-qualifier}</Bundle-Version>
-            <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
-            <Import-Package>javax.transaction.*;resolution:=optional,*</Import-Package>
-            <Export-Package>org.jbpm.persistence.*</Export-Package>
+            <Import-Package>
+              javax.transaction.*;resolution:=optional,
+              *
+            </Import-Package>
+            <Export-Package>
+              org.jbpm.persistence.*
+            </Export-Package>
           </instructions>
         </configuration>
       </plugin>