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 9b41b22 commit 33457fc3e447d18147e60daefe129df96111de89 @ge0ffrey ge0ffrey committed
Showing with 10 additions and 28 deletions.
  1. +3 −6 jbpm-bpmn2-emfextmodel/pom.xml
  2. +0 −5 jbpm-bpmn2/pom.xml
  3. +0 −5 jbpm-flow-builder/pom.xml
  4. +0 −5 jbpm-flow/pom.xml
  5. +7 −7 jbpm-persistence-jpa/pom.xml
View
9 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>
View
5 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>
View
5 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>
View
5 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,
*
View
14 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>

0 comments on commit 33457fc

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