Merge branch 'master' into no-ontologies
diff --git a/pom.xml b/pom.xml
index 88cbd70..caf6ca6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.taverna</groupId>
<artifactId>apache-taverna-parent</artifactId>
- <version>3-incubating</version>
+ <version>4-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.taverna.language</groupId>
<artifactId>apache-taverna-language</artifactId>
@@ -142,9 +142,9 @@
</pluginManagement>
</build>
<scm>
- <connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-taverna-language.git</connection>
- <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-taverna-language.git</developerConnection>
- <url>https://github.com/apache/incubator-taverna-language</url>
+ <connection>scm:git:https://gitbox.apache.org/repos/asf/incubator-taverna-language.git</connection>
+ <developerConnection>scm:git:git@github.com:apache/incubator-taverna-language.git</developerConnection>
+ <url>https://github.com/apache/incubator-taverna-language</url>
<tag>HEAD</tag>
</scm>
diff --git a/taverna-scufl2-examples/pom.xml b/taverna-scufl2-examples/pom.xml
index 70389af..a4dea6d 100644
--- a/taverna-scufl2-examples/pom.xml
+++ b/taverna-scufl2-examples/pom.xml
@@ -68,7 +68,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>appassembler-maven-plugin</artifactId>
- <version>1.10</version>
<executions>
<execution>
<id>assemble</id>
diff --git a/taverna-tavlang-tool/pom.xml b/taverna-tavlang-tool/pom.xml
index 6eb3683..60aade7 100644
--- a/taverna-tavlang-tool/pom.xml
+++ b/taverna-tavlang-tool/pom.xml
@@ -129,7 +129,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>appassembler-maven-plugin</artifactId>
- <version>1.1.1</version>
<executions>
<execution>
<id>assemble</id>
