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/18 17:00:42 UTC
incubator-taverna-commandline git commit: specify
org.apache.taverna.commandline.options version
Repository: incubator-taverna-commandline
Updated Branches:
refs/heads/master 69d9ae8cd -> 5e9e55d32
specify org.apache.taverna.commandline.options version
.. but through a <properties> in parent
to avoid errors of invalid OSGi version number
including -incubating and -SNAPSHOT
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/5e9e55d3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-commandline/tree/5e9e55d3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-commandline/diff/5e9e55d3
Branch: refs/heads/master
Commit: 5e9e55d32ac127b4154c9d2e9b5392bcc52501c8
Parents: 69d9ae8
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon Jan 18 15:58:24 2016 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Jan 18 15:58:24 2016 +0000
----------------------------------------------------------------------
pom.xml | 25 +++++++++++++++++++------
taverna-commandline-product/pom.xml | 2 +-
2 files changed, 20 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-commandline/blob/5e9e55d3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d7833b4..b80b8d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,12 +11,25 @@
<version>3.1.0-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Taverna Command Line</name>
- <properties>
- <taverna.language.version>0.15.1-incubating-SNAPSHOT</taverna.language.version>
- <taverna.osgi.version>0.2.1-incubating-SNAPSHOT</taverna.osgi.version>
- <taverna.engine.version>3.1.0-incubating-SNAPSHOT</taverna.engine.version>
- <taverna.commonactivities.version>2.1.0-incubating-SNAPSHOT</taverna.commonactivities.version>
- </properties>
+ <properties>
+ <taverna.language.version>0.15.1-incubating-SNAPSHOT</taverna.language.version>
+ <taverna.osgi.version>0.2.1-incubating-SNAPSHOT</taverna.osgi.version>
+ <taverna.engine.version>3.1.0-incubating-SNAPSHOT</taverna.engine.version>
+ <taverna.commonactivities.version>2.1.0-incubating-SNAPSHOT</taverna.commonactivities.version>
+
+ <!--
+ Update below version number to match the <version> above.
+
+ This osgiversion is required for passing the parsed
+ org.apache.taverna.commandline.options.CommandLineOptions
+ from the taverna-commandline-launcher (running outside OSGi)
+ to taverna-commandline-common (running inside OSGi)
+ and therefore must be a falid x.y.z.0 OSGi version number
+ corersponding to the ${pom.version} - but without -SNAPSHOT
+ or -incubating
+ -->
+ <taverna.commandline.osgiversion>3.1.0.0</taverna.commandline.osgiversion>
+ </properties>
<modules>
<module>taverna-commandline-api</module>
<module>taverna-commandline-common</module>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-commandline/blob/5e9e55d3/taverna-commandline-product/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-commandline-product/pom.xml b/taverna-commandline-product/pom.xml
index 0735928..02579ad 100644
--- a/taverna-commandline-product/pom.xml
+++ b/taverna-commandline-product/pom.xml
@@ -99,7 +99,7 @@
</frameworkConfiguration>
<frameworkConfiguration>
<name>org.osgi.framework.system.packages.extra</name>
- <value>com.sun.org.apache.xml.internal.utils,com.sun.source.util,com.sun.source.tree,org.apache.log4j;version=${log4j.version},org.apache.taverna.commandline.options</value>
+ <value>com.sun.org.apache.xml.internal.utils,com.sun.source.util,com.sun.source.tree,org.apache.log4j;version=${log4j.version},org.apache.taverna.commandline.options;version=${taverna.commandline.osgiversion}</value>
</frameworkConfiguration>
<frameworkConfiguration>
<name>org.osgi.framework.storage.clean</name>