Revert to 6ef477049668b4f5632e7d88a67da1354f5796fe
diff --git a/pom.xml b/pom.xml
index 3b84997..a562086 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,161 +3,125 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>14</version>
+ <groupId>net.sf.taverna</groupId>
+ <artifactId>parent</artifactId>
+ <version>0.2.2014-03-19</version>
</parent>
- <prerequisites>
- <maven>3.2.0</maven>
- </prerequisites>
-
- <groupId>org.apache.taverna</groupId>
+ <groupId>net.sf.taverna</groupId>
<artifactId>taverna-parent</artifactId>
- <version>1-SNAPSHOT</version>
+ <version>2.6-SNAPSHOT</version>
<packaging>pom</packaging>
-
- <name>Apache Taverna (incubating) Maven parent</name>
+ <name>Taverna Maven parent</name>
<description>
- General POM-file parent for Taverna workbench etc.
+ General POM-file parent for Taverna workbench etc.
</description>
- <url>http://incubator.apache.org/projects/taverna.html</url>
- <mailingLists>
- <mailingList>
- <name>Apache Taverna Developer List</name>
- <subscribe>dev-subscribe@taverna.incubator.apache.org</subscribe>
- <unsubscribe>dev-unsubscribe@taverna.incubator.apache.org</unsubscribe>
- <post>dev@taverna.incubator.apache.org</post>
- <archive>http://mail-archives.apache.org/mod_mbox/incubator-taverna-dev/</archive>
- </mailingList>
- </mailingLists>
-
- <scm>
- <connection>scm:git:git://github.com/taverna-incubating/taverna-maven-parent.git</connection>
- <developerConnection>scm:git:ssh://git@github.com/taverna-incubating/taverna-maven-parent.git</developerConnection>
- <url>https://github.com/taverna-incubating/taverna-maven-parent/</url>
- </scm>
-
-
<properties>
-<activation.version>1.1.1</activation.version>
-<antlr.version>2.7.7</antlr.version>
-<apache.commons.csv.version>1.0.0.BUILD-20080106</apache.commons.csv.version>
-<apache.httpclient.version>4.1.1</apache.httpclient.version>
-<aspectj.version>1.6.9</aspectj.version>
-<axis.jaxrpc.version>1.4</axis.jaxrpc.version>
-<axis.sggj.version>1.4</axis.sggj.version>
-<axis.version>1.4.0</axis.version>
-<axis.wsdl4j.version>1.5.1</axis.wsdl4j.version>
-<axis.wss4j.version>1.4-1.5.4-2</axis.wss4j.version>
-<batik.version>1.7.0</batik.version>
-<bcprov.jdk16.version>1.46</bcprov.jdk16.version>
-<bsh.version>2.0.0.b4</bsh.version>
-<cglib.version>2.1.3</cglib.version>
-<commons.beanutils.version>1.9.2</commons.beanutils.version>
-<commons.cli.version>1.2.0</commons.cli.version>
-<commons.codec.version>1.7</commons.codec.version>
-<commons.collections.version>3.2.1</commons.collections.version>
-<commons.configuration.version>1.9</commons.configuration.version>
-<commons.dbcp.version>1.4</commons.dbcp.version>
-<commons.httpclient.version>3.1.0</commons.httpclient.version>
-<commons.io.version>2.4</commons.io.version>
-<commons.lang.version>2.5.0</commons.lang.version>
-<commons.logging.version>1.1.1</commons.logging.version>
-<commons.net.version>2.0.0</commons.net.version>
-<derbyclient.version>${derby.version}</derbyclient.version>
-<derbynet.version>${derby.version}</derbynet.version>
-<derbytools.version>${derby.version}</derbytools.version>
-<derby.version>10.6.1.0</derby.version>
-<dom4j.version>1.6.1</dom4j.version>
-<geronimo.spec.jta.version>1.0-M1</geronimo.spec.jta.version>
-<gson.version>1.4</gson.version>
-<hibernate.version>3.2.6.ga</hibernate.version>
-<icu4j.version>3.4.4</icu4j.version>
-<jackson-databind.version>2.2.2</jackson-databind.version>
-<jai.imageio.core.standalone.version>1.2-pre-dr-b04-2011-07-04</jai.imageio.core.standalone.version>
-<javacsv.version>2.0</javacsv.version>
-<javahelp.version>2.0.02</javahelp.version>
-<javax.el.version>1.0.0</javax.el.version>
-<javax.servlet.jsp.version>2.1.0</javax.servlet.jsp.version>
-<javax.servlet.version>2.5.0</javax.servlet.version>
-<javax.transaction.version>1.1.0</javax.transaction.version>
-<javax.wsdl.version>1.6.1</javax.wsdl.version>
-<jaxb.version>2.2.4-1</jaxb.version>
-<jaxen.version>1.1.1</jaxen.version>
-<jaxp.ri.version>1.4</jaxp.ri.version>
-<jaxws.api.version>2.1</jaxws.api.version>
-<jdom.version>1.1.0</jdom.version> <!-- com.springsource.org.jdom -->
-<jedit.syntax.version>2.2.5</jedit.syntax.version>
-<jena.arq.version>2.8.7</jena.arq.version>
-<jena.core.version>2.7.4</jena.core.version>
-<jena.version>2.12.1</jena.version>
-<jetty.version>6.1.24</jetty.version>
-<jmimemagic.version>0.1.2</jmimemagic.version>
-<jmoby.version>1.1.5-taverna</jmoby.version>
-<jsch.version>0.1.42.w1</jsch.version>
-<json.lib.version>2.3</json.lib.version>
-<junit.version>4.11</junit.version>
-<log4j.version>1.2.16</log4j.version>
-<mail.version>1.4.1</mail.version>
-<martj.version>0.6</martj.version>
-<mimeutil.version>2.1.2-6</mimeutil.version>
-<mockito.version>1.9.5</mockito.version>
-<mysql.connector.java.version>5.1.13</mysql.connector.java.version>
-<odfdom.version>0.7</odfdom.version>
-<opencsv.version>2.1</opencsv.version>
-<opm.version>1.1.8</opm.version>
-<org.fife.ui.hexeditor.version>1.0.2011-07-04</org.fife.ui.hexeditor.version>
-<org.icepdf.version>4.1.1-taverna</org.icepdf.version>
-<org.rosuda.version>200910</org.rosuda.version>
-<org.xhtmlrenderer.core-renderer.version>R8pre2</org.xhtmlrenderer.core-renderer.version>
-<osgi.core.version>4.3.1</osgi.core.version>
-<osgi.enterprise.version>4.2.0</osgi.enterprise.version>
-<osgi.equinox.version>3.8.0.v20120529-1548</osgi.equinox.version>
-<osgi.launcher.version>0.1.1-SNAPSHOT</osgi.launcher.version>
-<osgi.services.version>0.1.2-SNAPSHOT</osgi.services.version>
-<poi.ooxml.version>3.6</poi.ooxml.version>
-<poi.version>3.6</poi.version>
-<saxpath.version>1.0-FCS</saxpath.version>
-<servletapi.version>2.5</servletapi.version>
-<simple-jndi.version>0.11.1</simple-jndi.version>
-<slf4j.version>1.7.5</slf4j.version>
-<spring.dm.version>2.0.0.M1</spring.dm.version>
-<spring.version>3.0.5.RELEASE</spring.version>
-<stax.version>1.0</stax.version>
-<tupelo.version>2.6</tupelo.version>
-<ws.security.version>1.5.8</ws.security.version>
-<xalan.version>2.7.1</xalan.version>
-<xerces.version>2.9.1</xerces.version>
-<xmlbeans.version>2.4.0</xmlbeans.version>
-<xml.rpc.version>1.1.0</xml.rpc.version>
-<xml.security.version>1.4.2</xml.security.version>
-<xstream.version>1.4.1</xstream.version>
+ <antlr.version>2.7.7</antlr.version>
+ <axis.version>1.4</axis.version>
+ <axis.jaxrpc.version>1.4</axis.jaxrpc.version>
+ <axis.sggj.version>1.4</axis.sggj.version>
+ <axis.wsdl4j.version>1.5.1</axis.wsdl4j.version>
+ <axis.wss4j.version>1.4-1.5.4-2</axis.wss4j.version>
+ <bcprov.jdk16.version>140</bcprov.jdk16.version>
+ <jaxp.ri.version>1.4</jaxp.ri.version>
+ <xstream.version>1.4.1</xstream.version>
+ <commons.beanutils.version>1.8.3</commons.beanutils.version>
+ <commons.cli.version>1.2</commons.cli.version>
+ <commons.codec.version>1.4</commons.codec.version>
+ <commons.collections.version>3.2.1</commons.collections.version>
+ <commons.configuration.version>1.6</commons.configuration.version>
+ <commons.dbcp.version>1.4</commons.dbcp.version>
+ <commons.httpclient.version>3.1</commons.httpclient.version>
+ <apache.httpclient.version>4.0.1</apache.httpclient.version>
+ <commons.io.version>1.4</commons.io.version>
+ <commons.net.version>2.0</commons.net.version>
+ <commons.lang.version>2.5</commons.lang.version>
+ <commons.logging.version>1.1.1</commons.logging.version>
+ <dom4j.version>1.6.1</dom4j.version>
+ <geronimo.spec.jta.version>1.0-M1</geronimo.spec.jta.version>
+ <activation.version>1.1.1</activation.version>
+ <javahelp.version>2.0.02</javahelp.version>
+ <mail.version>1.4.1</mail.version>
+ <jaxws.api.version>2.1</jaxws.api.version>
+ <jaxen.version>1.1.1</jaxen.version>
+ <jdom.version>1.1</jdom.version>
+ <slf4j.version>1.7.5</slf4j.version>
+ <jmimemagic.version>0.1.2</jmimemagic.version>
+ <junit.version>4.8.1</junit.version>
+ <log4j.version>1.2.16</log4j.version>
+ <mysql.connector.java.version>5.1.13</mysql.connector.java.version>
+ <jai.imageio.core.standalone.version>1.2-pre-dr-b04-2011-07-04</jai.imageio.core.standalone.version>
+ <json.lib.version>2.3</json.lib.version>
+ <opencsv.version>2.1</opencsv.version>
+ <javacsv.version>2.0</javacsv.version>
+ <derby.version>10.6.1.0</derby.version>
+ <derbyclient.version>${derby.version}</derbyclient.version>
+ <derbynet.version>${derby.version}</derbynet.version>
+ <derbytools.version>${derby.version}</derbytools.version>
+ <poi.version>3.6</poi.version>
+ <poi.ooxml.version>3.6</poi.ooxml.version>
+ <xmlbeans.version>2.4.0</xmlbeans.version>
+ <batik.version>1.7</batik.version>
+ <aspectj.version>1.6.9</aspectj.version>
+ <bsh.version>2.0b4</bsh.version>
+ <martj.version>0.6</martj.version>
+ <jmoby.version>1.1.5-taverna</jmoby.version>
+ <hibernate.version>3.2.5.ga.raven</hibernate.version>
+ <servletapi.version>2.5</servletapi.version>
+ <jetty.version>6.1.24</jetty.version>
+ <opm.version>1.1.8</opm.version>
+ <tupelo.version>2.6</tupelo.version>
+ <org.xhtmlrenderer.core-renderer.version>R8pre2</org.xhtmlrenderer.core-renderer.version>
+ <gson.version>1.4</gson.version>
+ <xalan.version>2.7.1</xalan.version>
+ <saxpath.version>1.0-FCS</saxpath.version>
+ <stax.version>1.0</stax.version>
+ <xerces.version>2.9.1</xerces.version>
+ <jsch.version>0.1.42</jsch.version>
+ <jena.version>2.6.4</jena.version>
+ <jena.core.version>2.7.4</jena.core.version>
+ <jena.arq.version>2.8.7</jena.arq.version>
+ <!-- to match Jena -->
+ <icu4j.version>3.4.4</icu4j.version>
+
+ <spring.version>2.5.4</spring.version>
+
+ <!-- Taverna versions -->
+ <wsdl.generic.version>1.10</wsdl.generic.version>
+ <org.biomart.martservice.version>1.6-SNAPSHOT</org.biomart.martservice.version>
+ <org.fife.ui.hexeditor.version>1.0.2011-07-04</org.fife.ui.hexeditor.version>
+ <org.icepdf.version>4.1.1-taverna</org.icepdf.version>
+ <mimeutil.version>2.1.2-6</mimeutil.version>
+
+ <t2.activities.version>1.6-SNAPSHOT</t2.activities.version>
+ <t2.compatibility.version>1.6-SNAPSHOT</t2.compatibility.version>
+ <t2.core.provenanceconnector.version>1.6-SNAPSHOT</t2.core.provenanceconnector.version>
+ <t2.core.provenance.derby.version>1.6-SNAPSHOT</t2.core.provenance.derby.version>
+ <t2.core.provenance.mysql.version>1.6-SNAPSHOT</t2.core.provenance.mysql.version>
+ <t2.core.version>1.6-SNAPSHOT</t2.core.version>
+ <t2.infrastructure.version>2.6-SNAPSHOT</t2.infrastructure.version>
+ <t2.lang.version>1.6-SNAPSHOT</t2.lang.version>
+ <t2.results.version>1.6-SNAPSHOT</t2.results.version>
+ <t2.provenance-client.version>1.6-SNAPSHOT</t2.provenance-client.version>
+ <t2.tavernaprov.version>2.3.0-SNAPSHOT</t2.tavernaprov.version>
+ <t2.reference-core-extensions.version>1.6-SNAPSHOT</t2.reference-core-extensions.version>
+ <t2.security.version>1.6-SNAPSHOT</t2.security.version>
+ <!-- see https://github.com/myGrid/taverna-prov/tree/maintenance -->
+ <t2.taverna.workbench.version>2.6-SNAPSHOT</t2.taverna.workbench.version>
+ <t2.taverna-commandline.version>1.6-SNAPSHOT</t2.taverna-commandline.version>
+ <t2.translators.version>1.6-SNAPSHOT</t2.translators.version>
+ <t2.ui.api.version>1.6-SNAPSHOT</t2.ui.api.version>
+ <t2.ui.impl.version>1.6-SNAPSHOT</t2.ui.impl.version>
+ <t2.ui.components.version>1.6-SNAPSHOT</t2.ui.components.version>
+ <t2.ui.exts.version>1.6-SNAPSHOT</t2.ui.exts.version>
+ <t2.ui.activities.version>1.6-SNAPSHOT</t2.ui.activities.version>
+ <taverna.version>1.7.2.2</taverna.version>
</properties>
-
- <!-- Common (test) dependencies - keep this list short
- and up to date! -->
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
-
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.7</version>
- <extensions>true</extensions>
- </plugin>
- <plugin>
<groupId>com.atlassian.maven.plugins</groupId>
<artifactId>maven-clover2-plugin</artifactId>
<version>2.3.1</version>
@@ -177,54 +141,6 @@
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.7</source>
- <target>1.7</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>jar</goal>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>false</skip>
- <systemProperties>
- <property>
- <name>java.awt.headless</name>
- <value>true</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- </plugin>
</plugins>
</build>
@@ -273,35 +189,99 @@
<repositories>
<repository>
- <id>taverna-incubating</id>
- <name>Taverna incubating Repository</name>
- <url>http://repository.mygrid.org.uk/artifactory/incubator-snapshot-local/</url>
+ <id>mygrid-repository</id>
+ <name>myGrid Repository</name>
+ <url>http://www.mygrid.org.uk/maven/repository</url>
+ <releases />
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>mygrid-snapshot-repository</id>
+ <name>myGrid Snapshot Repository</name>
+ <url>http://www.mygrid.org.uk/maven/snapshot-repository</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots />
</repository>
+ <repository>
+ <id>central-uk</id>
+ <name>UK mirror of central</name>
+ <url>http://uk.maven.org/maven2/</url>
+ <releases />
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
- <repository>
- <id>com.springsource.repository.bundles.release</id>
- <name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases</name>
- <url>http://repository.springsource.com/maven/bundles/release</url>
- </repository>
- <repository>
- <id>com.springsource.repository.bundles.external</id>
- <name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name>
- <url>http://repository.springsource.com/maven/bundles/external</url>
- </repository>
+ <!--
+ <repository>
+ <id>jboss</id>
+ <name>JBoss repository</name>
+ - <url>http://repository.jboss.org/maven2/</url>-
+ <url>https://repository.jboss.org/nexus/</url>
+ <releases>
+ <checksumPolicy>fail</checksumPolicy>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ -->
+ <repository>
+ <id>javanet</id>
+ <name>java.net</name>
+ <url>http://download.java.net/maven/2/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+
+
+ <repository>
+ <id>inab-repository</id>
+ <name>INAB Moby Repository mirror</name>
+ <url>http://www.mygrid.org.uk/maven/biomoby/moby-dev.inab.org/m2/</url>
+ <releases />
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>aduna-software</id>
+ <name>Aduna Software</name>
+<!-- broken <url>http://repo.aduna-software.org/maven2/releases/</url> -->
+ <url>http://www.mygrid.org.uk/maven/aduna/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>opm</id>
+ <name>Open Provenance (OPM)</name>
+ <url>http://openprovenance.org/java/maven-releases</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>akathist-repository</id>
+ <!-- disable broken http://9stmaryrd.com/maven/ referenced by raven 1.9 -->
+ <url>http://build.mygrid.org.uk/maven/404</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
</repositories>
-
- <distributionManagement>
- <snapshotRepository>
- <!-- TODO: Use Apache snapshot repo -->
- <id>taverna-incubating</id>
- <name>Taverna incubating Repository</name>
- <url>http://repository.mygrid.org.uk/artifactory/incubator-snapshot-local/</url>
- </snapshotRepository>
-</distributionManagement>
-
</project>
+
