[brooklyn] 01/03: Merge branch 'build-number-instruction'

[he...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn.git

commit 2bfd3c01e38bd16313ca9c3dcc44b9140296e10b
Merge: 7eec5c7 103f445
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Thu Jan 31 12:08:26 2019 +0000

    Merge branch 'build-number-instruction'

 README.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --cc README.md
index b689222,2635b62..de29827
--- a/README.md
+++ b/README.md
@@@ -51,12 -38,22 +51,24 @@@ docker run -i --rm --name brooklyn -u $
  The results are in `brooklyn-dist/dist/target/`, including a tar and a zip.
  Or to run straight after the build, do:
  
 -    pushd brooklyn-dist/dist/target/brooklyn-dist/brooklyn/
 -    bin/brooklyn launch
 +```bash
 +pushd brooklyn-dist/karaf/apache-brooklyn/target/assembly/
 +./bin/start
 +```
  
  
+ ### Non-Git Build
+ 
+ If you are performing a build on code not in source control (e.g. from a ZIP of source code, or after deleting SCM metadata),
+ you will need to manually set two variables that are normally inferred from the environment:
+ 
+     * `-DbuildNumber=manual`
+     * `-DscmBranch=manual`
+ 
+ You can set these properties to any value you wish. When using a checkout from git, the `buildNumber` is set to the SHA1 commit ID (short form)
+ of the containing project, and the `scmBranch` is set to the git branch.
+ 
+ 
  ### Resources
  
  <!--- BROOKLYN_VERSION_BELOW -->