Merge remote-tracking branch 'apache/master' 3/head
authorEdi Karadumi <edikaradumi@gmail.com>
Mon, 11 Jul 2016 11:45:29 +0000 (12:45 +0100)
committerEdi Karadumi <edikaradumi@gmail.com>
Mon, 11 Jul 2016 11:45:29 +0000 (12:45 +0100)
1  2 
pom.xml

diff --cc pom.xml
+++ b/pom.xml
        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>