Merge branch 'master' of https://github.com/Chalana/incubator-taverna-engine
TAVERNA-977 Fixes bundle plugin build erroirs
Contributed by Chalana in #4
Signed-off-by: Stian Soiland-Reyes <stain@apache.org>
diff --git a/taverna-activity-archetype/src/main/resources/archetype-resources/pom.xml b/taverna-activity-archetype/src/main/resources/archetype-resources/pom.xml
index 8e54ab3..ce2ef9f 100644
--- a/taverna-activity-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/taverna-activity-archetype/src/main/resources/archetype-resources/pom.xml
@@ -60,6 +60,9 @@
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <skipIfEmpty>true</skipIfEmpty>
+ </configuration>
<executions>
<execution>
<goals>
diff --git a/taverna-reference-impl/pom.xml b/taverna-reference-impl/pom.xml
index 0222021..65042c3 100644
--- a/taverna-reference-impl/pom.xml
+++ b/taverna-reference-impl/pom.xml
@@ -51,10 +51,9 @@
<instructions>
<Import-Package>
org.aspectj.lang,
- org.springframework.orm.*,
*
</Import-Package>
- <!-- <Import-Package> org.aspectj.lang;resolution:=optional, org.springframework.orm.*;resolution:=optional,
+ <!-- <Import-Package> org.aspectj.lang;resolution:=optional, org.springframework.orm.*;resolution:=optional,
org.hibernate.*;resolution:=optional, org.hibernate.proxy;resolution:=optional,
org.apache.derby.jdbc, * </Import-Package> -->
</instructions>
diff --git a/taverna-workflowmodel-impl/pom.xml b/taverna-workflowmodel-impl/pom.xml
index b894b92..10d1597 100644
--- a/taverna-workflowmodel-impl/pom.xml
+++ b/taverna-workflowmodel-impl/pom.xml
@@ -44,6 +44,7 @@
org.apache.taverna.invocation.impl,
org.apache.taverna.workflowmodel.impl,
org.apache.taverna.workflowmodel.processor.iteration.impl,
+ org.apache.taverna.workflowmodel.processor.dispatch.impl,
</Export-Package>
</instructions>
</configuration>
