You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by st...@apache.org on 2016/01/11 18:23:44 UTC
incubator-taverna-common-activities git commit: do not import
org.apache.bsf.*
Repository: incubator-taverna-common-activities
Updated Branches:
refs/heads/master 6367e738b -> f440ebefa
do not import org.apache.bsf.*
.. we don't use it
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/commit/f440ebef
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/tree/f440ebef
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/diff/f440ebef
Branch: refs/heads/master
Commit: f440ebefaedbb3c606c2c6239d135da0606acf2a
Parents: 6367e73
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon Jan 11 17:23:23 2016 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Jan 11 17:23:34 2016 +0000
----------------------------------------------------------------------
taverna-beanshell-activity/pom.xml | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/f440ebef/taverna-beanshell-activity/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-beanshell-activity/pom.xml b/taverna-beanshell-activity/pom.xml
index 1df0f2a..40d9773 100644
--- a/taverna-beanshell-activity/pom.xml
+++ b/taverna-beanshell-activity/pom.xml
@@ -20,6 +20,8 @@
<configuration>
<instructions>
<Embed-Dependency>artifactId=bsh</Embed-Dependency>
+ <Import-Package>!org.apache.bsf.*,!javax.swing.*,*</Import-Package>
+
</instructions>
</configuration>
</plugin>
@@ -70,7 +72,22 @@
<groupId>org.apache-extras.beanshell</groupId>
<artifactId>bsh</artifactId>
<version>${bsh.version}</version>
+ <optional>true</optional>
+<!-- NOTE: bsh is not really optional, but it is embedded in our jar as bsh is
+not yet available as a OSGi bundle -->
+ </dependency>
+<!--
+ <dependency>
+ <groupId>org.apache.bsf</groupId>
+ <artifactId>bsf-api</artifactId>
+ <version>3.1</version>
+ <optional>true</optional>
</dependency>
+-->
+
+
+
+
</dependencies>