Release version 3.0.0
git-svn-id: https://taverna.googlecode.com/svn/taverna/taverna-parent/trunk@14885 bf327186-88b3-11dd-a302-d386e5130c1c
diff --git a/pom.xml b/pom.xml
index 63232c8..c59f6c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,11 +6,10 @@
<groupId>net.sf.taverna</groupId>
<artifactId>parent</artifactId>
<version>0.2.2011-02-17</version>
- <relativePath>../parent/pom.xml</relativePath>
</parent>
<groupId>net.sf.taverna</groupId>
<artifactId>taverna-parent</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0.0</version>
<packaging>pom</packaging>
<name>Taverna Maven parent</name>
<description>
@@ -21,26 +20,22 @@
<antlr.version>2.7.7</antlr.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</axis.version>
- <axis.wsdl4j.version>1.5.1</axis.wsdl4j.version>
- <axis.wss4j.version>1.4-1.5.4-2</axis.wss4j.version>
+ <axis.version>1.4.0</axis.version>
<batik.version>1.7</batik.version>
<bcprov.jdk16.version>1.46</bcprov.jdk16.version>
- <bsh.version>2.0b4</bsh.version>
+ <bsh.version>2.0.0.b4</bsh.version>
<commons.beanutils.version>1.8.3</commons.beanutils.version>
- <commons.cli.version>1.2</commons.cli.version>
+ <commons.cli.version>1.2.0</commons.cli.version>
<commons.codec.version>1.4.0</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.dbcp.version>1.2.2.osgi</commons.dbcp.version>
<commons.httpclient.version>3.1.0</commons.httpclient.version>
- <commons.io.version>1.4</commons.io.version>
- <commons.lang.version>2.5</commons.lang.version>
+ <commons.io.version>1.4.0</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</commons.net.version>
- <derby.version>10.6.1.0</derby.version>
+ <derby.version>10.5.1000001.764942</derby.version>
<derbyclient.version>${derby.version}</derbyclient.version>
<derbynet.version>${derby.version}</derbynet.version>
<derbytools.version>${derby.version}</derbytools.version>
@@ -48,78 +43,88 @@
<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>
<jai.imageio.core.standalone.version>1.2-pre-dr-b04-2010-04-30</jai.imageio.core.standalone.version>
<javacsv.version>2.0</javacsv.version>
<javahelp.version>2.0.02</javahelp.version>
+ <javax.transaction.version>1.1.0</javax.transaction.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>
<jena.arq.version>2.8.7</jena.arq.version>
<jena.version>2.6.4</jena.version>
- <!-- to match Jena -->
- <icu4j.version>3.4.4</icu4j.version>
<jetty.version>6.1.24</jetty.version>
<jmimemagic.version>0.1.2</jmimemagic.version>
<jmoby.version>1.1.4-taverna</jmoby.version>
- <jsch.version>0.1.42</jsch.version>
+ <jsch.version>0.1.41</jsch.version>
<json.lib.version>2.3</json.lib.version>
<junit.version>4.8.1</junit.version>
- <knowarc.usecases.version>0.3.5-SNAPSHOT</knowarc.usecases.version>
<log4j.version>1.2.16</log4j.version>
<mail.version>1.4.1</mail.version>
<martj.version>0.6</martj.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.xhtmlrenderer.core-renderer.version>R8pre2</org.xhtmlrenderer.core-renderer.version>
- <poi.ooxml.version>3.6</poi.ooxml.version>
- <poi.version>3.6</poi.version>
+ <poi.version>3.5-FINAL</poi.version>
<saxpath.version>1.0-FCS</saxpath.version>
<slf4j.version>1.5.6</slf4j.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>
<xstream.version>1.3.1</xstream.version>
+ <xml.rpc.version>1.1.0</xml.rpc.version>
+ <xml.security.version>1.4.2</xml.security.version>
<spring.version>3.0.5.RELEASE</spring.version>
<spring.dm.version>2.0.0.M1</spring.dm.version>
+ <!-- OSGi versions -->
+ <osgi.core.version>4.2.0</osgi.core.version>
+ <osgi.enterprise.version>4.2.0</osgi.enterprise.version>
+ <osgi.equinox.version>3.6.0.v20100517</osgi.equinox.version>
+ <osgi.launcher.version>0.1.0</osgi.launcher.version>
+ <osgi.services.version>0.1.0</osgi.services.version>
+
<!-- Taverna versions -->
- <jedit.syntax.version>2.2.4-SNAPSHOT</jedit.syntax.version>
- <wsdl.generic.version>1.10-SNAPSHOT</wsdl.generic.version>
- <org.biomart.martservice.version>2.0-SNAPSHOT</org.biomart.martservice.version>
- <org.fife.ui.hexeditor.version>1.1-SNAPSHOT</org.fife.ui.hexeditor.version>
- <org.icepdf.version>4.1.1-taverna</org.icepdf.version>
+ <jedit.syntax.version>2.2.5</jedit.syntax.version>
+ <wsdl.generic.version>1.10.0</wsdl.generic.version>
+ <org.biomart.martservice.version>2.0.0</org.biomart.martservice.version>
+ <!-- <org.fife.ui.hexeditor.version>1.1-SNAPSHOT</org.fife.ui.hexeditor.version> -->
+ <!-- <org.icepdf.version>4.1.1-taverna</org.icepdf.version> -->
<scufl2.version>0.9.2</scufl2.version>
- <t2.activities.version>2.0-SNAPSHOT</t2.activities.version>
- <t2.baclava.version>0.1-SNAPSHOT</t2.baclava.version>
- <t2.compatibility.version>2.0-SNAPSHOT</t2.compatibility.version>
- <t2.core.provenance.derby.version>2.0-SNAPSHOT</t2.core.provenance.derby.version>
- <t2.core.provenance.mysql.version>2.0-SNAPSHOT</t2.core.provenance.mysql.version>
- <t2.core.provenanceconnector.version>2.0-SNAPSHOT</t2.core.provenanceconnector.version>
- <t2.core.version>2.0-SNAPSHOT</t2.core.version>
- <t2.infrastructure.version>3.0-SNAPSHOT</t2.infrastructure.version>
- <t2.lang.version>2.0-SNAPSHOT</t2.lang.version>
- <t2.provenance-client.version>1.0-SNAPSHOT</t2.provenance-client.version>
- <t2.reference-core-extensions.version>2.0-SNAPSHOT</t2.reference-core-extensions.version>
- <t2.results.version>2.0-SNAPSHOT</t2.results.version>
- <t2.security.version>2.0-SNAPSHOT</t2.security.version>
- <t2.taverna-commandline.version>2.0-SNAPSHOT</t2.taverna-commandline.version>
+ <platform.version>0.1.2</platform.version>
+
+ <t2.activities.version>2.0.0</t2.activities.version>
+ <t2.baclava.version>0.1.0</t2.baclava.version>
+ <!-- <t2.compatibility.version>2.0-SNAPSHOT</t2.compatibility.version> -->
+ <t2.core.provenance.derby.version>2.0.0</t2.core.provenance.derby.version>
+ <t2.core.provenance.mysql.version>2.0.0</t2.core.provenance.mysql.version>
+ <t2.core.provenanceconnector.version>2.0.0</t2.core.provenanceconnector.version>
+ <t2.core.version>2.0.0</t2.core.version>
+ <t2.lang.version>2.0.0</t2.lang.version>
+ <!-- <t2.provenance-client.version>1.0-SNAPSHOT</t2.provenance-client.version> -->
+ <t2.reference-core-extensions.version>2.0.0</t2.reference-core-extensions.version>
+ <t2.results.version>2.0.0</t2.results.version>
+ <t2.security.version>2.0.0</t2.security.version>
+ <t2.taverna-commandline.version>2.0.0</t2.taverna-commandline.version>
<t2.taverna.workbench.version>${project.version}</t2.taverna.workbench.version>
- <t2.translators.version>2.0-SNAPSHOT</t2.translators.version>
- <t2.ui.activities.version>2.0-SNAPSHOT</t2.ui.activities.version>
+ <!-- <t2.translators.version>2.0-SNAPSHOT</t2.translators.version> -->
+ <taverna.configuration.version>0.1.0</taverna.configuration.version>
+ <taverna.commandline-arguments.version>0.1.0</taverna.commandline-arguments.version>
+
+ <!-- <t2.ui.activities.version>2.0-SNAPSHOT</t2.ui.activities.version>
<t2.ui.activities.version>2.0-SNAPSHOT</t2.ui.activities.version>
<t2.ui.api.version>2.0-SNAPSHOT</t2.ui.api.version>
<t2.ui.components.version>2.0-SNAPSHOT</t2.ui.components.version>
<t2.ui.exts.version>2.0-SNAPSHOT</t2.ui.exts.version>
- <t2.ui.impl.version>2.0-SNAPSHOT</t2.ui.impl.version>
- <taverna.configuration.version>0.1.0-SNAPSHOT</taverna.configuration.version>
- <taverna.version>1.7.2.2</taverna.version>
-
+ <t2.ui.impl.version>2.0-SNAPSHOT</t2.ui.impl.version> -->
</properties>
@@ -147,10 +152,18 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.4</version>
- <extensions>true</extensions>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>2.3.7</version>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
<reporting>
<plugins>
@@ -224,21 +237,6 @@
</snapshots>
</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>
@@ -251,10 +249,6 @@
</snapshots>
</repository>
- <!-- Disabled as it returns HTTP 405 Method Not Allowed <repository> <id>odftoolkit</id>
- <name>Odftoolkit Repository</name> <url>http://odftoolkit.org/svn/odfdom~maven2/release/</url>
- <snapshots> <enabled>false</enabled> </snapshots> </repository> -->
-
<repository>
<id>biomoby</id>
<name>Biomoby.org Repository</name>
@@ -267,14 +261,6 @@
<enabled>true</enabled>
</releases>
</repository>
- <!-- <repository>
- <id>tupelo2</id>
- <name>Tupelo 2</name>
- <url>http://dlt-dev.ncsa.uiuc.edu/m2</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository> -->
<repository>
<id>opm</id>
<name>Open Provenance (OPM)</name>
@@ -283,37 +269,13 @@
<enabled>false</enabled>
</snapshots>
</repository>
- <!--
- <repository>
- <id>jena</id>
- <name>Jena</name>
- <url>http://openjena.org/repo/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- -->
+ <!-- <repository> <id>jena</id> <name>Jena</name> <url>http://openjena.org/repo/</url>
+ <snapshots> <enabled>false</enabled> </snapshots> </repository> -->
- <!--
- <repository>
- <id>eviware</id>
- <name>Eviware repository</name>
- <url>http://www.eviware.com/repository/maven2/</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>trianacode-maven-repos</id>
- <url>http://trianacode.org/maven</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- -->
+ <!-- <repository> <id>eviware</id> <name>Eviware repository</name> <url>http://www.eviware.com/repository/maven2/</url>
+ <releases> <enabled>true</enabled> </releases> <snapshots> <enabled>false</enabled>
+ </snapshots> </repository> <repository> <id>trianacode-maven-repos</id> <url>http://trianacode.org/maven</url>
+ <snapshots> <enabled>false</enabled> </snapshots> </repository> -->
<repository>
<id>com.springsource.repository.bundles.release</id>
<name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases</name>