brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject [8/9] brooklyn-dist git commit: Introduce a parent/pom and prepare for release
Date Mon, 01 Feb 2016 17:43:19 GMT
Introduce a parent/pom and prepare for release

Backport of fix on master by Hadrian Zbarcea <hadrian@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/ed745b9f
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/ed745b9f
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/ed745b9f

Branch: refs/heads/0.7.0-incubating
Commit: ed745b9fdb85e500bd0195af8f1425070c28830d
Parents: 0fae663
Author: Hadrian Zbarcea <hadrian@apache.org>
Authored: Mon Jul 6 22:47:05 2015 -0400
Committer: Richard Downer <richard@apache.org>
Committed: Wed Jul 15 08:22:09 2015 +0000

----------------------------------------------------------------------
 usage/all/pom.xml                   |  2 +-
 usage/archetypes/quickstart/pom.xml |  2 +-
 usage/dist/pom.xml                  |  2 +-
 usage/downstream-parent/pom.xml     | 13 +++++--------
 4 files changed, 8 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/ed745b9f/usage/all/pom.xml
----------------------------------------------------------------------
diff --git a/usage/all/pom.xml b/usage/all/pom.xml
index 21657df..a20f0ac 100644
--- a/usage/all/pom.xml
+++ b/usage/all/pom.xml
@@ -32,7 +32,7 @@
         <groupId>org.apache.brooklyn</groupId>
         <artifactId>brooklyn-parent</artifactId>
         <version>0.7.0-incubating</version>  <!-- BROOKLYN_VERSION -->
-        <relativePath>../../pom.xml</relativePath>
+        <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
     <dependencies>

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/ed745b9f/usage/archetypes/quickstart/pom.xml
----------------------------------------------------------------------
diff --git a/usage/archetypes/quickstart/pom.xml b/usage/archetypes/quickstart/pom.xml
index cb814cf..d7217b2 100644
--- a/usage/archetypes/quickstart/pom.xml
+++ b/usage/archetypes/quickstart/pom.xml
@@ -32,7 +32,7 @@
     <groupId>org.apache.brooklyn</groupId>
     <artifactId>brooklyn-parent</artifactId>
     <version>0.7.0-incubating</version>  <!-- BROOKLYN_VERSION -->
-    <relativePath>../../../pom.xml</relativePath>
+    <relativePath>../../../parent/pom.xml</relativePath>
   </parent>
 
   <build>

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/ed745b9f/usage/dist/pom.xml
----------------------------------------------------------------------
diff --git a/usage/dist/pom.xml b/usage/dist/pom.xml
index 5e57346..d803988 100644
--- a/usage/dist/pom.xml
+++ b/usage/dist/pom.xml
@@ -33,7 +33,7 @@
         <groupId>org.apache.brooklyn</groupId>
         <artifactId>brooklyn-parent</artifactId>
         <version>0.7.0-incubating</version>  <!-- BROOKLYN_VERSION -->
-        <relativePath>../../pom.xml</relativePath>
+        <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
     <dependencies>

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/ed745b9f/usage/downstream-parent/pom.xml
----------------------------------------------------------------------
diff --git a/usage/downstream-parent/pom.xml b/usage/downstream-parent/pom.xml
index c8372d0..fb90a22 100644
--- a/usage/downstream-parent/pom.xml
+++ b/usage/downstream-parent/pom.xml
@@ -20,17 +20,14 @@
 <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>
 
-  <groupId>org.apache.brooklyn</groupId>
-  <artifactId>brooklyn-downstream-parent</artifactId>
-  <version>0.7.0-incubating</version>  <!-- BROOKLYN_VERSION -->
-  <packaging>pom</packaging>
-
   <parent>
-    <groupId>org.sonatype.oss</groupId>
-    <artifactId>oss-parent</artifactId>
-    <version>9</version>
+    <groupId>org.apache.brooklyn</groupId>
+    <artifactId>brooklyn</artifactId>
+    <version>0.7.0-incubating</version>  <!-- BROOKLYN_VERSION -->
   </parent>
 
+  <artifactId>brooklyn-downstream-parent</artifactId>
+  <packaging>pom</packaging>
   <name>Brooklyn Downstream Project Parent</name>
   <description>
       Parent pom that can be used by downstream projects that use Brooklyn,


Mime
View raw message