You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2016/03/10 13:53:16 UTC
[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 <ge...@cloudsoftcorp.com>
Authored: Tue Feb 23 14:57:42 2016 +0000
Committer: Geoff Macartney <ge...@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 -->