From 2ff87fa18bc15c5adf2910d78715d4fdd171b694 Mon Sep 17 00:00:00 2001
From: tijsrademakers <tijs.rademakers@alfresco.com>
Date: Fri, 4 Oct 2013 15:21:46 +0200
Subject: [PATCH] Activiti osgi fixes

---
 modules/activiti-engine/pom.xml | 20 +++++-----
 modules/activiti-ldap/pom.xml   | 67 +++++++++++++++++++++++++++++++++
 modules/activiti-osgi/pom.xml   |  2 +-
 pom.xml                         |  2 +-
 4 files changed, 79 insertions(+), 12 deletions(-)

diff --git a/modules/activiti-engine/pom.xml b/modules/activiti-engine/pom.xml
index 4814dd7fa11..149177db407 100644
--- a/modules/activiti-engine/pom.xml
+++ b/modules/activiti-engine/pom.xml
@@ -157,19 +157,19 @@
       org.activiti.db.mapping.entity
     </activiti.osgi.export.additional>
     <activiti.osgi.import.additional>
-      junit*;resolution:=optional,
-      org.junit*;resolution:=optional,
-      com.sun*;resolution:=optional,
-      javax.persistence*;resolution:=optional,
+      junit;resolution:=optional,
+      org.junit;resolution:=optional,
+      com.sun;resolution:=optional,
+      javax.persistence;resolution:=optional,
       org.apache.commons.mail;resolution:=optional,
-      org.apache.tools.ant*;resolution:=optional,
-      org.apache.xerces*;resolution:=optional,
+      org.apache.tools.ant;resolution:=optional,
+      org.apache.xerces;resolution:=optional,
       org.activiti.camel;resolution:=optional,
       org.activiti.camel.impl;resolution:=optional,
-      org.activiti.osgi*;resolution:=optional,
-      org.springframework*;resolution:=optional,
-      org.drools*;resolution:=optional,
-      com.fasterxml*;resolution:=optional,
+      org.activiti.osgi;resolution:=optional,
+      org.springframework;resolution:=optional,
+      org.drools;resolution:=optional,
+      com.fasterxml;resolution:=optional,
     </activiti.osgi.import.additional>
   </properties>
 
diff --git a/modules/activiti-ldap/pom.xml b/modules/activiti-ldap/pom.xml
index 39119009cc8..c7f604a3b96 100644
--- a/modules/activiti-ldap/pom.xml
+++ b/modules/activiti-ldap/pom.xml
@@ -12,6 +12,12 @@
 		<relativePath>../..</relativePath>
 		<version>5.14-SNAPSHOT</version>
 	</parent>
+  
+  <properties>
+    <activiti.artifact>
+      org.activiti.ldap
+    </activiti.artifact>
+  </properties>
 
 	<dependencies>
 		<dependency>
@@ -168,7 +174,68 @@
 					<target>1.6</target>
 				</configuration>
 			</plugin>
+      <plugin>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>cleanVersions</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>bundle-manifest</id>
+            <phase>process-classes</phase>
+            <goals>
+              <goal>manifest</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
 		</plugins>
+    <pluginManagement>
+      <plugins>
+        <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+        <plugin>
+          <groupId>org.eclipse.m2e</groupId>
+          <artifactId>lifecycle-mapping</artifactId>
+          <version>1.0.0</version>
+          <configuration>
+            <lifecycleMappingMetadata>
+              <pluginExecutions>
+                <pluginExecution>
+                  <pluginExecutionFilter>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>
+                      maven-bundle-plugin
+                    </artifactId>
+                    <versionRange>
+                      [2.1.0,)
+                    </versionRange>
+                    <goals>
+                      <goal>cleanVersions</goal>
+                      <goal>manifest</goal>
+                    </goals>
+                  </pluginExecutionFilter>
+                  <action>
+                    <ignore></ignore>
+                  </action>
+                </pluginExecution>
+              </pluginExecutions>
+            </lifecycleMappingMetadata>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
 	</build>
 
 </project>
diff --git a/modules/activiti-osgi/pom.xml b/modules/activiti-osgi/pom.xml
index 3c785f92699..2de6e7dd891 100644
--- a/modules/activiti-osgi/pom.xml
+++ b/modules/activiti-osgi/pom.xml
@@ -52,7 +52,7 @@
       org.activiti.osgi.Activator
     </activiti.osgi.activator>
     <activiti.osgi.import.pkg>
-      org.apache.felix.fileinstall*;resolution:=optional,*
+      org.apache.felix.fileinstall;resolution:=optional,*
     </activiti.osgi.import.pkg>
     <activiti.artifact>
       org.activiti.osgi
diff --git a/pom.xml b/pom.xml
index 618e661339f..8761e7cac47 100644
--- a/pom.xml
+++ b/pom.xml
@@ -627,7 +627,7 @@
             <Bundle-SymbolicName>${activiti.osgi.symbolic.name}</Bundle-SymbolicName>
             <Bundle-Activator>${activiti.osgi.activator}</Bundle-Activator>
             <Export-Package>${activiti.osgi.export}</Export-Package>
-            <Import-Package>org.activiti.osgi*;resolution:=optional, ${activiti.osgi.import}</Import-Package>
+            <Import-Package>org.activiti.osgi;resolution:=optional, ${activiti.osgi.import}</Import-Package>
             <DynamicImport-Package>${activiti.osgi.dynamic}</DynamicImport-Package>
             <Private-Package>${activiti.osgi.private.pkg}</Private-Package>
             <Implementation-Title>Activiti</Implementation-Title>