Build fixes
diff --git a/taverna-commandline-product/pom.xml b/taverna-commandline-product/pom.xml
index 270b1de..5fd1146 100644
--- a/taverna-commandline-product/pom.xml
+++ b/taverna-commandline-product/pom.xml
@@ -35,6 +35,18 @@
<activation>
<activeByDefault>true</activeByDefault>
</activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <attach>false</attach>
+ <appendAssemblyId>false</appendAssemblyId>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
<properties>
<assembly.descriptor>src/main/assembly/developer-assembly.xml</assembly.descriptor>
<!-- See http://updates.taverna.org.uk/ -->
@@ -423,12 +435,19 @@
<version>4.2.5</version>
</dependency-->
<!-- Jena bundle needed by jsonld-java-jena -->
- <!-- See https://github.com/stain/jena/tree/jena-bundle/jena-bundle -->
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-osgi</artifactId>
<version>${jena.version}</version>
</dependency>
+ <!-- Newer jsonld-java as jena-osgi depends on outdated 0.5.0 -->
+ <dependency>
+ <groupId>com.github.jsonld-java</groupId>
+ <artifactId>jsonld-java</artifactId>
+ <version>0.7.0</version>
+ <!-- However don't require too new jackson -->
+ </dependency>
+
<!-- slf4j implementation -->
<!-- The bundle "org.purl.wf4ever.robundle_0.3.1 " could not be resolved. Reason: Missing Constraint: Import-Package: org.slf4j; version="[1.7.0,2.0.0)"-->
<dependency>
@@ -488,17 +507,17 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>2.3.0</version>
+ <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
- <version>2.3.0</version>
+ <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.3.0</version>
+ <version>${jackson.version}</version>
</dependency>
<dependency>
@@ -509,4 +528,5 @@
</dependencies>
+
</project>
diff --git a/taverna-commandline-product/src/main/assembly/developer-assembly.xml b/taverna-commandline-product/src/main/assembly/developer-assembly.xml
index de61107..4470ee7 100644
--- a/taverna-commandline-product/src/main/assembly/developer-assembly.xml
+++ b/taverna-commandline-product/src/main/assembly/developer-assembly.xml
@@ -22,9 +22,11 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
<id>dev</id>
+ <includeBaseDirectory>false</includeBaseDirectory>
<formats>
<format>dir</format>
</formats>
+
<componentDescriptors>
<componentDescriptor>dependencies-component.xml</componentDescriptor>
</componentDescriptors>
diff --git a/taverna-commandline-product/src/main/etc/executeworkflow.bat b/taverna-commandline-product/src/main/etc/executeworkflow.bat
index 09ff2e8..2a65c9c 100644
--- a/taverna-commandline-product/src/main/etc/executeworkflow.bat
+++ b/taverna-commandline-product/src/main/etc/executeworkflow.bat
@@ -17,5 +17,5 @@
set JAR="%TAVERNA_HOME%lib/org.apache.taverna.commandline/taverna-commandline-launcher-3.1.0-incubating.jar"
REM find *.launcher jar
for %%f in ("%TAVERNA_HOME%lib\org.apache.taverna.commandline\taverna-commandline-launcher*.jar") DO set JAR="%%f"
-
-java %ARGS% -jar "%TAVERNA_HOME%lib/org.apache.taverna.commandline/taverna-commandline-launcher-3.1.0-incubating-SNAPSHOT.jar" %*
+REM echo %JAR%
+java %ARGS% -jar %JAR% %*
