Corrected Maven <parent>, use taverna-maven-plugin
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/commit/683a7a05 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/tree/683a7a05 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/diff/683a7a05 Branch: refs/heads/master Commit: 683a7a057bcbc3fc58557f0b9665247991ce989c Parents: a28a948 Author: Stian Soiland-Reyes <[email protected]> Authored: Mon Jul 11 14:41:06 2016 +0100 Committer: Stian Soiland-Reyes <[email protected]> Committed: Mon Jul 11 14:41:06 2016 +0100 ---------------------------------------------------------------------- apache-taverna-activity-gis-activity-ui/pom.xml | 12 +++---- apache-taverna-activity-gis-activity/pom.xml | 6 ++-- apache-taverna-activity-gis-plugin/pom.xml | 8 ++--- pom.xml | 36 ++++++++++++++++++++ taverna-gis-client/pom.xml | 8 ++--- 5 files changed, 53 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/blob/683a7a05/apache-taverna-activity-gis-activity-ui/pom.xml ---------------------------------------------------------------------- diff --git a/apache-taverna-activity-gis-activity-ui/pom.xml b/apache-taverna-activity-gis-activity-ui/pom.xml index 45a1e11..8acc7be 100644 --- a/apache-taverna-activity-gis-activity-ui/pom.xml +++ b/apache-taverna-activity-gis-activity-ui/pom.xml @@ -4,8 +4,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.taverna.gis</groupId> - <artifactId>apache-taverna-activity-gis</artifactId> - <version>0.0.1-incubating.SNAPSHOT</version> + <artifactId>apache-taverna-plugin-gis</artifactId> + <version>0.0.1-incubating-SNAPSHOT</version> </parent> <artifactId>apache-taverna-activity-gis-activity-ui</artifactId> <packaging>bundle</packaging> @@ -47,7 +47,7 @@ <version>${taverna.engine.version}</version> <scope>test</scope> </dependency> - + <dependency> <groupId>org.apache.taverna.workbench</groupId> @@ -64,7 +64,7 @@ <artifactId>taverna-selection-api</artifactId> <version>${taverna.workbench.version}</version> </dependency> - + <dependency> <groupId>org.apache.taverna.workbench</groupId> <artifactId>taverna-menu-api</artifactId> @@ -79,7 +79,7 @@ <groupId>org.apache.taverna.workbench</groupId> <artifactId>taverna-helper-api</artifactId> <version>${taverna.workbench.version}</version> - </dependency> + </dependency> <dependency> <groupId>org.apache.taverna.workbench</groupId> <artifactId>taverna-ui</artifactId> @@ -99,7 +99,7 @@ <groupId>org.apache.taverna.workbench</groupId> <artifactId>taverna-activity-tools</artifactId> <version>${taverna.workbench.version}</version> - </dependency> + </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/blob/683a7a05/apache-taverna-activity-gis-activity/pom.xml ---------------------------------------------------------------------- diff --git a/apache-taverna-activity-gis-activity/pom.xml b/apache-taverna-activity-gis-activity/pom.xml index a118bb5..3bf151f 100644 --- a/apache-taverna-activity-gis-activity/pom.xml +++ b/apache-taverna-activity-gis-activity/pom.xml @@ -4,8 +4,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.taverna.gis</groupId> - <artifactId>apache-taverna-activity-gis</artifactId> - <version>0.0.1-incubating.SNAPSHOT</version> + <artifactId>apache-taverna-plugin-gis</artifactId> + <version>0.0.1-incubating-SNAPSHOT</version> </parent> <artifactId>apache-taverna-activity-gis-activity</artifactId> <packaging>bundle</packaging> @@ -47,7 +47,7 @@ <version>${taverna.engine.version}</version> <scope>test</scope> </dependency> - + <dependency> <groupId>${project.parent.groupId}</groupId> <artifactId>taverna-gis-client</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/blob/683a7a05/apache-taverna-activity-gis-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/apache-taverna-activity-gis-plugin/pom.xml b/apache-taverna-activity-gis-plugin/pom.xml index ebc2cd5..a0a5275 100644 --- a/apache-taverna-activity-gis-plugin/pom.xml +++ b/apache-taverna-activity-gis-plugin/pom.xml @@ -4,8 +4,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.taverna.gis</groupId> - <artifactId>apache-taverna-activity-gis</artifactId> - <version>0.0.1-incubating.SNAPSHOT</version> + <artifactId>apache-taverna-plugin-gis</artifactId> + <version>0.0.1-incubating-SNAPSHOT</version> </parent> <artifactId>apache-taverna-activity-gis-plugin</artifactId> <packaging>taverna-plugin</packaging> @@ -15,13 +15,13 @@ <dependency> <groupId>${project.groupId}</groupId> <artifactId>apache-taverna-activity-gis-activity</artifactId> - <version>0.0.1-incubating.SNAPSHOT</version> + <version>0.0.1-incubating-SNAPSHOT</version> </dependency> <!-- Enable for Workbench integration <dependency> <groupId>${project.groupId}</groupId> <artifactId>apache-taverna-activity-gis-activity-ui</artifactId> - <version>0.0.1-incubating.SNAPSHOT</version> + <version>0.0.1-incubating-SNAPSHOT</version> </dependency> --> </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/blob/683a7a05/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 149bd40..a4af2e0 100644 --- a/pom.xml +++ b/pom.xml @@ -42,6 +42,42 @@ <tag>HEAD</tag> </scm> + <build> + <plugins> + <plugin> + <groupId>org.apache.taverna.osgi</groupId> + <artifactId>taverna-maven-plugin</artifactId> + <version>${taverna.osgi.version}</version> + <extensions>true</extensions> + </plugin> + <plugin> +<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.--> + <groupId>org.eclipse.m2e</groupId> + <artifactId>lifecycle-mapping</artifactId> + <version>1.0.0</version> + <configuration> + <lifecycleMappingMetadata> + <pluginExecutions> + <pluginExecution> + <pluginExecutionFilter> + <groupId>org.apache.taverna.orgi</groupId> + <artifactId>taverna-maven-plugin</artifactId> + <versionRange>[${taverna.osgi.version},)</versionRange> + <goals> + <goal>plugin-generate</goal> + </goals> + </pluginExecutionFilter> + <action> + <ignore /> + </action> + </pluginExecution> + </pluginExecutions> + </lifecycleMappingMetadata> + </configuration> + </plugin> + + </plugins> + </build> <repositories> <repository> http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/blob/683a7a05/taverna-gis-client/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-gis-client/pom.xml b/taverna-gis-client/pom.xml index 909a17e..7cf6f56 100644 --- a/taverna-gis-client/pom.xml +++ b/taverna-gis-client/pom.xml @@ -2,11 +2,11 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.taverna.gis</groupId> - <artifactId>apache-taverna-activity-gis</artifactId> - <version>0.0.1-incubating.SNAPSHOT</version> + <artifactId>apache-taverna-plugin-gis</artifactId> + <version>0.0.1-incubating-SNAPSHOT</version> </parent> <artifactId>taverna-gis-client</artifactId> - + <dependencies> <dependency> <groupId>org.n52.wps</groupId> @@ -14,4 +14,4 @@ <version>3.3.1</version> </dependency> </dependencies> -</project> \ No newline at end of file +</project>
