Repository: incubator-brooklyn Updated Branches: refs/heads/master d20e41d6d -> 591386e6d
Fix itest/pom: include BROOKLYN_VERSION marker Also follows convention used in other poms, to include relativePath for parent, and to declare the artifactId+name before the parent. Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/95e5e59f Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/95e5e59f Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/95e5e59f Branch: refs/heads/master Commit: 95e5e59fdbdb79b447d8929f17204dc8ab018db2 Parents: aeb56fd Author: Aled Sage <aled.s...@gmail.com> Authored: Mon Nov 30 16:51:54 2015 +0000 Committer: Aled Sage <aled.s...@gmail.com> Committed: Mon Nov 30 16:51:54 2015 +0000 ---------------------------------------------------------------------- karaf/itest/pom.xml | 13 +++++++------ karaf/pom.xml | 12 +++++++----- 2 files changed, 14 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/95e5e59f/karaf/itest/pom.xml ---------------------------------------------------------------------- diff --git a/karaf/itest/pom.xml b/karaf/itest/pom.xml index 888727c..b00343d 100644 --- a/karaf/itest/pom.xml +++ b/karaf/itest/pom.xml @@ -19,16 +19,17 @@ --> <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> + + <artifactId>brooklyn-itest</artifactId> + <name>Brooklyn Karaf pax-exam itest</name> + <parent> - <artifactId>brooklyn-karaf</artifactId> <groupId>org.apache.brooklyn</groupId> - <version>0.9.0-SNAPSHOT</version> + <artifactId>brooklyn-karaf</artifactId> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <relativePath>../pom.xml</relativePath> </parent> - <groupId>org.apache.brooklyn</groupId> - <artifactId>brooklyn-itest</artifactId> - <name>Brooklyn Karaf pax-exam itest</name> - <dependencies> <!-- Pax Exam Dependencies --> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/95e5e59f/karaf/pom.xml ---------------------------------------------------------------------- diff --git a/karaf/pom.xml b/karaf/pom.xml index 39f360f..903b182 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -19,16 +19,18 @@ --><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.brooklyn</groupId> - <artifactId>brooklyn</artifactId> - <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> - </parent> <artifactId>brooklyn-karaf</artifactId> <name>Brooklyn Karaf</name> <packaging>pom</packaging> + <parent> + <groupId>org.apache.brooklyn</groupId> + <artifactId>brooklyn</artifactId> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <relativePath>../pom.xml</relativePath> + </parent> + <properties> <karaf.version>4.0.3</karaf.version>
