You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ci...@apache.org on 2015/12/01 03:19:01 UTC
[1/2] incubator-brooklyn git commit: Fix itest/pom: include
BROOKLYN_VERSION marker
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 <al...@gmail.com>
Authored: Mon Nov 30 16:51:54 2015 +0000
Committer: Aled Sage <al...@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>
[2/2] incubator-brooklyn git commit: This closes #1077
Posted by ci...@apache.org.
This closes #1077
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/591386e6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/591386e6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/591386e6
Branch: refs/heads/master
Commit: 591386e6d5a279fe7cd6c2aaa01aa0b40b8c9e7a
Parents: d20e41d 95e5e59
Author: Ciprian Ciubotariu <ch...@gmx.net>
Authored: Tue Dec 1 04:17:27 2015 +0200
Committer: Ciprian Ciubotariu <ch...@gmx.net>
Committed: Tue Dec 1 04:17:27 2015 +0200
----------------------------------------------------------------------
karaf/itest/pom.xml | 13 +++++++------
karaf/pom.xml | 12 +++++++-----
2 files changed, 14 insertions(+), 11 deletions(-)
----------------------------------------------------------------------