Merge remote-tracking branch 'apache/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/commit/a28a948c Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/tree/a28a948c Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/diff/a28a948c Branch: refs/heads/master Commit: a28a948c8c5165c7b0f13f5e48a6d3907c27fe34 Parents: d3267a8 e428481 Author: Edi Karadumi <[email protected]> Authored: Mon Jul 11 12:45:29 2016 +0100 Committer: Edi Karadumi <[email protected]> Committed: Mon Jul 11 12:45:29 2016 +0100 ---------------------------------------------------------------------- pom.xml | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/blob/a28a948c/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index 9c2ab12,733c43a..149bd40 --- a/pom.xml +++ b/pom.xml @@@ -27,48 -32,32 +27,49 @@@ Taverna support for Geographical Information Systems, in particular the OGC activity. </description> - <properties> - <taverna.language.version>0.15.0-incubating</taverna.language.version> - <taverna.osgi.version>0.2.1-incubating</taverna.osgi.version> - <taverna.engine.version>3.1.0-incubating</taverna.engine.version> - </properties> + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <taverna.language.version>0.15.1-incubating</taverna.language.version> + <taverna.osgi.version>0.2.1-incubating</taverna.osgi.version> + <taverna.engine.version>3.1.0-incubating</taverna.engine.version> + <taverna.workbench.version>3.1.0-incubating-SNAPSHOT</taverna.workbench.version> + </properties> + + <scm> + <connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis.git</connection> + <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis.git</developerConnection> + <url>https://github.com/apache/incubator-taverna-plugin-gis</url> + <tag>HEAD</tag> + </scm> + + - <scm> - <connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis.git</connection> - <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis.git</developerConnection> - <url>https://github.com/apache/incubator-taverna-plugin-gis</url> - <tag>HEAD</tag> - </scm> + <repositories> + <repository> + <id>apache.snapshots</id> + <name>Apache Snapshot Repository</name> + <url>http://repository.apache.org/snapshots</url> + <releases> + <enabled>false</enabled> + </releases> + </repository> + <repository> + <id>n52-releases</id> + <name>52n Releases</name> + <url>http://52north.org/maven/repo/releases</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + </repositories> - <repositories> - <repository> - <id>apache.snapshots</id> - <name>Apache Snapshot Repository</name> - <url>http://repository.apache.org/snapshots</url> - <releases> - <enabled>false</enabled> - </releases> - </repository> - </repositories> + <modules> + <module>apache-taverna-activity-gis-plugin</module> + <module>apache-taverna-activity-gis-activity</module> + <module>apache-taverna-activity-gis-activity-ui</module> + <module>taverna-gis-client</module> + </modules> - <modules> - <module>taverna-ogc-activity</module> - <module>taverna-ogc-activity-ui</module> - </modules> </project>
