[SERVER] [LIBRARY] [DIST] multiple pom updates to pull brooklyn-parent via
relative path to brooklyn-server repo, added dist and a root pom to build the
all modules that are built in the pre-split incubator-brooklyn repo
Conflicts:
pom.xml - versions removed in root, hazelcast version updated in PR's;
new version applied to server/library poms
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/d0a6e705
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/d0a6e705
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/d0a6e705
Branch: refs/heads/master
Commit: d0a6e705a48b409c878eb4dee4f8b7de0280d397
Parents: 74877b1
Author: John McCabe <[email protected]>
Authored: Thu Dec 17 18:14:41 2015 +0000
Committer: Alex Heneveld <[email protected]>
Committed: Mon Dec 21 16:43:36 2015 +0000
----------------------------------------------------------------------
brooklyn-dist/all/pom.xml | 4 +-
brooklyn-dist/archetypes/quickstart/pom.xml | 4 +-
.../quickstart/src/brooklyn-sample/pom.xml | 1 +
brooklyn-dist/dist/pom.xml | 4 +-
brooklyn-dist/downstream-parent/pom.xml | 4 +-
brooklyn-dist/pom.xml | 82 ++++++++++++++++++++
6 files changed, 91 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/d0a6e705/brooklyn-dist/all/pom.xml
----------------------------------------------------------------------
diff --git a/brooklyn-dist/all/pom.xml b/brooklyn-dist/all/pom.xml
index c257f0e..46397b1 100644
--- a/brooklyn-dist/all/pom.xml
+++ b/brooklyn-dist/all/pom.xml
@@ -30,9 +30,9 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
- <artifactId>brooklyn-parent</artifactId>
+ <artifactId>brooklyn-dist-root</artifactId>
<version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
- <relativePath>../../parent/pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/d0a6e705/brooklyn-dist/archetypes/quickstart/pom.xml
----------------------------------------------------------------------
diff --git a/brooklyn-dist/archetypes/quickstart/pom.xml
b/brooklyn-dist/archetypes/quickstart/pom.xml
index 1594181..39adbdd 100644
--- a/brooklyn-dist/archetypes/quickstart/pom.xml
+++ b/brooklyn-dist/archetypes/quickstart/pom.xml
@@ -30,9 +30,9 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
- <artifactId>brooklyn-parent</artifactId>
+ <artifactId>brooklyn-dist-root</artifactId>
<version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
- <relativePath>../../../parent/pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<build>
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/d0a6e705/brooklyn-dist/archetypes/quickstart/src/brooklyn-sample/pom.xml
----------------------------------------------------------------------
diff --git a/brooklyn-dist/archetypes/quickstart/src/brooklyn-sample/pom.xml
b/brooklyn-dist/archetypes/quickstart/src/brooklyn-sample/pom.xml
index f879498..d1559a8 100644
--- a/brooklyn-dist/archetypes/quickstart/src/brooklyn-sample/pom.xml
+++ b/brooklyn-dist/archetypes/quickstart/src/brooklyn-sample/pom.xml
@@ -8,6 +8,7 @@
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-downstream-parent</artifactId>
<version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <relativePath>../../../../downstream-parent/pom.xml</relativePath>
</parent>
<groupId>com.acme.sample</groupId>
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/d0a6e705/brooklyn-dist/dist/pom.xml
----------------------------------------------------------------------
diff --git a/brooklyn-dist/dist/pom.xml b/brooklyn-dist/dist/pom.xml
index eda7daf..abc6522 100644
--- a/brooklyn-dist/dist/pom.xml
+++ b/brooklyn-dist/dist/pom.xml
@@ -31,9 +31,9 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
- <artifactId>brooklyn-parent</artifactId>
+ <artifactId>brooklyn-dist-root</artifactId>
<version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
- <relativePath>../../parent/pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/d0a6e705/brooklyn-dist/downstream-parent/pom.xml
----------------------------------------------------------------------
diff --git a/brooklyn-dist/downstream-parent/pom.xml
b/brooklyn-dist/downstream-parent/pom.xml
index 027c1bf..e8f4fe0 100644
--- a/brooklyn-dist/downstream-parent/pom.xml
+++ b/brooklyn-dist/downstream-parent/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
- <artifactId>brooklyn</artifactId>
+ <artifactId>brooklyn-dist-root</artifactId>
<version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>brooklyn-downstream-parent</artifactId>
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/d0a6e705/brooklyn-dist/pom.xml
----------------------------------------------------------------------
diff --git a/brooklyn-dist/pom.xml b/brooklyn-dist/pom.xml
new file mode 100644
index 0000000..904a20e
--- /dev/null
+++ b/brooklyn-dist/pom.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and 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.brooklyn</groupId>
+ <artifactId>brooklyn-parent</artifactId>
+ <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <relativePath>../brooklyn-server/parent/pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.brooklyn</groupId>
+ <artifactId>brooklyn-dist-root</artifactId>
+ <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <packaging>pom</packaging>
+
+ <name>Brooklyn Dist Root</name>
+ <description>
+ Brooklyn Dist project root, serving as the ancestor POM for dist
projects --
+ declaring modules to build
+ </description>
+ <url>https://brooklyn.apache.org/</url>
+ <inceptionYear>2012</inceptionYear>
+
+ <developers>
+ <!-- TODO update with PMC members and committers -->
+ </developers>
+
+ <scm>
+
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-brooklyn.git</connection>
+
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-brooklyn.git</developerConnection>
+
<url>https://git-wip-us.apache.org/repos/asf?p=incubator-brooklyn.git</url>
+ <tag>HEAD</tag>
+ </scm>
+
+ <issueManagement>
+ <system>JIRA</system>
+ <url>https://issues.apache.org/jira/browse/BROOKLYN</url>
+ </issueManagement>
+ <ciManagement>
+ <system>Jenkins</system>
+
<url>https://builds.apache.org/job/incubator-brooklyn-master-build/</url>
+ </ciManagement>
+ <mailingLists>
+ <mailingList>
+ <name>Brooklyn Developer List</name>
+ <subscribe>[email protected]</subscribe>
+ <unsubscribe>[email protected]</unsubscribe>
+ <post>[email protected]</post>
+ <archive>
+ http://mail-archives.apache.org/mod_mbox/brooklyn-dev/
+ </archive>
+ </mailingList>
+ </mailingLists>
+
+ <modules>
+ <module>downstream-parent</module>
+ <module>archetypes/quickstart</module>
+ <module>all</module>
+ <module>dist</module>
+ </modules>
+
+</project>
