Merge branch 'core' into biodiversity
Conflicts:
src/main/install4j/taverna-commandline.install4j
diff --git a/pom.xml b/pom.xml
index 80c52f6..3980ba4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,9 +11,9 @@
<!-- ##### For each branch, change ${edition} below -->
<artifactId>taverna-commandline-${edition}</artifactId>
- <name>Taverna Command Line Tool Core</name>
+ <name>Taverna Command Line Tool Biodiversity</name>
<properties>
- <edition>core</edition>
+ <edition>biodiversity</edition>
<!-- ######## -->
<raven.app.name>taverna-cmd-${edition}-${project.version}-${buildNumber}</raven.app.name>
@@ -76,7 +76,6 @@
<version>${t2.activities.version}</version>
<scope>test</scope>
</dependency>
- <!--
<dependency>
<groupId>net.sf.taverna.t2.activities</groupId>
@@ -84,7 +83,6 @@
<version>${t2.activities.version}</version>
<scope>test</scope>
</dependency>
- -->
<dependency>
<groupId>net.sf.taverna.t2.taverna-commandline</groupId>
@@ -268,6 +266,62 @@
<artifactItem>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
+ <version>1.7</version>
+ <type>pom</type>
+ <outputDirectory>${project.build.directory}/repository/commons-codec/commons-codec/1.7</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.7</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/repository/commons-codec/commons-codec/1.7</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.2</version>
+ <type>pom</type>
+ <outputDirectory>${project.build.directory}/repository/commons-logging/commons-logging/1.1.2</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.2</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/repository/commons-logging/commons-logging/1.1.2</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-parent</artifactId>
+ <version>28</version>
+ <type>pom</type>
+ <outputDirectory>${project.build.directory}/repository/org/apache/commons/commons-parent/28</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-parent</artifactId>
+ <version>26</version>
+ <type>pom</type>
+ <outputDirectory>${project.build.directory}/repository/org/apache/commons/commons-parent/26</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.6.4</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/repository/org/slf4j/slf4j-log4j12/1.6.4</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.6.4</version>
+ <type>pom</type>
+ <outputDirectory>${project.build.directory}/repository/org/slf4j/slf4j-log4j12/1.6.4</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
<version>1.3</version>
<type>jar</type>
<outputDirectory>${project.build.directory}/repository/commons-codec/commons-codec/1.3</outputDirectory>
@@ -280,18 +334,39 @@
<outputDirectory>${project.build.directory}/repository/commons-codec/commons-codec/1.3</outputDirectory>
</artifactItem>
<artifactItem>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.6.4</version>
- <type>jar</type>
- <outputDirectory>${project.build.directory}/repository/org/slf4j/slf4j-log4j12/1.6.4</outputDirectory>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.4</version>
+ <type>pom</type>
+ <outputDirectory>${project.build.directory}/repository/commons-logging/commons-logging/1.0.4</outputDirectory>
</artifactItem>
<artifactItem>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.6.4</version>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.4</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/repository/commons-logging/commons-logging/1.0.4</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcomponents-core</artifactId>
+ <version>4.0.1</version>
<type>pom</type>
- <outputDirectory>${project.build.directory}/repository/org/slf4j/slf4j-log4j12/1.6.4</outputDirectory>
+ <outputDirectory>${project.build.directory}/repository/org/apache/httpcomponents/httpcomponents-core/4.0.1</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>4.0.1</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/repository/org/apache/httpcomponents/httpcore/4.0.1</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>4.0.1</version>
+ <type>pom</type>
+ <outputDirectory>${project.build.directory}/repository/org/apache/httpcomponents/httpcore/4.0.1</outputDirectory>
</artifactItem>
<artifactItem>
@@ -1776,8 +1851,8 @@
<!--
<url>http://repo.aduna-software.org/maven2/releases</url>
-->
- <url>http://build.mygrid.org.uk/maven/aduna</url>
- <releases>
+ <url>http://build.mygrid.org.uk/maven/aduna</url>
+ <releases>
<enabled>true</enabled>
</releases>
<snapshots>
@@ -1790,7 +1865,7 @@
<!--
<url>http://repo.aduna-software.org/maven2/releases</url>
-->
- <url>http://build.mygrid.org.uk/maven/aduna</url>
+ <url>http://build.mygrid.org.uk/maven/aduna</url>
<releases>
<enabled>true</enabled>
</releases>
@@ -1798,7 +1873,6 @@
<enabled>false</enabled>
</snapshots>
</repository>
-
</repositories>
<scm>
<url>https://github.com/taverna/taverna-commandline-product</url>
diff --git a/src/main/install4j/taverna-commandline.install4j b/src/main/install4j/taverna-commandline.install4j
index 60a7ad3..e137a21 100644
--- a/src/main/install4j/taverna-commandline.install4j
+++ b/src/main/install4j/taverna-commandline.install4j
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<install4j version="5.1.11" transformSequenceNumber="4">
<directoryPresets config="../../../target/taverna-workbench-dist/taverna.sh" />
- <application name="${compiler:product-name}" distributionSourceDir="" applicationId="6321-5227-3164-0432" mediaDir="../../../target/media" mediaFilePattern="${compiler:sys.shortName}-${compiler:sys.version}-${compiler:sys.platform}" compression="6" lzmaCompression="false" pack200Compression="false" excludeSignedFromPacking="true" commonExternalFiles="false" createMd5Sums="true" shrinkRuntime="false" shortName="taverna-commandline-${compiler:edition}" publisher="myGrid" publisherWeb="http://www.taverna.org.uk/" version="2.5-SNAPSHOT" allPathsRelative="true" backupOnSave="false" autoSave="true" convertDotsToUnderscores="false" macSignature="????" installerName="" javaMinVersion="1.7" javaMaxVersion="" allowBetaVM="false" jdkMode="runtimeJre" jdkName="">
+ <application name="${compiler:product-name}" distributionSourceDir="" applicationId="0614-6458-0263-1267" mediaDir="../../../target/media" mediaFilePattern="${compiler:sys.shortName}-${compiler:sys.version}-${compiler:sys.platform}" compression="6" lzmaCompression="false" pack200Compression="false" excludeSignedFromPacking="true" commonExternalFiles="false" createMd5Sums="true" shrinkRuntime="false" shortName="taverna-commandline-${compiler:edition}" publisher="myGrid" publisherWeb="http://www.taverna.org.uk/" version="2.5-SNAPSHOT" allPathsRelative="true" backupOnSave="false" autoSave="true" convertDotsToUnderscores="false" macSignature="????" installerName="" javaMinVersion="1.7" javaMaxVersion="" allowBetaVM="false" jdkMode="runtimeJre" jdkName="">
<languages skipLanguageSelection="false" languageSelectionInPrincipalLanguage="false">
<principalLanguage id="en" customLocalizationFile="" />
<additionalLanguages />
diff --git a/src/main/resources/plugins/plugins.xml b/src/main/resources/plugins/plugins.xml
index 1d85405..bd40b07 100644
--- a/src/main/resources/plugins/plugins.xml
+++ b/src/main/resources/plugins/plugins.xml
@@ -193,7 +193,6 @@
</compatibility>
</plugin>
- <!--
<plugin>
<provider>taverna.sf.net</provider>
<identifier>net.sf.taverna.t2.webdav-activity-no-ui</identifier>
@@ -223,7 +222,6 @@
</application>
</compatibility>
</plugin>
- -->
<plugin>
<provider>taverna.sf.net</provider>
