Skip to content
Permalink
Browse files
Set version to 1.1.0-SNAPSHOT
  • Loading branch information
rdowner committed Mar 2, 2020
1 parent 35580c0 commit be19e98376d62d89187095ccf1178fa958816dfb
Showing 29 changed files with 39 additions and 39 deletions.
@@ -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.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>

@@ -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.1.0-SNAPSHOT # BROOKLYN_VERSION

mvn archetype:generate \
\
@@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
<version>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<version>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../../brooklyn-server/parent/pom.xml</relativePath>
</parent>

@@ -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.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
</parent>

<groupId>com.acme.sample</groupId>
@@ -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.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>

@@ -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.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>

@@ -3,7 +3,7 @@

brooklyn.catalog:
bundle: brooklyn-default-catalog
version: "1.0.0-SNAPSHOT" # BROOKLYN_VERSION
version: "1.1.0-SNAPSHOT" # BROOKLYN_VERSION

# load everything in the classpath with a @Catalog annotation
scanJavaAnnotations: true
@@ -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.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>

@@ -17,7 +17,7 @@
# under the License.
#

BROOKLYN_VERSION=1.0.0-SNAPSHOT
BROOKLYN_VERSION=1.1.0-SNAPSHOT

default: all

@@ -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.1.0-SNAPSHOT convenience launcher'${application:+" for ${application}"}
echo
echo 'Usage: [OPTIONS] [--help | LOCATION | COMMAND] [ARGS]'
echo
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-server</artifactId>
<version>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<version>1.1.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.
@@ -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.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>

@@ -4,6 +4,6 @@

brooklyn.catalog:
bundle: brooklyn-default-karaf-catalog
version: "1.0.0-SNAPSHOT" # BROOKLYN_VERSION
version: "1.1.0-SNAPSHOT" # BROOKLYN_VERSION
items:
- file:catalog/catalog.bom
@@ -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.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
</parent>
<modelVersion>4.0.0</modelVersion>

@@ -16,8 +16,8 @@
# under the License.
#
brooklyn.catalog:
version: "1.0.0-SNAPSHOT" # BROOKLYN_VERSION
version: "1.1.0-SNAPSHOT" # 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
- mvn:org.apache.brooklyn/brooklyn-karaf-init/1.1.0-SNAPSHOT # BROOKLYN_VERSION
- mvn:org.apache.brooklyn/brooklyn-library-catalog/1.1.0-SNAPSHOT # BROOKLYN_VERSION
@@ -16,7 +16,7 @@
# under the License.
#
brooklyn.catalog:
version: "1.0.0-SNAPSHOT" # BROOKLYN_VERSION
version: "1.1.0-SNAPSHOT" # BROOKLYN_VERSION

items:
- id: 1-server-template
@@ -16,7 +16,7 @@
# under the License.
#
brooklyn.catalog:
version: "1.0.0-SNAPSHOT" # BROOKLYN_VERSION
version: "1.1.0-SNAPSHOT" # BROOKLYN_VERSION

items:
- 'file:catalog/catalog-core.bom'
@@ -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.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>

@@ -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.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>

@@ -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.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../brooklyn-server/pom.xml</relativePath>
</parent>

@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
<version>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<version>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../brooklyn-server/parent/pom.xml</relativePath>
</parent>

@@ -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.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>

@@ -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.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>

@@ -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.1.0-SNAPSHOT/deb-packaging-1.1.0-SNAPSHOT-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.1.0-SNAPSHOT/deb-packaging-1.1.0-SNAPSHOT-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.1.0-SNAPSHOT/rpm-packaging-1.1.0-SNAPSHOT-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.1.0-SNAPSHOT/rpm-packaging-1.1.0-SNAPSHOT-noarch.rpm # BROOKLYN_VERSION


@@ -17,7 +17,7 @@
# under the License.
#
brooklyn.catalog:
version: "1.0.0-SNAPSHOT" # BROOKLYN_VERSION
version: "1.1.0-SNAPSHOT" # BROOKLYN_VERSION
items:

- id: systemd-brooklyn
@@ -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.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>

@@ -8,7 +8,7 @@

```
env:
BROOKLYN_VERSION: 1.0.0-SNAPSHOT
BROOKLYN_VERSION: 1.1.0-SNAPSHOT
```

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.1.0-SNAPSHOT
```

2. Set the `INSTALL_FROM_LOCAL_DIST:` environment variable in `servers.yaml` to `true`. For example:
@@ -19,7 +19,7 @@
brooklyn.catalog:
items:
- id: byon1
version: "1.0.0-SNAPSHOT" # BROOKLYN_VERSION
version: "1.1.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: "1.0.0-SNAPSHOT" # BROOKLYN_VERSION
version: "1.1.0-SNAPSHOT" # 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.1.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: "1.0.0-SNAPSHOT" # BROOKLYN_VERSION
version: "1.1.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: "1.0.0-SNAPSHOT" # BROOKLYN_VERSION
version: "1.1.0-SNAPSHOT" # BROOKLYN_VERSION
itemType: location
name: Vagrant BYON VM 1-4
item:
@@ -47,7 +47,7 @@ servers:
autocorrect: true
shell:
env:
BROOKLYN_VERSION: "1.0.0-SNAPSHOT" # BROOKLYN_VERSION
BROOKLYN_VERSION: "1.1.0-SNAPSHOT" # BROOKLYN_VERSION
INSTALL_FROM_LOCAL_DIST: false
cmd:
- ssh-keygen -t rsa -N "" -f $HOME/.ssh/id_rsa

0 comments on commit be19e98

Please sign in to comment.