Repository: incubator-taverna-commandline Updated Branches: refs/heads/master 3a9a55ae2 -> 83841c40c
Changed OSGI version tp 0.2.1-incubating-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/83841c40 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-commandline/tree/83841c40 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-commandline/diff/83841c40 Branch: refs/heads/master Commit: 83841c40c441d4d399792e2b715b6e5afd5ce6f7 Parents: 3a9a55a Author: Dmitry Repchevsky <[email protected]> Authored: Thu Oct 22 12:23:28 2015 +0200 Committer: Dmitry Repchevsky <[email protected]> Committed: Thu Oct 22 12:24:10 2015 +0200 ---------------------------------------------------------------------- pom.xml | 2 +- taverna-commandline-launcher/pom.xml | 6 ++++++ .../taverna/commandline/TavernaCommandLine.java | 15 +++++++-------- 3 files changed, 14 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-commandline/blob/83841c40/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index e8fb99b..a04c924 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ <name>Apache Taverna Command Line</name> <properties> <taverna.language.version>0.15.0-incubating</taverna.language.version> - <taverna.osgi.version>0.2.0-incubating-SNAPSHOT</taverna.osgi.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> http://git-wip-us.apache.org/repos/asf/incubator-taverna-commandline/blob/83841c40/taverna-commandline-launcher/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-commandline-launcher/pom.xml b/taverna-commandline-launcher/pom.xml index 50959d7..37d9899 100644 --- a/taverna-commandline-launcher/pom.xml +++ b/taverna-commandline-launcher/pom.xml @@ -79,5 +79,11 @@ <version>${junit.version}</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.taverna.osgi</groupId> + <artifactId>taverna-app-configuration-api</artifactId> + <version>${taverna.osgi.version}</version> + <type>jar</type> + </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/incubator-taverna-commandline/blob/83841c40/taverna-commandline-launcher/src/main/java/org/apache/taverna/commandline/TavernaCommandLine.java ---------------------------------------------------------------------- diff --git a/taverna-commandline-launcher/src/main/java/org/apache/taverna/commandline/TavernaCommandLine.java b/taverna-commandline-launcher/src/main/java/org/apache/taverna/commandline/TavernaCommandLine.java index 64a7f38..2dbf984 100644 --- a/taverna-commandline-launcher/src/main/java/org/apache/taverna/commandline/TavernaCommandLine.java +++ b/taverna-commandline-launcher/src/main/java/org/apache/taverna/commandline/TavernaCommandLine.java @@ -29,18 +29,17 @@ import java.util.Map; import org.apache.taverna.commandline.exceptions.ArgumentsParsingException; import org.apache.taverna.commandline.exceptions.InvalidOptionException; import org.apache.taverna.commandline.options.CommandLineOptions; +import org.apache.taverna.configuration.app.ApplicationConfiguration; +import org.apache.taverna.configuration.app.impl.ApplicationConfigurationImpl; +import org.apache.taverna.configuration.app.impl.Log4JConfiguration; +import org.apache.taverna.osgilauncher.OsgiLauncher; +import org.apache.taverna.profile.xml.jaxb.ApplicationProfile; +import org.apache.taverna.profile.xml.jaxb.BundleInfo; +import org.apache.taverna.profile.xml.jaxb.FrameworkConfiguration; import org.osgi.framework.BundleContext; import org.osgi.framework.BundleException; -import uk.org.taverna.commons.profile.xml.jaxb.ApplicationProfile; -import uk.org.taverna.commons.profile.xml.jaxb.BundleInfo; -import uk.org.taverna.commons.profile.xml.jaxb.FrameworkConfiguration; -import uk.org.taverna.configuration.app.ApplicationConfiguration; -import uk.org.taverna.configuration.app.impl.ApplicationConfigurationImpl; -import uk.org.taverna.configuration.app.impl.Log4JConfiguration; -import uk.org.taverna.osgi.OsgiLauncher; - /** * Main entry point for starting the Taverna Command Line Tool. *
