Return-Path: 
 <commits-return-13137-apmail-brooklyn-commits-archive=brooklyn.apache.org@brooklyn.apache.org>
X-Original-To: apmail-brooklyn-commits-archive@minotaur.apache.org
Delivered-To: apmail-brooklyn-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 5B555194E7
	for <apmail-brooklyn-commits-archive@minotaur.apache.org>;
 Thu, 10 Mar 2016 12:53:16 +0000 (UTC)
Received: (qmail 64386 invoked by uid 500); 10 Mar 2016 12:53:16 -0000
Delivered-To: apmail-brooklyn-commits-archive@brooklyn.apache.org
Received: (qmail 64291 invoked by uid 500); 10 Mar 2016 12:53:16 -0000
Mailing-List: contact commits-help@brooklyn.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@brooklyn.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@brooklyn.apache.org>
List-Post: <mailto:commits@brooklyn.apache.org>
List-Id: <commits.brooklyn.apache.org>
Reply-To: dev@brooklyn.apache.org
Delivered-To: mailing list commits@brooklyn.apache.org
Received: (qmail 64229 invoked by uid 99); 10 Mar 2016 12:53:16 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Mar 2016 12:53:16 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id E202CDFC3C; Thu, 10 Mar 2016 12:53:15 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: heneveld@apache.org
To: commits@brooklyn.apache.org
Date: Thu, 10 Mar 2016 12:53:16 -0000
Message-Id: <c89db7e7f35c459e84f516a9869ed26e@git.apache.org>
In-Reply-To: <54cc934c76024eee850b54989b5187a4@git.apache.org>
References: <54cc934c76024eee850b54989b5187a4@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [02/13] brooklyn-dist git commit: Include brooklyn-client-cli
 artifacts

Include brooklyn-client-cli artifacts


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

Branch: refs/heads/master
Commit: fb30a9cbbbdaa7dc27378f27352ba96f58b3f1fa
Parents: 5bc7080
Author: Geoff Macartney <geoff.macartney@cloudsoftcorp.com>
Authored: Tue Feb 23 14:57:42 2016 +0000
Committer: Geoff Macartney <geoff.macartney@cloudsoftcorp.com>
Committed: Wed Mar 9 20:21:13 2016 +0000

----------------------------------------------------------------------
 all/pom.xml                                 |  7 -------
 dist/pom.xml                                | 19 +++++++++++++++++++
 dist/src/main/config/build-distribution.xml |  4 ++++
 3 files changed, 23 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/fb30a9cb/all/pom.xml
----------------------------------------------------------------------
diff --git a/all/pom.xml b/all/pom.xml
index 4884bcf..e7e837d 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -112,13 +112,6 @@
             <version>${project.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.brooklyn</groupId>
-            <artifactId>brooklyn-client-cli</artifactId>
-            <classifier>bin</classifier>
-            <type>zip</type>
-            <version>${project.version}</version>
-        </dependency>
 
         <!-- bring in all jclouds-supported cloud providers -->
         <dependency>

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/fb30a9cb/dist/pom.xml
----------------------------------------------------------------------
diff --git a/dist/pom.xml b/dist/pom.xml
index 0d01390..a8ab469 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -89,6 +89,25 @@
                             </artifactItems>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>unpack-client-cli</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>brooklyn-client-cli</artifactId>
+                                    <classifier>bin</classifier>
+                                    <type>zip</type>
+                                    <version>${project.version}</version>
+                                    <outputDirectory>${project.build.directory}/brooklyn-client-cli</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
             <plugin>

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/fb30a9cb/dist/src/main/config/build-distribution.xml
----------------------------------------------------------------------
diff --git a/dist/src/main/config/build-distribution.xml b/dist/src/main/config/build-distribution.xml
index f543292..9e3dfd0 100644
--- a/dist/src/main/config/build-distribution.xml
+++ b/dist/src/main/config/build-distribution.xml
@@ -80,6 +80,10 @@
                 <exclude>bin/*</exclude>
             </excludes>
         </fileSet>
+        <fileSet>
+            <directory>${project.build.directory}/brooklyn-client-cli</directory>
+            <outputDirectory>bin</outputDirectory>
+        </fileSet>
     </fileSets>
     <!-- TODO include documentation -->
     <!-- TODO include examples -->