You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sv...@apache.org on 2016/12/04 16:40:08 UTC
brooklyn-dist git commit: Change version to 0.11.0-SNAPSHOT
Repository: brooklyn-dist
Updated Branches:
refs/heads/master 46a43ac75 -> 8aea0d9c1
Change version to 0.11.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/8aea0d9c
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/8aea0d9c
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/8aea0d9c
Branch: refs/heads/master
Commit: 8aea0d9c13909f4a7e68f2899c784251b950b27f
Parents: 46a43ac
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Sun Dec 4 16:32:08 2016 +0000
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Sun Dec 4 16:32:08 2016 +0000
----------------------------------------------------------------------
all/pom.xml | 2 +-
archetypes/quickstart/NOTES.txt | 2 +-
archetypes/quickstart/pom.xml | 2 +-
archetypes/quickstart/src/brooklyn-sample/pom.xml | 2 +-
deb-packaging/pom.xml | 2 +-
dist/pom.xml | 2 +-
downstream-parent/pom.xml | 2 +-
karaf/apache-brooklyn/pom.xml | 2 +-
.../src/main/resources/etc/default.catalog.bom | 2 +-
karaf/features/pom.xml | 2 +-
karaf/itest/pom.xml | 2 +-
karaf/pom.xml | 2 +-
pom.xml | 2 +-
rpm-packaging/pom.xml | 2 +-
shared-packaging/pom.xml | 2 +-
shared-packaging/src/test/yaml/package-apps.yaml | 8 ++++----
shared-packaging/src/test/yaml/package.bom | 2 +-
vagrant/pom.xml | 2 +-
vagrant/src/main/vagrant/README.md | 4 ++--
vagrant/src/main/vagrant/files/vagrant-catalog.bom | 10 +++++-----
vagrant/src/main/vagrant/servers.yaml | 2 +-
21 files changed, 29 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/8aea0d9c/all/pom.xml
----------------------------------------------------------------------
diff --git a/all/pom.xml b/all/pom.xml
index 92b14d7..848f689 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-dist-root</artifactId>
- <version>0.10.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/8aea0d9c/archetypes/quickstart/NOTES.txt
----------------------------------------------------------------------
diff --git a/archetypes/quickstart/NOTES.txt b/archetypes/quickstart/NOTES.txt
index 828e8d3..14002ee 100644
--- a/archetypes/quickstart/NOTES.txt
+++ b/archetypes/quickstart/NOTES.txt
@@ -32,7 +32,7 @@ To test a build:
pushd /tmp
rm -rf brooklyn-sample
- export BV=0.10.0-SNAPSHOT # BROOKLYN_VERSION
+ export BV=0.11.0-SNAPSHOT # BROOKLYN_VERSION
mvn archetype:generate \
\
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/8aea0d9c/archetypes/quickstart/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/quickstart/pom.xml b/archetypes/quickstart/pom.xml
index 9b71889..0ee0338 100644
--- a/archetypes/quickstart/pom.xml
+++ b/archetypes/quickstart/pom.xml
@@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>0.10.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../../brooklyn-server/parent/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/8aea0d9c/archetypes/quickstart/src/brooklyn-sample/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/quickstart/src/brooklyn-sample/pom.xml b/archetypes/quickstart/src/brooklyn-sample/pom.xml
index d4c3929..46fc6e3 100644
--- a/archetypes/quickstart/src/brooklyn-sample/pom.xml
+++ b/archetypes/quickstart/src/brooklyn-sample/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-downstream-parent</artifactId>
- <version>0.10.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
</parent>
<groupId>com.acme.sample</groupId>
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/8aea0d9c/deb-packaging/pom.xml
----------------------------------------------------------------------
diff --git a/deb-packaging/pom.xml b/deb-packaging/pom.xml
index c96a8fd..cb33151 100644
--- a/deb-packaging/pom.xml
+++ b/deb-packaging/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-dist-root</artifactId>
- <version>0.10.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/8aea0d9c/dist/pom.xml
----------------------------------------------------------------------
diff --git a/dist/pom.xml b/dist/pom.xml
index 057f8c2..7554b3d 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -32,7 +32,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-dist-root</artifactId>
- <version>0.10.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/8aea0d9c/downstream-parent/pom.xml
----------------------------------------------------------------------
diff --git a/downstream-parent/pom.xml b/downstream-parent/pom.xml
index b6279d7..56198e5 100644
--- a/downstream-parent/pom.xml
+++ b/downstream-parent/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-server</artifactId>
- <version>0.10.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../brooklyn-server/pom.xml</relativePath>
<!-- TODO this uses server root pom as a way to get version info without rat check;
it means it inherits apache pom, which might not be desired.
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/8aea0d9c/karaf/apache-brooklyn/pom.xml
----------------------------------------------------------------------
diff --git a/karaf/apache-brooklyn/pom.xml b/karaf/apache-brooklyn/pom.xml
index 455d565..7f1f1d8 100755
--- a/karaf/apache-brooklyn/pom.xml
+++ b/karaf/apache-brooklyn/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-dist-karaf</artifactId>
- <version>0.10.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/8aea0d9c/karaf/apache-brooklyn/src/main/resources/etc/default.catalog.bom
----------------------------------------------------------------------
diff --git a/karaf/apache-brooklyn/src/main/resources/etc/default.catalog.bom b/karaf/apache-brooklyn/src/main/resources/etc/default.catalog.bom
index 54424fe..fa67180 100644
--- a/karaf/apache-brooklyn/src/main/resources/etc/default.catalog.bom
+++ b/karaf/apache-brooklyn/src/main/resources/etc/default.catalog.bom
@@ -3,7 +3,7 @@
# and templates to get started using Brooklyn
brooklyn.catalog:
- version: "0.10.0-SNAPSHOT" # BROOKLYN_VERSION
+ version: "0.11.0-SNAPSHOT" # BROOKLYN_VERSION
include: classpath://library-catalog-classes.bom
items:
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/8aea0d9c/karaf/features/pom.xml
----------------------------------------------------------------------
diff --git a/karaf/features/pom.xml b/karaf/features/pom.xml
index 20be680..c085c6f 100644
--- a/karaf/features/pom.xml
+++ b/karaf/features/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-dist-karaf</artifactId>
- <version>0.10.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/8aea0d9c/karaf/itest/pom.xml
----------------------------------------------------------------------
diff --git a/karaf/itest/pom.xml b/karaf/itest/pom.xml
index e9a991c..4b4cd66 100644
--- a/karaf/itest/pom.xml
+++ b/karaf/itest/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-dist-karaf</artifactId>
- <version>0.10.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/8aea0d9c/karaf/pom.xml
----------------------------------------------------------------------
diff --git a/karaf/pom.xml b/karaf/pom.xml
index 80e0acc..3f62861 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -33,7 +33,7 @@
<!-- if this depends (via inheritance from brooklyn-dist) on brooklyn-server/parent, the usual parent point,
then karaf-itest has failures -->
<artifactId>brooklyn-server</artifactId>
- <version>0.10.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../brooklyn-server/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/8aea0d9c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 61a51e9..c729e78 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>0.10.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../brooklyn-server/parent/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/8aea0d9c/rpm-packaging/pom.xml
----------------------------------------------------------------------
diff --git a/rpm-packaging/pom.xml b/rpm-packaging/pom.xml
index eba5163..df1a1a0 100644
--- a/rpm-packaging/pom.xml
+++ b/rpm-packaging/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-dist-root</artifactId>
- <version>0.10.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/8aea0d9c/shared-packaging/pom.xml
----------------------------------------------------------------------
diff --git a/shared-packaging/pom.xml b/shared-packaging/pom.xml
index 8e00f6e..82a575f 100644
--- a/shared-packaging/pom.xml
+++ b/shared-packaging/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-dist-root</artifactId>
- <version>0.10.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/8aea0d9c/shared-packaging/src/test/yaml/package-apps.yaml
----------------------------------------------------------------------
diff --git a/shared-packaging/src/test/yaml/package-apps.yaml b/shared-packaging/src/test/yaml/package-apps.yaml
index cf09f1b..1866e40 100644
--- a/shared-packaging/src/test/yaml/package-apps.yaml
+++ b/shared-packaging/src/test/yaml/package-apps.yaml
@@ -25,7 +25,7 @@ services:
# privateKeyFile: ~/.ssh/<private key>
user: vagrant
brooklyn.config:
- package.file: ~/.m2/repository/org/apache/brooklyn/deb-packaging/0.10.0-SNAPSHOT/deb-packaging-0.10.0-SNAPSHOT.deb # BROOKLYN_VERSION
+ package.file: ~/.m2/repository/org/apache/brooklyn/deb-packaging/0.11.0-SNAPSHOT/deb-packaging-0.11.0-SNAPSHOT.deb # BROOKLYN_VERSION
---
@@ -38,7 +38,7 @@ services:
# privateKeyFile: ~/.ssh/<private key>
user: vagrant
brooklyn.config:
- package.file: ~/.m2/repository/org/apache/brooklyn/deb-packaging/0.10.0-SNAPSHOT/deb-packaging-0.10.0-SNAPSHOT.deb # BROOKLYN_VERSION
+ package.file: ~/.m2/repository/org/apache/brooklyn/deb-packaging/0.11.0-SNAPSHOT/deb-packaging-0.11.0-SNAPSHOT.deb # BROOKLYN_VERSION
---
@@ -51,7 +51,7 @@ services:
# privateKeyFile: ~/.ssh/<private key>
user: vagrant
brooklyn.config:
- package.file: ~/.m2/repository/org/apache/brooklyn/rpm-packaging/0.10.0-SNAPSHOT/rpm-packaging-0.10.0-SNAPSHOT.rpm # BROOKLYN_VERSION
+ package.file: ~/.m2/repository/org/apache/brooklyn/rpm-packaging/0.11.0-SNAPSHOT/rpm-packaging-0.11.0-SNAPSHOT.rpm # BROOKLYN_VERSION
---
@@ -64,6 +64,6 @@ services:
# privateKeyFile: ~/.ssh/<private key>
user: vagrant
brooklyn.config:
- package.file: ~/.m2/repository/org/apache/brooklyn/rpm-packaging/0.10.0-SNAPSHOT/rpm-packaging-0.10.0-SNAPSHOT.rpm # BROOKLYN_VERSION
+ package.file: ~/.m2/repository/org/apache/brooklyn/rpm-packaging/0.11.0-SNAPSHOT/rpm-packaging-0.11.0-SNAPSHOT.rpm # BROOKLYN_VERSION
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/8aea0d9c/shared-packaging/src/test/yaml/package.bom
----------------------------------------------------------------------
diff --git a/shared-packaging/src/test/yaml/package.bom b/shared-packaging/src/test/yaml/package.bom
index f4370d8..26d19f0 100644
--- a/shared-packaging/src/test/yaml/package.bom
+++ b/shared-packaging/src/test/yaml/package.bom
@@ -17,7 +17,7 @@
# under the License.
#
brooklyn.catalog:
- version: "0.10.0-SNAPSHOT" # BROOKLYN_VERSION
+ version: "0.11.0-SNAPSHOT" # BROOKLYN_VERSION
items:
- id: systemd-brooklyn
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/8aea0d9c/vagrant/pom.xml
----------------------------------------------------------------------
diff --git a/vagrant/pom.xml b/vagrant/pom.xml
index f0b3f20..4ab81a1 100644
--- a/vagrant/pom.xml
+++ b/vagrant/pom.xml
@@ -32,7 +32,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-dist-root</artifactId>
- <version>0.10.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/8aea0d9c/vagrant/src/main/vagrant/README.md
----------------------------------------------------------------------
diff --git a/vagrant/src/main/vagrant/README.md b/vagrant/src/main/vagrant/README.md
index b741cec..af2d6c4 100644
--- a/vagrant/src/main/vagrant/README.md
+++ b/vagrant/src/main/vagrant/README.md
@@ -8,7 +8,7 @@
```
env:
- BROOKLYN_VERSION: 0.10.0-SNAPSHOT
+ BROOKLYN_VERSION: 0.11.0-SNAPSHOT
```
2. You may proceed to use the `Vagrantfile` as normal; `vagrant up`, `vagrant destroy` etc.
@@ -19,7 +19,7 @@
```
env:
- BROOKLYN_VERSION: 0.10.0-SNAPSHOT
+ BROOKLYN_VERSION: 0.11.0-SNAPSHOT
```
2. Set the `INSTALL_FROM_LOCAL_DIST:` environment variable in `servers.yaml` to `true`. For example:
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/8aea0d9c/vagrant/src/main/vagrant/files/vagrant-catalog.bom
----------------------------------------------------------------------
diff --git a/vagrant/src/main/vagrant/files/vagrant-catalog.bom b/vagrant/src/main/vagrant/files/vagrant-catalog.bom
index 2459bdb..5d4da4d 100644
--- a/vagrant/src/main/vagrant/files/vagrant-catalog.bom
+++ b/vagrant/src/main/vagrant/files/vagrant-catalog.bom
@@ -19,7 +19,7 @@
brooklyn.catalog:
items:
- id: byon1
- version: "0.10.0-SNAPSHOT" # BROOKLYN_VERSION
+ version: "0.11.0-SNAPSHOT" # BROOKLYN_VERSION
itemType: location
name: Vagrant BYON VM 1
item:
@@ -32,7 +32,7 @@ brooklyn.catalog:
- id: byon2
name: Vagrant BYON VM 2
- version: "0.10.0-SNAPSHOT" # BROOKLYN_VERSION
+ version: "0.11.0-SNAPSHOT" # BROOKLYN_VERSION
itemType: location
item:
type: byon
@@ -43,7 +43,7 @@ brooklyn.catalog:
- 10.10.10.102
- id: byon3
- version: "0.10.0-SNAPSHOT" # BROOKLYN_VERSION
+ version: "0.11.0-SNAPSHOT" # BROOKLYN_VERSION
itemType: location
name: Vagrant BYON VM 3
item:
@@ -55,7 +55,7 @@ brooklyn.catalog:
- 10.10.10.103
- id: byon4
- version: "0.10.0-SNAPSHOT" # BROOKLYN_VERSION
+ version: "0.11.0-SNAPSHOT" # BROOKLYN_VERSION
itemType: location
name: Vagrant BYON VM 4
item:
@@ -67,7 +67,7 @@ brooklyn.catalog:
- 10.10.10.104
- id: byon-all
- version: "0.10.0-SNAPSHOT" # BROOKLYN_VERSION
+ version: "0.11.0-SNAPSHOT" # BROOKLYN_VERSION
itemType: location
name: Vagrant BYON VM 1-4
item:
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/8aea0d9c/vagrant/src/main/vagrant/servers.yaml
----------------------------------------------------------------------
diff --git a/vagrant/src/main/vagrant/servers.yaml b/vagrant/src/main/vagrant/servers.yaml
index 3c0056b..e0e3dc7 100644
--- a/vagrant/src/main/vagrant/servers.yaml
+++ b/vagrant/src/main/vagrant/servers.yaml
@@ -47,7 +47,7 @@ servers:
autocorrect: true
shell:
env:
- BROOKLYN_VERSION: "0.10.0-SNAPSHOT"
+ BROOKLYN_VERSION: "0.11.0-SNAPSHOT"
INSTALL_FROM_LOCAL_DIST: false
cmd:
- ssh-keygen -t rsa -N "" -f $HOME/.ssh/id_rsa