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 2015/02/17 12:37:57 UTC
[42/50] [abbrv] incubator-taverna-commandline git commit: Include
com.sun.source.util/.tree as 'extra'
Include com.sun.source.util/.tree as 'extra'
(from tools.jar of JDK)
Avoid taverna-interaction-activity as it is very broken
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-commandline/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-commandline/commit/505d9472
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-commandline/tree/505d9472
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-commandline/diff/505d9472
Branch: refs/heads/master
Commit: 505d94728176b04e694d336e8f60eae2a9f5bb93
Parents: 622b212
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Tue Jan 6 13:01:39 2015 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Tue Jan 6 13:01:39 2015 +0000
----------------------------------------------------------------------
taverna-commandline-product/pom.xml | 21 ++++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-commandline/blob/505d9472/taverna-commandline-product/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-commandline-product/pom.xml b/taverna-commandline-product/pom.xml
index fba41c5..41e73e6 100644
--- a/taverna-commandline-product/pom.xml
+++ b/taverna-commandline-product/pom.xml
@@ -100,7 +100,7 @@
</frameworkConfiguration>
<frameworkConfiguration>
<name>org.osgi.framework.system.packages.extra</name>
- <value>com.sun.org.apache.xml.internal.utils,org.apache.log4j;version=1.2.16,net.sf.taverna.t2.commandline.options;version=2.0.1</value>
+ <value>com.sun.org.apache.xml.internal.utils,com.sun.source.util,com.sun.source.tree,org.apache.log4j;version=1.2.16,net.sf.taverna.t2.commandline.options;version=2.0.1</value>
</frameworkConfiguration>
<frameworkConfiguration>
<name>org.osgi.framework.storage.clean</name>
@@ -293,11 +293,13 @@
<artifactId>taverna-external-tool-activity</artifactId>
<version>${taverna.commonactivities.version}</version>
</dependency>
+ <!-- VERY broken :(
<dependency>
<groupId>org.apache.taverna.commonactivities</groupId>
<artifactId>taverna-interaction-activity</artifactId>
<version>${taverna.commonactivities.version}</version>
</dependency>
+ -->
<dependency>
<groupId>org.apache.taverna.commonactivities</groupId>
<artifactId>taverna-rest-activity</artifactId>
@@ -442,13 +444,15 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.5</version>
+ <version>${slf4j.version}</version>
</dependency>
- <!-- Appears unrequired dependency>
+
+ <!-- Appears unrequired: -->
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.7.5</version>
- </dependency-->
+ <version>${slf4j.version}</version>
+ </dependency>
<!-- Taverna Security -->
<dependency>
@@ -506,6 +510,13 @@
<artifactId>jackson-databind</artifactId>
<version>2.3.0</version>
</dependency>
+
+ <dependency>
+ <groupId>nu.validator.htmlparser</groupId>
+ <artifactId>htmlparser</artifactId>
+ <version>1.4</version>
+ </dependency>
+
</dependencies>
<repositories>