Merge branch 'core' into digitalpreservation
Fixed Conflicts:
pom.xml
src/main/install4j/taverna-commandline.install4j
diff --git a/pom.xml b/pom.xml
index 6cd261a..227ea0e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>net.sf.taverna</groupId>
<artifactId>taverna-parent</artifactId>
- <version>2.5.0</version>
+ <version>2.6-SNAPSHOT</version>
</parent>
<groupId>net.sf.taverna.t2.taverna-commandline</groupId>
@@ -16,8 +16,6 @@
<edition>digitalpreservation</edition>
<!-- ######## -->
- <t2.taverna-commandline.version>1.5</t2.taverna-commandline.version>
- <t2.taverna.workbench.version>2.5.0</t2.taverna.workbench.version>
<raven.app.name>taverna-cmd-${edition}-${project.version}-${buildNumber}</raven.app.name>
</properties>
@@ -1848,32 +1846,32 @@
<snapshots />
</repository>
<repository>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
<id>aduna-opensource.releases</id>
<name>Aduna Open Source - Maven releases</name>
<!--
<url>http://repo.aduna-software.org/maven2/releases</url>
-->
- <url>http://build.mygrid.org.uk/maven/aduna</url>
- </repository>
- <repository>
+ <url>http://build.mygrid.org.uk/maven/aduna</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
+ </repository>
+ <repository>
<id>aduna-software</id>
<name>Aduna Open Source - Maven releases</name>
<!--
<url>http://repo.aduna-software.org/maven2/releases</url>
-->
<url>http://build.mygrid.org.uk/maven/aduna</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
</repository>
</repositories>
