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/04/27 19:34:22 UTC
[2/3] incubator-taverna-commandline git commit: Use Felix instead of
equinox
Use Felix instead of equinox
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/6df47c74
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-commandline/tree/6df47c74
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-commandline/diff/6df47c74
Branch: refs/heads/master
Commit: 6df47c74ca7419da80fc40d009143b40b8bc99e8
Parents: ab1d5cc
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Wed Apr 27 18:31:09 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Wed Apr 27 18:31:09 2016 +0100
----------------------------------------------------------------------
pom.xml | 2 ++
taverna-commandline-launcher/pom.xml | 12 +++++++-----
2 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-commandline/blob/6df47c74/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 78f29f8..88eefff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,6 +48,8 @@
or -incubating
-->
<taverna.commandline.osgiversion>3.1.0.0</taverna.commandline.osgiversion>
+ <commons.cli.version>1.3.1</commons.cli.version>
+ <osgi.felix.version>4.6.1</osgi.felix.version>
</properties>
<modules>
<module>taverna-commandline-api</module>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-commandline/blob/6df47c74/taverna-commandline-launcher/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-commandline-launcher/pom.xml b/taverna-commandline-launcher/pom.xml
index e5718d7..b55f443 100644
--- a/taverna-commandline-launcher/pom.xml
+++ b/taverna-commandline-launcher/pom.xml
@@ -64,8 +64,8 @@
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>com.springsource.org.apache.commons.cli</artifactId>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
<version>${commons.cli.version}</version>
</dependency>
<dependency>
@@ -78,18 +78,20 @@
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
</dependency>
+<!--
+OSGi framework:
<dependency>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.osgi</artifactId>
<version>${osgi.equinox.version}</version>
</dependency>
- <!-- TODO: replace equinox with:
+OR felix:
+-->
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.main</artifactId>
- <version>4.4.1</version>
+ <version>${osgi.felix.version}</version>
</dependency>
- -->
<dependency>