Menu
▾
▴
[taverna-cvs] [taverna] r14113 committed - Update to current versions of dependencies and plugins. (A few small A...
|
From: <ta...@go...> - 2011-09-23 13:24:51
|
Revision: 14113 Author: don...@ma... Date: Fri Sep 23 06:23:22 2011 Log: Update to current versions of dependencies and plugins. (A few small API changes arise from that, but nothing significant.) http://code.google.com/p/taverna/source/detail?r=14113 Modified: /taverna/products/uk.org.taverna.server/trunk/pom.xml /taverna/products/uk.org.taverna.server/trunk/server-distribution/pom.xml /taverna/products/uk.org.taverna.server/trunk/server-port-description/pom.xml /taverna/products/uk.org.taverna.server/trunk/server-runinterface/pom.xml /taverna/products/uk.org.taverna.server/trunk/server-unix-forker/pom.xml /taverna/products/uk.org.taverna.server/trunk/server-usagerecord/pom.xml /taverna/products/uk.org.taverna.server/trunk/server-webapp/pom.xml /taverna/products/uk.org.taverna.server/trunk/server-webapp/src/main/java/org/taverna/server/master/admin/Admin.java /taverna/products/uk.org.taverna.server/trunk/server-webapp/src/main/java/org/taverna/server/master/rest/TavernaServerDirectoryREST.java /taverna/products/uk.org.taverna.server/trunk/server-webapp/src/main/java/org/taverna/server/master/rest/TavernaServerInputREST.java /taverna/products/uk.org.taverna.server/trunk/server-webapp/src/main/java/org/taverna/server/master/rest/TavernaServerListenersREST.java /taverna/products/uk.org.taverna.server/trunk/server-webapp/src/main/java/org/taverna/server/master/rest/TavernaServerREST.java /taverna/products/uk.org.taverna.server/trunk/server-webapp/src/main/java/org/taverna/server/master/rest/TavernaServerRunREST.java /taverna/products/uk.org.taverna.server/trunk/server-webapp/src/main/java/org/taverna/server/master/rest/TavernaServerSecurityREST.java /taverna/products/uk.org.taverna.server/trunk/server-webapp/src/main/java/org/taverna/server/master/utils/JDOSupport.java /taverna/products/uk.org.taverna.server/trunk/server-worker/pom.xml ======================================= --- /taverna/products/uk.org.taverna.server/trunk/pom.xml Mon Aug 1 08:09:29 2011 +++ /taverna/products/uk.org.taverna.server/trunk/pom.xml Fri Sep 23 06:23:22 2011 @@ -162,7 +162,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-release-plugin</artifactId> - <version>2.0</version> + <version>2.1</version> <configuration> <autoVersionSubmodules>true</autoVersionSubmodules> <tagBase>https://taverna.googlecode.com/svn/taverna/products/uk.org.taverna.server/tags</tagBase> @@ -171,7 +171,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.1</version> + <version>2.3.2</version> <configuration> <encoding>US-ASCII</encoding> <source>1.6</source> @@ -192,7 +192,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> - <version>2.4.3</version> + <version>2.5</version> <configuration> <encoding>US-ASCII</encoding> </configuration> @@ -202,13 +202,37 @@ <artifactId>maven-jar-plugin</artifactId> <version>2.3.1</version> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <version>2.1.2</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.8</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jarsigner-plugin</artifactId> + <version>1.2</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.2</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2.1</version> + </plugin> </plugins> </pluginManagement> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-release-plugin</artifactId> - <version>2.0</version> <configuration> <autoVersionSubmodules>true</autoVersionSubmodules> <tagBase>https://taverna.googlecode.com/svn/taverna/products/uk.org.taverna.server/tags</tagBase> @@ -217,7 +241,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jarsigner-plugin</artifactId> - <version>1.2</version> <executions> <execution> <goals> @@ -296,6 +319,10 @@ <packages>org.taverna.server.master.exceptions:org.taverna.server.master.factories:org.taverna.server.master.interfaces</packages> </group> <group> + <title>Notification and Accounting</title> + <packages>org.taverna.server.master.notification:org.taverna.server.master.notification.atom:org.taverna.server.master.usage</packages> + </group> + <group> <title>Server Coupling to RMI Back End</title> <packages>org.taverna.server.master.identity:org.taverna.server.master.localworker</packages> </group> @@ -309,7 +336,7 @@ </group> <group> <title>Externally-Defined Document Formats</title> - <packages>org.taverna.server.input_description:org.taverna.server.output_description:org.ogf.usage:org.ogf.usage.v1_0:org.w3._2000._09.xmldsig_</packages> + <packages>org.taverna.server.port_description:org.ogf.usage:org.ogf.usage.v1_0:org.w3._2000._09.xmldsig_</packages> </group> <group> <title>Server Back End Factory Coupling to Command Line Executor</title> @@ -320,12 +347,16 @@ <packages>org.taverna.server.master.utils:org.taverna.server.localworker.impl.utils</packages> </group> </groups> + <detectJavaApiLink>true</detectJavaApiLink> </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-changelog-plugin</artifactId> <version>2.2</version> + <configuration> + <issueLinkUrl>http://www.mygrid.org.uk/dev/issues/browse/%ISSUE%</issueLinkUrl> + </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -379,6 +410,10 @@ <packages>org.taverna.server.master.exceptions:org.taverna.server.master.factories:org.taverna.server.master.interfaces</packages> </group> <group> + <title>Notification and Accounting</title> + <packages>org.taverna.server.master.notification:org.taverna.server.master.notification.atom:org.taverna.server.master.usage</packages> + </group> + <group> <title>Server Coupling to RMI Back End</title> <packages>org.taverna.server.master.identity:org.taverna.server.master.localworker</packages> </group> @@ -392,7 +427,7 @@ </group> <group> <title>Externally-Defined Document Formats</title> - <packages>org.taverna.server.input_description:org.taverna.server.output_description:org.ogf.usage:org.ogf.usage.v1_0:org.w3._2000._09.xmldsig_</packages> + <packages>org.taverna.server.port_description:org.ogf.usage:org.ogf.usage.v1_0:org.w3._2000._09.xmldsig_</packages> </group> <group> <title>Server Back End Factory Coupling to Command Line Executor</title> @@ -403,12 +438,13 @@ <packages>org.taverna.server.master.utils:org.taverna.server.localworker.impl.utils</packages> </group> </groups> + <detectJavaApiLink>true</detectJavaApiLink> </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-changes-plugin</artifactId> - <version>2.3</version> + <version>2.4</version> <reportSets> <reportSet> <id>jira-report</id> @@ -421,7 +457,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.5</version> + <version>2.6</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -431,7 +467,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-report-plugin</artifactId> - <version>2.5</version> + <version>2.8</version> </plugin> </plugins> </reporting> ======================================= --- /taverna/products/uk.org.taverna.server/trunk/server-distribution/pom.xml Wed May 18 03:06:58 2011 +++ /taverna/products/uk.org.taverna.server/trunk/server-distribution/pom.xml Fri Sep 23 06:23:22 2011 @@ -31,7 +31,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-5</version> <configuration> <finalName>TavernaServer-${project.parent.version}</finalName> <descriptors> @@ -49,19 +48,21 @@ </executions> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> - <version>2.1.2</version> <executions> <execution> + <id>default</id> <phase>none</phase> </execution> </executions> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.3.1</version> <executions> <execution> + <id>default</id> <phase>none</phase> </execution> </executions> ======================================= --- /taverna/products/uk.org.taverna.server/trunk/server-port-description/pom.xml Mon Aug 1 05:11:54 2011 +++ /taverna/products/uk.org.taverna.server/trunk/server-port-description/pom.xml Fri Sep 23 06:23:22 2011 @@ -28,7 +28,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.1</version> <configuration> <encoding>US-ASCII</encoding> <source>1.6</source> @@ -38,7 +37,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-eclipse-plugin</artifactId> - <version>2.8</version> <configuration> <projectNameTemplate>[artifactId]-[version]</projectNameTemplate> </configuration> ======================================= --- /taverna/products/uk.org.taverna.server/trunk/server-runinterface/pom.xml Mon Jul 19 14:03:08 2010 +++ /taverna/products/uk.org.taverna.server/trunk/server-runinterface/pom.xml Fri Sep 23 06:23:22 2011 @@ -23,7 +23,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.1</version> <configuration> <encoding>US-ASCII</encoding> <source>1.6</source> ======================================= --- /taverna/products/uk.org.taverna.server/trunk/server-unix-forker/pom.xml Tue Feb 1 01:49:57 2011 +++ /taverna/products/uk.org.taverna.server/trunk/server-unix-forker/pom.xml Fri Sep 23 06:23:22 2011 @@ -33,7 +33,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.1</version> <configuration> <encoding>US-ASCII</encoding> <source>1.6</source> @@ -44,8 +43,8 @@ </pluginManagement> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-5</version> <configuration> <descriptorRefs> <descriptorRef>jar-with-dependencies</descriptorRef> ======================================= --- /taverna/products/uk.org.taverna.server/trunk/server-usagerecord/pom.xml Wed Feb 23 07:48:22 2011 +++ /taverna/products/uk.org.taverna.server/trunk/server-usagerecord/pom.xml Fri Sep 23 06:23:22 2011 @@ -41,6 +41,7 @@ </executions> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> <source>1.6</source> ======================================= --- /taverna/products/uk.org.taverna.server/trunk/server-webapp/pom.xml Mon Aug 1 08:09:29 2011 +++ /taverna/products/uk.org.taverna.server/trunk/server-webapp/pom.xml Fri Sep 23 06:23:22 2011 @@ -53,10 +53,10 @@ </pluginRepositories> <properties> - <version.cxf>2.3.5</version.cxf> + <version.cxf>2.4.2</version.cxf> <version.spring>3.0.5.RELEASE</version.spring> <version.spring-security>3.0.2.RELEASE</version.spring-security> - <version.datanucleus>2.2.2</version.datanucleus> + <version.datanucleus>2.2.3</version.datanucleus> <version.asm>3.3</version.asm> <version.smack>3.1.0</version.smack> <version.commandline>2.3.0</version.commandline> @@ -251,6 +251,7 @@ <dependency> <groupId>org.apache.abdera</groupId> <artifactId>abdera-core</artifactId> + <version>1.1.2</version> </dependency> <dependency> <groupId>org.apache.abdera</groupId> @@ -287,8 +288,7 @@ <dependency> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-impl</artifactId> - <version>2.1.13</version> - <scope>compile</scope> + <version>2.2.2</version> </dependency> <dependency> <groupId>org.springframework</groupId> @@ -333,7 +333,7 @@ <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> - <version>2.5</version> + <version>2.6</version> </dependency> <dependency> <groupId>commons-codec</groupId> @@ -349,7 +349,6 @@ <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> <version>3.2.1</version> - <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.abdera</groupId> @@ -386,7 +385,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> <configuration> <encoding>US-ASCII</encoding> <source>1.6</source> @@ -420,8 +418,8 @@ <defaultGoal>package</defaultGoal> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>2.1</version> <executions> <execution> <id>copy-executable-library-jars</id> @@ -522,7 +520,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> <configuration> <encoding>US-ASCII</encoding> <source>1.6</source> ======================================= --- /taverna/products/uk.org.taverna.server/trunk/server-webapp/src/main/java/org/taverna/server/master/admin/Admin.java Mon Jul 11 07:32:00 2011 +++ /taverna/products/uk.org.taverna.server/trunk/server-webapp/src/main/java/org/taverna/server/master/admin/Admin.java Fri Sep 23 06:23:22 2011 @@ -18,7 +18,7 @@ import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; -import org.apache.cxf.jaxrs.ext.Description; +import org.apache.cxf.jaxrs.model.wadl.Description; import org.ogf.usage.JobUsageRecord; import org.taverna.server.master.common.Uri; import org.taverna.server.master.common.VersionedElement; ======================================= --- /taverna/products/uk.org.taverna.server/trunk/server-webapp/src/main/java/org/taverna/server/master/rest/TavernaServerDirectoryREST.java Fri Apr 8 07:18:34 2011 +++ /taverna/products/uk.org.taverna.server/trunk/server-webapp/src/main/java/org/taverna/server/master/rest/TavernaServerDirectoryREST.java Fri Sep 23 06:23:22 2011 @@ -26,7 +26,7 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; -import org.apache.cxf.jaxrs.ext.Description; +import org.apache.cxf.jaxrs.model.wadl.Description; import org.taverna.server.master.exceptions.FilesystemAccessException; import org.taverna.server.master.exceptions.NoDirectoryEntryException; import org.taverna.server.master.exceptions.NoUpdateException; ======================================= --- /taverna/products/uk.org.taverna.server/trunk/server-webapp/src/main/java/org/taverna/server/master/rest/TavernaServerInputREST.java Mon Aug 1 08:09:29 2011 +++ /taverna/products/uk.org.taverna.server/trunk/server-webapp/src/main/java/org/taverna/server/master/rest/TavernaServerInputREST.java Fri Sep 23 06:23:22 2011 @@ -25,7 +25,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlValue; -import org.apache.cxf.jaxrs.ext.Description; +import org.apache.cxf.jaxrs.model.wadl.Description; import org.taverna.server.port_description.InputDescription; import org.taverna.server.master.common.Uri; import org.taverna.server.master.common.VersionedElement; ======================================= --- /taverna/products/uk.org.taverna.server/trunk/server-webapp/src/main/java/org/taverna/server/master/rest/TavernaServerListenersREST.java Fri Jul 22 07:35:31 2011 +++ /taverna/products/uk.org.taverna.server/trunk/server-webapp/src/main/java/org/taverna/server/master/rest/TavernaServerListenersREST.java Fri Sep 23 06:23:22 2011 @@ -31,7 +31,7 @@ import javax.xml.bind.annotation.XmlSchemaType; import javax.xml.bind.annotation.XmlType; -import org.apache.cxf.jaxrs.ext.Description; +import org.apache.cxf.jaxrs.model.wadl.Description; import org.taverna.server.master.common.Uri; import org.taverna.server.master.common.VersionedElement; import org.taverna.server.master.exceptions.NoListenerException; ======================================= --- /taverna/products/uk.org.taverna.server/trunk/server-webapp/src/main/java/org/taverna/server/master/rest/TavernaServerREST.java Fri Aug 12 06:19:50 2011 +++ /taverna/products/uk.org.taverna.server/trunk/server-webapp/src/main/java/org/taverna/server/master/rest/TavernaServerREST.java Fri Sep 23 06:23:22 2011 @@ -29,7 +29,7 @@ import javax.xml.bind.annotation.XmlTransient; import javax.xml.bind.annotation.XmlType; -import org.apache.cxf.jaxrs.ext.Description; +import org.apache.cxf.jaxrs.model.wadl.Description; import org.taverna.server.master.common.RunReference; import org.taverna.server.master.common.Uri; import org.taverna.server.master.common.VersionedElement; ======================================= --- /taverna/products/uk.org.taverna.server/trunk/server-webapp/src/main/java/org/taverna/server/master/rest/TavernaServerRunREST.java Fri Aug 12 06:19:50 2011 +++ /taverna/products/uk.org.taverna.server/trunk/server-webapp/src/main/java/org/taverna/server/master/rest/TavernaServerRunREST.java Fri Sep 23 06:23:22 2011 @@ -30,7 +30,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlValue; -import org.apache.cxf.jaxrs.ext.Description; +import org.apache.cxf.jaxrs.model.wadl.Description; import org.joda.time.format.DateTimeFormatter; import org.taverna.server.master.common.Namespaces; import org.taverna.server.master.common.Status; ======================================= --- /taverna/products/uk.org.taverna.server/trunk/server-webapp/src/main/java/org/taverna/server/master/rest/TavernaServerSecurityREST.java Thu Sep 1 06:33:42 2011 +++ /taverna/products/uk.org.taverna.server/trunk/server-webapp/src/main/java/org/taverna/server/master/rest/TavernaServerSecurityREST.java Fri Sep 23 06:23:22 2011 @@ -34,7 +34,7 @@ import javax.xml.bind.annotation.XmlSchemaType; import javax.xml.bind.annotation.XmlType; -import org.apache.cxf.jaxrs.ext.Description; +import org.apache.cxf.jaxrs.model.wadl.Description; import org.taverna.server.master.common.Credential; import org.taverna.server.master.common.Permission; import org.taverna.server.master.common.Trust; ======================================= --- /taverna/products/uk.org.taverna.server/trunk/server-webapp/src/main/java/org/taverna/server/master/utils/JDOSupport.java Wed Jul 13 02:33:52 2011 +++ /taverna/products/uk.org.taverna.server/trunk/server-webapp/src/main/java/org/taverna/server/master/utils/JDOSupport.java Fri Sep 23 06:23:22 2011 @@ -28,7 +28,7 @@ * * @author Donal Fellows * - * @param <T> + * @param <T> * The context class that the subclass will be working with. */ public abstract class JDOSupport<T> { ======================================= --- /taverna/products/uk.org.taverna.server/trunk/server-worker/pom.xml Wed Feb 23 07:10:17 2011 +++ /taverna/products/uk.org.taverna.server/trunk/server-worker/pom.xml Fri Sep 23 06:23:22 2011 @@ -58,7 +58,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.1</version> <configuration> <encoding>US-ASCII</encoding> <source>1.6</source> @@ -69,8 +68,8 @@ </pluginManagement> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-5</version> <configuration> <descriptorRefs> <descriptorRef>jar-with-dependencies</descriptorRef> |