This is an automated email from the ASF dual-hosted git repository.
aledsage pushed a commit to branch 1.0.0
in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git
commit b6811a215d1b4c4e05709b876c25c56b29ba267d
Author: Aled Sage <aled.s...@gmail.com>
AuthorDate: Fri Jan 17 15:46:13 2020 +0000
Change version to 1.0.0
---
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 +-
dist/src/main/dist/conf/brooklyn/default.catalog.bom | 2 +-
docker-image/pom.xml | 2 +-
docker/Makefile | 2 +-
docker/brooklyn-docker-start | 2 +-
downstream-parent/pom.xml | 2 +-
karaf/apache-brooklyn/pom.xml | 2 +-
.../apache-brooklyn/src/main/resources/etc/default.catalog.bom | 2 +-
karaf/config/pom.xml | 2 +-
karaf/config/src/main/resources/catalog/catalog-core.bom | 6 +++---
karaf/config/src/main/resources/catalog/catalog-templates.bom | 2 +-
karaf/config/src/main/resources/catalog/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/install_brooklyn.sh | 2 +-
vagrant/src/main/vagrant/files/vagrant-catalog.bom | 10 +++++-----
vagrant/src/main/vagrant/servers.yaml | 2 +-
30 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/all/pom.xml b/all/pom.xml
index 7c7c790..1c7a8e9 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>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.0.0</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/archetypes/quickstart/NOTES.txt b/archetypes/quickstart/NOTES.txt
index 9b609d1..a2448bd 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=1.0.0-SNAPSHOT # BROOKLYN_VERSION
+ export BV=1.0.0 # BROOKLYN_VERSION
mvn archetype:generate \
\
diff --git a/archetypes/quickstart/pom.xml b/archetypes/quickstart/pom.xml
index 221d9c6..cc044e9 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>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.0.0</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../../brooklyn-server/parent/pom.xml</relativePath>
</parent>
diff --git a/archetypes/quickstart/src/brooklyn-sample/pom.xml
b/archetypes/quickstart/src/brooklyn-sample/pom.xml
index 5b48002..4eb3ca1 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>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.0.0</version> <!-- BROOKLYN_VERSION -->
</parent>
<groupId>com.acme.sample</groupId>
diff --git a/deb-packaging/pom.xml b/deb-packaging/pom.xml
index 8e3ed4d..1ee406a 100644
--- a/deb-packaging/pom.xml
+++ b/deb-packaging/pom.xml
@@ -37,7 +37,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-dist-root</artifactId>
- <version>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.0.0</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/dist/pom.xml b/dist/pom.xml
index 3d0fc5e..a189311 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>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.0.0</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/dist/src/main/dist/conf/brooklyn/default.catalog.bom
b/dist/src/main/dist/conf/brooklyn/default.catalog.bom
index 282ad39..d20d1ae 100644
--- a/dist/src/main/dist/conf/brooklyn/default.catalog.bom
+++ b/dist/src/main/dist/conf/brooklyn/default.catalog.bom
@@ -3,7 +3,7 @@
brooklyn.catalog:
bundle: brooklyn-default-catalog
- version: "1.0.0-SNAPSHOT" # BROOKLYN_VERSION
+ version: "1.0.0" # BROOKLYN_VERSION
# load everything in the classpath with a @Catalog annotation
scanJavaAnnotations: true
diff --git a/docker-image/pom.xml b/docker-image/pom.xml
index b871ee5..5242ef5 100755
--- a/docker-image/pom.xml
+++ b/docker-image/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-dist-root</artifactId>
- <version>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.0.0</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/docker/Makefile b/docker/Makefile
index b54c7be..3dd4bfa 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -17,7 +17,7 @@
# under the License.
#
-BROOKLYN_VERSION=1.0.0-SNAPSHOT
+BROOKLYN_VERSION=1.0.0
default: all
diff --git a/docker/brooklyn-docker-start b/docker/brooklyn-docker-start
index d2a5841..961591e 100755
--- a/docker/brooklyn-docker-start
+++ b/docker/brooklyn-docker-start
@@ -33,7 +33,7 @@
function help() {
echo
# BROOKLYN_VERSION_BELOW
- echo 'Apache Brooklyn 1.0.0-SNAPSHOT convenience launcher'${application:+"
for ${application}"}
+ echo 'Apache Brooklyn 1.0.0 convenience launcher'${application:+" for
${application}"}
echo
echo 'Usage: [OPTIONS] [--help | LOCATION | COMMAND] [ARGS]'
echo
diff --git a/downstream-parent/pom.xml b/downstream-parent/pom.xml
index 40765bf..f0e4178 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>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.0.0</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.
diff --git a/karaf/apache-brooklyn/pom.xml b/karaf/apache-brooklyn/pom.xml
index 4ec1bdd..79c70d8 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>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.0.0</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>
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 70625a3..1a0f5e6 100644
--- a/karaf/apache-brooklyn/src/main/resources/etc/default.catalog.bom
+++ b/karaf/apache-brooklyn/src/main/resources/etc/default.catalog.bom
@@ -4,6 +4,6 @@
brooklyn.catalog:
bundle: brooklyn-default-karaf-catalog
- version: "1.0.0-SNAPSHOT" # BROOKLYN_VERSION
+ version: "1.0.0" # BROOKLYN_VERSION
items:
- file:catalog/catalog.bom
diff --git a/karaf/config/pom.xml b/karaf/config/pom.xml
index 3decf96..b23b173 100644
--- a/karaf/config/pom.xml
+++ b/karaf/config/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>brooklyn-dist-karaf</artifactId>
<groupId>org.apache.brooklyn</groupId>
- <version>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.0.0</version> <!-- BROOKLYN_VERSION -->
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/karaf/config/src/main/resources/catalog/catalog-core.bom
b/karaf/config/src/main/resources/catalog/catalog-core.bom
index af45d6c..12fab60 100644
--- a/karaf/config/src/main/resources/catalog/catalog-core.bom
+++ b/karaf/config/src/main/resources/catalog/catalog-core.bom
@@ -16,8 +16,8 @@
# under the License.
#
brooklyn.catalog:
- version: "1.0.0-SNAPSHOT" # BROOKLYN_VERSION
+ version: "1.0.0" # BROOKLYN_VERSION
brooklyn.libraries:
- - mvn:org.apache.brooklyn/brooklyn-karaf-init/1.0.0-SNAPSHOT #
BROOKLYN_VERSION
- - mvn:org.apache.brooklyn/brooklyn-library-catalog/1.0.0-SNAPSHOT #
BROOKLYN_VERSION
\ No newline at end of file
+ - mvn:org.apache.brooklyn/brooklyn-karaf-init/1.0.0 # BROOKLYN_VERSION
+ - mvn:org.apache.brooklyn/brooklyn-library-catalog/1.0.0 # BROOKLYN_VERSION
diff --git a/karaf/config/src/main/resources/catalog/catalog-templates.bom
b/karaf/config/src/main/resources/catalog/catalog-templates.bom
index eeac7d6..8bddcd9 100644
--- a/karaf/config/src/main/resources/catalog/catalog-templates.bom
+++ b/karaf/config/src/main/resources/catalog/catalog-templates.bom
@@ -16,7 +16,7 @@
# under the License.
#
brooklyn.catalog:
- version: "1.0.0-SNAPSHOT" # BROOKLYN_VERSION
+ version: "1.0.0" # BROOKLYN_VERSION
items:
- id: 1-server-template
diff --git a/karaf/config/src/main/resources/catalog/catalog.bom
b/karaf/config/src/main/resources/catalog/catalog.bom
index 64cfabd..3f2a5d2 100644
--- a/karaf/config/src/main/resources/catalog/catalog.bom
+++ b/karaf/config/src/main/resources/catalog/catalog.bom
@@ -16,7 +16,7 @@
# under the License.
#
brooklyn.catalog:
- version: "1.0.0-SNAPSHOT" # BROOKLYN_VERSION
+ version: "1.0.0" # BROOKLYN_VERSION
items:
- 'file:catalog/catalog-core.bom'
diff --git a/karaf/features/pom.xml b/karaf/features/pom.xml
index cda26c1..e420d78 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>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.0.0</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/karaf/itest/pom.xml b/karaf/itest/pom.xml
index 18ff28b..3e41e65 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>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.0.0</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/karaf/pom.xml b/karaf/pom.xml
index 19d3c4e..057906d 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>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.0.0</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../brooklyn-server/pom.xml</relativePath>
</parent>
diff --git a/pom.xml b/pom.xml
index e5c3db9..dd63001 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.0.0</version> <!-- BROOKLYN_VERSION -->
<relativePath>../brooklyn-server/parent/pom.xml</relativePath>
</parent>
diff --git a/rpm-packaging/pom.xml b/rpm-packaging/pom.xml
index 33ab131..94e4c15 100644
--- a/rpm-packaging/pom.xml
+++ b/rpm-packaging/pom.xml
@@ -37,7 +37,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-dist-root</artifactId>
- <version>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.0.0</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/shared-packaging/pom.xml b/shared-packaging/pom.xml
index 25c6376..0aafce0 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>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.0.0</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/shared-packaging/src/test/yaml/package-apps.yaml
b/shared-packaging/src/test/yaml/package-apps.yaml
index 76518de..7c17b7d 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: ubuntu
brooklyn.config:
- package.file:
~/.m2/repository/org/apache/brooklyn/deb-packaging/1.0.0-SNAPSHOT/deb-packaging-1.0.0-SNAPSHOT-all.deb
# BROOKLYN_VERSION
+ package.file:
~/.m2/repository/org/apache/brooklyn/deb-packaging/1.0.0/deb-packaging-1.0.0-all.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/1.0.0-SNAPSHOT/deb-packaging-1.0.0-SNAPSHOT-all.deb
# BROOKLYN_VERSION
+ package.file:
~/.m2/repository/org/apache/brooklyn/deb-packaging/1.0.0/deb-packaging-1.0.0-all.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/1.0.0-SNAPSHOT/rpm-packaging-1.0.0-SNAPSHOT-noarch.rpm
# BROOKLYN_VERSION
+ package.file:
~/.m2/repository/org/apache/brooklyn/rpm-packaging/1.0.0/rpm-packaging-1.0.0-noarch.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/1.0.0-SNAPSHOT/rpm-packaging-1.0.0-SNAPSHOT-noarch.rpm
# BROOKLYN_VERSION
+ package.file:
~/.m2/repository/org/apache/brooklyn/rpm-packaging/1.0.0/rpm-packaging-1.0.0-noarch.rpm
# BROOKLYN_VERSION
diff --git a/shared-packaging/src/test/yaml/package.bom
b/shared-packaging/src/test/yaml/package.bom
index 0e5900b..b7dbdea 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: "1.0.0-SNAPSHOT" # BROOKLYN_VERSION
+ version: "1.0.0" # BROOKLYN_VERSION
items:
- id: systemd-brooklyn
diff --git a/vagrant/pom.xml b/vagrant/pom.xml
index faa6a9c..5629ede 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>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.0.0</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/vagrant/src/main/vagrant/README.md
b/vagrant/src/main/vagrant/README.md
index 6f77f38..9fb813a 100644
--- a/vagrant/src/main/vagrant/README.md
+++ b/vagrant/src/main/vagrant/README.md
@@ -8,7 +8,7 @@
```
env:
- BROOKLYN_VERSION: 1.0.0-SNAPSHOT
+ BROOKLYN_VERSION: 1.0.0
```
2. You may proceed to use the `Vagrantfile` as normal; `vagrant up`, `vagrant
destroy` etc.
@@ -19,7 +19,7 @@
```
env:
- BROOKLYN_VERSION: 1.0.0-SNAPSHOT
+ BROOKLYN_VERSION: 1.0.0
```
2. Set the `INSTALL_FROM_LOCAL_DIST:` environment variable in `servers.yaml`
to `true`. For example:
diff --git a/vagrant/src/main/vagrant/files/install_brooklyn.sh
b/vagrant/src/main/vagrant/files/install_brooklyn.sh
index eb88d66..e91c17c 100755
--- a/vagrant/src/main/vagrant/files/install_brooklyn.sh
+++ b/vagrant/src/main/vagrant/files/install_brooklyn.sh
@@ -97,4 +97,4 @@ while ! (sudo grep "BundleEvent STARTED -
org.apache.brooklyn.karaf-init" /var/l
echo ".... waiting for Apache Brooklyn to start at `date`"
done
-echo "Apache Brooklyn started!"
\ No newline at end of file
+echo "Apache Brooklyn started!"
diff --git a/vagrant/src/main/vagrant/files/vagrant-catalog.bom
b/vagrant/src/main/vagrant/files/vagrant-catalog.bom
index d8bcbee..3799fd2 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: "1.0.0-SNAPSHOT" # BROOKLYN_VERSION
+ version: "1.0.0" # BROOKLYN_VERSION
itemType: location
name: Vagrant BYON VM 1
item:
@@ -32,7 +32,7 @@ brooklyn.catalog:
- id: byon2
name: Vagrant BYON VM 2
- version: "1.0.0-SNAPSHOT" # BROOKLYN_VERSION
+ version: "1.0.0" # BROOKLYN_VERSION
itemType: location
item:
type: byon
@@ -43,7 +43,7 @@ brooklyn.catalog:
- 10.10.10.102
- id: byon3
- version: "1.0.0-SNAPSHOT" # BROOKLYN_VERSION
+ version: "1.0.0" # BROOKLYN_VERSION
itemType: location
name: Vagrant BYON VM 3
item:
@@ -55,7 +55,7 @@ brooklyn.catalog:
- 10.10.10.103
- id: byon4
- version: "1.0.0-SNAPSHOT" # BROOKLYN_VERSION
+ version: "1.0.0" # BROOKLYN_VERSION
itemType: location
name: Vagrant BYON VM 4
item:
@@ -67,7 +67,7 @@ brooklyn.catalog:
- 10.10.10.104
- id: byon-all
- version: "1.0.0-SNAPSHOT" # BROOKLYN_VERSION
+ version: "1.0.0" # BROOKLYN_VERSION
itemType: location
name: Vagrant BYON VM 1-4
item:
diff --git a/vagrant/src/main/vagrant/servers.yaml
b/vagrant/src/main/vagrant/servers.yaml
index 68cfa59..0eff3b9 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: "1.0.0-SNAPSHOT" # BROOKLYN_VERSION
+ BROOKLYN_VERSION: "1.0.0" # BROOKLYN_VERSION
INSTALL_FROM_LOCAL_DIST: false
cmd:
- ssh-keygen -t rsa -N "" -f $HOME/.ssh/id_rsa
