Repository: incubator-taverna-common-activities Updated Branches: refs/heads/master a4d453c61 -> c604cc7c9
[maven-release-plugin] prepare release 2.1.0-incubating-RC1 Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/commit/c604cc7c Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/tree/c604cc7c Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/diff/c604cc7c Branch: refs/heads/master Commit: c604cc7c93098e93073917ecb57167f879ae6e31 Parents: a4d453c Author: Stian Soiland-Reyes <[email protected]> Authored: Tue May 31 14:25:05 2016 +0100 Committer: Stian Soiland-Reyes <[email protected]> Committed: Tue May 31 14:25:05 2016 +0100 ---------------------------------------------------------------------- pom.xml | 7 +- taverna-beanshell-activity/pom.xml | 5 +- taverna-external-tool-activity/pom.xml | 5 +- taverna-interaction-activity/pom.xml | 7 +- taverna-rest-activity/pom.xml | 189 +++++++++++------------ taverna-spreadsheet-import-activity/pom.xml | 5 +- taverna-wsdl-activity/pom.xml | 5 +- taverna-wsdl-generic/pom.xml | 5 +- taverna-xpath-activity/pom.xml | 95 ++++++------ 9 files changed, 157 insertions(+), 166 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/c604cc7c/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 5d9dd41..33de8ce 100644 --- a/pom.xml +++ b/pom.xml @@ -17,8 +17,7 @@ limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.taverna</groupId> @@ -27,7 +26,7 @@ </parent> <groupId>org.apache.taverna.commonactivities</groupId> <artifactId>apache-taverna-common-activities</artifactId> - <version>2.1.0-incubating-SNAPSHOT</version> + <version>2.1.0-incubating</version> <packaging>pom</packaging> <name>Apache Taverna Common Activities</name> <properties> @@ -91,7 +90,7 @@ <connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities.git</connection> <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities.git</developerConnection> <url>https://github.com/apache/incubator-taverna-common-activities</url> - <tag>HEAD</tag> + <tag>2.1.0-incubating-RC1</tag> </scm> <repositories> <repository> http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/c604cc7c/taverna-beanshell-activity/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-beanshell-activity/pom.xml b/taverna-beanshell-activity/pom.xml index 204fa8b..79079d7 100644 --- a/taverna-beanshell-activity/pom.xml +++ b/taverna-beanshell-activity/pom.xml @@ -17,13 +17,12 @@ limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 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.taverna.commonactivities</groupId> <artifactId>apache-taverna-common-activities</artifactId> - <version>2.1.0-incubating-SNAPSHOT</version> + <version>2.1.0-incubating</version> </parent> <artifactId>taverna-beanshell-activity</artifactId> <packaging>bundle</packaging> http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/c604cc7c/taverna-external-tool-activity/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-external-tool-activity/pom.xml b/taverna-external-tool-activity/pom.xml index 2bb053e..4a36065 100644 --- a/taverna-external-tool-activity/pom.xml +++ b/taverna-external-tool-activity/pom.xml @@ -17,13 +17,12 @@ limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 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.taverna.commonactivities</groupId> <artifactId>apache-taverna-common-activities</artifactId> - <version>2.1.0-incubating-SNAPSHOT</version> + <version>2.1.0-incubating</version> </parent> <artifactId>taverna-external-tool-activity</artifactId> <packaging>bundle</packaging> http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/c604cc7c/taverna-interaction-activity/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-interaction-activity/pom.xml b/taverna-interaction-activity/pom.xml index cfde90f..9a1d736 100644 --- a/taverna-interaction-activity/pom.xml +++ b/taverna-interaction-activity/pom.xml @@ -17,13 +17,12 @@ limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 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.taverna.commonactivities</groupId> <artifactId>apache-taverna-common-activities</artifactId> - <version>2.1.0-incubating-SNAPSHOT</version> + <version>2.1.0-incubating</version> </parent> <artifactId>taverna-interaction-activity</artifactId> <packaging>bundle</packaging> @@ -37,7 +36,7 @@ <configuration> <instructions> <!-- Export nothing --> - <Export-Package></Export-Package> + <Export-Package /> <Embed-Transitive>true</Embed-Transitive> <Embed-Dependency>webdav-servlet</Embed-Dependency> </instructions> http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/c604cc7c/taverna-rest-activity/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-rest-activity/pom.xml b/taverna-rest-activity/pom.xml index 14cc298..e9b6fd1 100644 --- a/taverna-rest-activity/pom.xml +++ b/taverna-rest-activity/pom.xml @@ -17,98 +17,97 @@ limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - 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.taverna.commonactivities</groupId> - <artifactId>apache-taverna-common-activities</artifactId> - <version>2.1.0-incubating-SNAPSHOT</version> - </parent> - <artifactId>taverna-rest-activity</artifactId> - <name>Apache Taverna REST Activity</name> - <packaging>bundle</packaging> - - <dependencies> - <dependency> - <groupId>org.apache.taverna.engine</groupId> - <artifactId>taverna-reference-api</artifactId> - <version>${taverna.engine.version}</version> - </dependency> - <dependency> - <groupId>org.apache.taverna.engine</groupId> - <artifactId>taverna-workflowmodel-api</artifactId> - <version>${taverna.engine.version}</version> - </dependency> - <dependency> - <groupId>org.apache.taverna.engine</groupId> - <artifactId>taverna-credential-manager-api</artifactId> - <version>${taverna.engine.version}</version> - </dependency> - - <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <version>${commons.codec.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient-osgi</artifactId> - <version>${apache.httpclient.version}</version> - <exclusions> - <!-- These are all embedded within httpclient-osgi --> - <exclusion> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - </exclusion> - <exclusion> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpmime</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient-cache</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>fluent-hc</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpcore-osgi</artifactId> - <version>${apache.httpcore.version}</version> - <exclusions> - <exclusion> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpcore</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpcore-nio</artifactId> - </exclusion> - </exclusions> - </dependency> - - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>${junit.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.taverna.engine</groupId> - <artifactId>taverna-activity-test-utils</artifactId> - <version>${taverna.engine.version}</version> - <scope>test</scope> - </dependency> - - </dependencies> -</project> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 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.taverna.commonactivities</groupId> + <artifactId>apache-taverna-common-activities</artifactId> + <version>2.1.0-incubating</version> + </parent> + <artifactId>taverna-rest-activity</artifactId> + <name>Apache Taverna REST Activity</name> + <packaging>bundle</packaging> + + <dependencies> + <dependency> + <groupId>org.apache.taverna.engine</groupId> + <artifactId>taverna-reference-api</artifactId> + <version>${taverna.engine.version}</version> + </dependency> + <dependency> + <groupId>org.apache.taverna.engine</groupId> + <artifactId>taverna-workflowmodel-api</artifactId> + <version>${taverna.engine.version}</version> + </dependency> + <dependency> + <groupId>org.apache.taverna.engine</groupId> + <artifactId>taverna-credential-manager-api</artifactId> + <version>${taverna.engine.version}</version> + </dependency> + + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>${commons.codec.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient-osgi</artifactId> + <version>${apache.httpclient.version}</version> + <exclusions> + <!-- These are all embedded within httpclient-osgi --> + <exclusion> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + </exclusion> + <exclusion> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpmime</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient-cache</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>fluent-hc</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore-osgi</artifactId> + <version>${apache.httpcore.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore-nio</artifactId> + </exclusion> + </exclusions> + </dependency> + + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junit.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.taverna.engine</groupId> + <artifactId>taverna-activity-test-utils</artifactId> + <version>${taverna.engine.version}</version> + <scope>test</scope> + </dependency> + + </dependencies> +</project> http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/c604cc7c/taverna-spreadsheet-import-activity/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-spreadsheet-import-activity/pom.xml b/taverna-spreadsheet-import-activity/pom.xml index 1256a10..6fdf508 100644 --- a/taverna-spreadsheet-import-activity/pom.xml +++ b/taverna-spreadsheet-import-activity/pom.xml @@ -17,13 +17,12 @@ limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 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.taverna.commonactivities</groupId> <artifactId>apache-taverna-common-activities</artifactId> - <version>2.1.0-incubating-SNAPSHOT</version> + <version>2.1.0-incubating</version> </parent> <artifactId>taverna-spreadsheet-import-activity</artifactId> <packaging>bundle</packaging> http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/c604cc7c/taverna-wsdl-activity/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-wsdl-activity/pom.xml b/taverna-wsdl-activity/pom.xml index cbee926..f82539b 100644 --- a/taverna-wsdl-activity/pom.xml +++ b/taverna-wsdl-activity/pom.xml @@ -17,13 +17,12 @@ limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 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.taverna.commonactivities</groupId> <artifactId>apache-taverna-common-activities</artifactId> - <version>2.1.0-incubating-SNAPSHOT</version> + <version>2.1.0-incubating</version> </parent> <artifactId>taverna-wsdl-activity</artifactId> <packaging>bundle</packaging> http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/c604cc7c/taverna-wsdl-generic/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-wsdl-generic/pom.xml b/taverna-wsdl-generic/pom.xml index 6229580..6c78be3 100644 --- a/taverna-wsdl-generic/pom.xml +++ b/taverna-wsdl-generic/pom.xml @@ -17,13 +17,12 @@ limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 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.taverna.commonactivities</groupId> <artifactId>apache-taverna-common-activities</artifactId> - <version>2.1.0-incubating-SNAPSHOT</version> + <version>2.1.0-incubating</version> </parent> <artifactId>taverna-wsdl-generic</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/c604cc7c/taverna-xpath-activity/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-xpath-activity/pom.xml b/taverna-xpath-activity/pom.xml index c15e4ff..b637f7e 100644 --- a/taverna-xpath-activity/pom.xml +++ b/taverna-xpath-activity/pom.xml @@ -17,52 +17,51 @@ limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.taverna.commonactivities</groupId> - <artifactId>apache-taverna-common-activities</artifactId> - <version>2.1.0-incubating-SNAPSHOT</version> - </parent> - <artifactId>taverna-xpath-activity</artifactId> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.taverna.commonactivities</groupId> + <artifactId>apache-taverna-common-activities</artifactId> + <version>2.1.0-incubating</version> + </parent> + <artifactId>taverna-xpath-activity</artifactId> <name>Apache Taverna XPath Activity</name> - <packaging>bundle</packaging> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Import-Package>org.jaxen,*</Import-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>org.apache.taverna.engine</groupId> - <artifactId>taverna-reference-api</artifactId> - <version>${taverna.engine.version}</version> - </dependency> - <dependency> - <groupId>org.apache.taverna.engine</groupId> - <artifactId>taverna-workflowmodel-api</artifactId> - <version>${taverna.engine.version}</version> - </dependency> - - <dependency> - <groupId>org.dom4j</groupId> - <artifactId>com.springsource.org.dom4j</artifactId> - <version>${dom4j.version}</version> - </dependency> - <dependency> - <groupId>org.jaxen</groupId> - <artifactId>com.springsource.org.jaxen</artifactId> - <version>${jaxen.version}</version> - </dependency> - </dependencies> -</project> + <packaging>bundle</packaging> + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Import-Package>org.jaxen,*</Import-Package> + </instructions> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>org.apache.taverna.engine</groupId> + <artifactId>taverna-reference-api</artifactId> + <version>${taverna.engine.version}</version> + </dependency> + <dependency> + <groupId>org.apache.taverna.engine</groupId> + <artifactId>taverna-workflowmodel-api</artifactId> + <version>${taverna.engine.version}</version> + </dependency> + + <dependency> + <groupId>org.dom4j</groupId> + <artifactId>com.springsource.org.dom4j</artifactId> + <version>${dom4j.version}</version> + </dependency> + <dependency> + <groupId>org.jaxen</groupId> + <artifactId>com.springsource.org.jaxen</artifactId> + <version>${jaxen.version}</version> + </dependency> + </dependencies> +</project>
