You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by st...@apache.org on 2016/05/31 21:41:55 UTC
incubator-taverna-engine git commit: Use project.parent.version for
taverna.engine
Repository: incubator-taverna-engine
Updated Branches:
refs/heads/master ae6f99066 -> 8b0cb770b
Use project.parent.version for taverna.engine
avoids error with mvn release:prepare
[ERROR] Failed to execute goal org.apache.maven.plugins:maven-release-plugin:2.5.2:prepare (default-cli) on project apache-taverna-engine: The artifact (org.apache.taverna.engine:taverna-workflowmodel-api) requires a different version (3.1.0-incubating) than what is found (${project.parent.version}) for the expression (taverna.engine.version) in the project (org.apache.taverna.engine:taverna-activity-archetype). -> [Help 1]
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/commit/8b0cb770
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/tree/8b0cb770
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/diff/8b0cb770
Branch: refs/heads/master
Commit: 8b0cb770b403f3cda2cd5b390913aac5229ffe4a
Parents: ae6f990
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Tue May 31 22:41:17 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Tue May 31 22:41:17 2016 +0100
----------------------------------------------------------------------
taverna-activity-archetype/pom.xml | 11 ++++-------
.../src/main/resources/archetype-resources/pom.xml | 2 +-
2 files changed, 5 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/8b0cb770/taverna-activity-archetype/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-activity-archetype/pom.xml b/taverna-activity-archetype/pom.xml
index 3cd7e47..916a027 100644
--- a/taverna-activity-archetype/pom.xml
+++ b/taverna-activity-archetype/pom.xml
@@ -30,9 +30,6 @@
<description>Archetype to build a Taverna 3 service activity.
Includes engine and UI parts, and a test class to run the workbench with the new activity.
</description>
- <properties>
- <taverna.engine.version>${project.parent.version}</taverna.engine.version>
- </properties>
<build>
<resources>
<resource>
@@ -91,25 +88,25 @@
<dependency>
<groupId>org.apache.taverna.engine</groupId>
<artifactId>taverna-workflowmodel-api</artifactId>
- <version>${taverna.engine.version}</version>
+ <version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.taverna.engine</groupId>
<artifactId>taverna-reference-api</artifactId>
- <version>${taverna.engine.version}</version>
+ <version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.taverna.engine</groupId>
<artifactId>taverna-workflowmodel-impl</artifactId>
- <version>${taverna.engine.version}</version>
+ <version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.taverna.engine</groupId>
<artifactId>taverna-activity-test-utils</artifactId>
- <version>${taverna.engine.version}</version>
+ <version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/8b0cb770/taverna-activity-archetype/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-activity-archetype/src/main/resources/archetype-resources/pom.xml b/taverna-activity-archetype/src/main/resources/archetype-resources/pom.xml
index cd6e6cd..8e54ab3 100644
--- a/taverna-activity-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/taverna-activity-archetype/src/main/resources/archetype-resources/pom.xml
@@ -32,9 +32,9 @@
## The ${} below are expanded from taverna-engine pom.xml
## by resource filtering, rather than by Velocity
## http://maven.apache.org/plugins/maven-resources-plugin/examples/filter.html
+ <taverna.engine.version>${project.parent.version}</taverna.engine.version>
<taverna.language.version>${taverna.language.version}</taverna.language.version>
<taverna.osgi.version>${taverna.osgi.version}</taverna.osgi.version>
- <taverna.engine.version>${taverna.engine.version}</taverna.engine.version>
<taverna.workbench.version>3.1.0-incubating-SNAPSHOT</taverna.workbench.version>
</properties>