diff --git a/README.md b/README.md index 4677370e..053f9613 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Docker Cloud infrastructure. This repository contains all of the required Brooklyn entities, locations and examples. -[![Build Status](https://api.travis-ci.org/brooklyncentral/clocker.svg?branch=master)](https://travis-ci.org/brooklyncentral/clocker) [![Latest Builds](http://img.shields.io/badge/version-1.1.0--SNAPSHOT-blue.svg?style=flat)](http://clocker-latest.s3-website-eu-west-1.amazonaws.com/) [![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/brooklyncentral/clocker) [![Docker Image](https://badge.imagelayers.io/clockercentral/clocker:1.1.0-PREVIEW.20160402.svg)](https://imagelayers.io/?images=clockercentral/clocker:1.1.0-PREVIEW.20160402) +[![Build Status](https://api.travis-ci.org/brooklyncentral/clocker.svg?branch=master)](https://travis-ci.org/brooklyncentral/clocker) [![Latest Builds](http://img.shields.io/badge/version-1.2.0--SNAPSHOT-blue.svg?style=flat)](http://clocker-latest.s3-website-eu-west-1.amazonaws.com/) [![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/brooklyncentral/clocker) [![Docker Image](https://badge.imagelayers.io/clockercentral/clocker:1.1.0.svg)](https://imagelayers.io/?images=clockercentral/clocker:1.1.0) ## Getting started @@ -34,12 +34,12 @@ depending on your choice of SDN provider. ### Using the latest Clocker release -The latest version of Clocker is [1.1.0-PREVIEW.20160402](https://github.com/brooklyncentral/clocker/releases/tag/v1.1.0-PREVIEW.20160402). +The latest version of Clocker is [1.1.0](https://github.com/brooklyncentral/clocker/releases/tag/v1.1.0). You can deploy your own **Docker Cloud** with a Weave SDN by running these commands with the _network_ argument set to `weave`, to use Project Calico as your SDN provider, change the last argument to `calico` instead: ```Bash % wget --no-check-certificate --quiet \ - -O brooklyn-clocker-dist.tar.gz http://git.io/v2rFC + -O brooklyn-clocker-dist.tar.gz http://git.io/vwPri % tar zxf brooklyn-clocker-dist.tar.gz % cd brooklyn-clocker % ./bin/clocker.sh location network @@ -62,7 +62,7 @@ _jclouds:softlayer:sjc01_, a group of machines as _byon:(hosts="10.1.2.3,10.1.2. location from your `brooklyn.properties` file as _named:alias_. For all cloud locations you must first configure the `~/.brooklyn/brooklyn.properties` file with any -necessary credentials and security details, and select an SSH key (defaulting to `~/.ssh/id_rsa`). +necessary credentials and security details, and select an SSH key (defaulting to `~/.ssh/id\_rsa`). A basic `brooklyn.properties` file should look like the following: ```properties @@ -124,7 +124,7 @@ Build and run this version of Clocker from source as follows: % cd clocker % mvn clean install ... -% tar zxf examples/target/brooklyn-clocker-dist.tar.gz +% tar zxf dist/target/brooklyn-clocker-dist.tar.gz % cd brooklyn-clocker % ./bin/clocker.sh location network ... diff --git a/clocker.bom b/clocker.bom index 185fa7dd..96aba714 100644 --- a/clocker.bom +++ b/clocker.bom @@ -13,19 +13,20 @@ # limitations under the License. brooklyn.catalog: - version: "1.1.0-PREVIEW.20160402" # CLOCKER_VERSION + version: "1.1.0" # CLOCKER_VERSION brooklyn.libraries: - - "http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-patches/1.1.0-PREVIEW.20160402/brooklyn-clocker-patches-1.1.0-PREVIEW.20160402.jar" # CLOCKER_VERSION - - "http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-docker/1.1.0-PREVIEW.20160402/brooklyn-clocker-docker-1.1.0-PREVIEW.20160402.jar" # CLOCKER_VERSION - - "http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-dist/1.1.0-PREVIEW.20160402/brooklyn-clocker-dist-1.1.0-PREVIEW.20160402.jar" # CLOCKER_VERSION - - "https://s3-eu-west-1.amazonaws.com/brooklyn-clocker/patch-softlayer-clocker-137.jar" - - "https://oss.sonatype.org/content/repositories/releases/io/brooklyn/networking/brooklyn-networking-portforwarding/0.8.0-incubating/brooklyn-networking-portforwarding-0.8.0-incubating.jar" # ADVANCED_NETWORKING_VERSION - - "https://oss.sonatype.org/content/repositories/releases/io/brooklyn/networking/brooklyn-networking-common/0.8.0-incubating/brooklyn-networking-common-0.8.0-incubating.jar" # ADVANCED_NETWORKING_VERSION - - "https://oss.sonatype.org/content/repositories/releases/io/brooklyn/networking/brooklyn-networking-cloudstack/0.8.0-incubating/brooklyn-networking-cloudstack-0.8.0-incubating.jar" # ADVANCED_NETWORKING_VERSION - - "https://repository.apache.org/service/local/repositories/releases/content/org/apache/jclouds/labs/docker/1.9.1/docker-1.9.1.jar" - - "https://repository.apache.org/service/local/repositories/releases/content/org/apache/jclouds/api/cloudstack/1.9.1/cloudstack-1.9.1.jar" + - "http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-patches/1.1.0/brooklyn-clocker-patches-1.1.0.jar" # CLOCKER_VERSION + - "http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-extras/1.1.0/brooklyn-clocker-extras-1.1.0.jar" # CLOCKER_VERSION + - "http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-docker/1.1.0/brooklyn-clocker-docker-1.1.0.jar" # CLOCKER_VERSION + - "http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-mesos/1.1.0/brooklyn-clocker-mesos-1.1.0.jar" # CLOCKER_VERSION + - "http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-dist/1.1.0/brooklyn-clocker-dist-1.1.0.jar" # CLOCKER_VERSION + - "https://oss.sonatype.org/content/repositories/releases/io/brooklyn/networking/brooklyn-networking-portforwarding/0.9.0/brooklyn-networking-portforwarding-0.9.0.jar" # ADVANCED_NETWORKING_VERSION + - "https://oss.sonatype.org/content/repositories/releases/io/brooklyn/networking/brooklyn-networking-common/0.9.0/brooklyn-networking-common-0.9.0.jar" # ADVANCED_NETWORKING_VERSION + - "https://oss.sonatype.org/content/repositories/releases/io/brooklyn/networking/brooklyn-networking-cloudstack/0.9.0/brooklyn-networking-cloudstack-0.9.0.jar" # ADVANCED_NETWORKING_VERSION + - "https://repository.apache.org/service/local/repositories/releases/content/org/apache/jclouds/labs/docker/1.9.2/docker-1.9.2.jar" # JCLOUDS_VERSION + - "https://repository.apache.org/service/local/repositories/releases/content/org/apache/jclouds/api/cloudstack/1.9.2/cloudstack-1.9.2.jar" # JCLOUDS_VERSION items: diff --git a/console/pom.xml b/console/pom.xml index 122ceee2..1635d855 100644 --- a/console/pom.xml +++ b/console/pom.xml @@ -31,7 +31,7 @@ io.brooklyn.clocker brooklyn-clocker-parent - 1.1.0-PREVIEW.20160402 + 1.1.0 ../pom.xml diff --git a/dist/Dockerfile b/dist/Dockerfile index 588060d2..8b497b91 100644 --- a/dist/Dockerfile +++ b/dist/Dockerfile @@ -16,7 +16,7 @@ FROM gliderlabs/alpine:3.1 MAINTAINER andrew.kennedy@cloudsoft.io # CLOCKER_VERSION_BELOW -LABEL version="1.1.0-PREVIEW.20160402" +LABEL version="1.1.0" RUN apk-install openjdk7-jre-base ; \ apk-install openjdk7-jre-lib ; \ @@ -29,7 +29,7 @@ RUN bash /tmp/certgen.sh /usr/lib/jvm/java-1.7-openjdk/jre/lib/security/cacerts rm -f /tmp/certgen.sh # CLOCKER_VERSION_BELOW -RUN wget --no-check-certificate http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-dist/1.1.0-PREVIEW.20160402/brooklyn-clocker-dist-1.1.0-PREVIEW.20160402-dist.tar.gz -O /brooklyn-clocker-dist.tar.gz ; \ +RUN wget --no-check-certificate http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-dist/1.1.0/brooklyn-clocker-dist-1.1.0-dist.tar.gz -O /brooklyn-clocker-dist.tar.gz ; \ tar zxf brooklyn-clocker-dist.tar.gz ; \ rm -f brooklyn-clocker-dist.tar.gz diff --git a/dist/pom.xml b/dist/pom.xml index b89e612e..9ad8955f 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -22,7 +22,7 @@ brooklyn-clocker-parent io.brooklyn.clocker - 1.1.0-PREVIEW.20160402 + 1.1.0 ../pom.xml diff --git a/dist/src/main/assembly/conf/brooklyn/default.catalog.bom b/dist/src/main/assembly/conf/brooklyn/default.catalog.bom index d0920a0c..a16dc2fc 100644 --- a/dist/src/main/assembly/conf/brooklyn/default.catalog.bom +++ b/dist/src/main/assembly/conf/brooklyn/default.catalog.bom @@ -13,7 +13,7 @@ # limitations under the License. brooklyn.catalog: - version: 1.1.0-PREVIEW.20160402 # CLOCKER_VERSION + version: 1.1.0 # CLOCKER_VERSION items: # load everything in the classpath with a @Catalog annotation diff --git a/dist/src/test/resources/quality_assurance/apps/nodejs_test.yaml b/dist/src/test/resources/quality_assurance/apps/nodejs_test.yaml index ce737d07..e1a4c793 100644 --- a/dist/src/test/resources/quality_assurance/apps/nodejs_test.yaml +++ b/dist/src/test/resources/quality_assurance/apps/nodejs_test.yaml @@ -18,7 +18,7 @@ brooklyn.catalog: #TEST 1- Ensure that the nodejs-demo works as expected - type: org.apache.brooklyn.test.framework.TestCase brooklyn.children: - - type: "nodejs-demo-application:1.1.0-SNAPSHOT" # CLOCKER_VERSION + - type: "nodejs-demo-application:1.1.0" # CLOCKER_VERSION id: nodejs-demo brooklyn.children: - type: org.apache.brooklyn.test.framework.TestSensor diff --git a/dist/src/test/resources/quality_assurance/combined_test.yaml b/dist/src/test/resources/quality_assurance/combined_test.yaml index 1ddc1049..c1648acf 100644 --- a/dist/src/test/resources/quality_assurance/combined_test.yaml +++ b/dist/src/test/resources/quality_assurance/combined_test.yaml @@ -1,26 +1,26 @@ brooklyn.catalog: id: test - version: 1.1.0-SNAPSHOT # CLOCKER_VERSION + version: 1.1.0 # CLOCKER_VERSION name: Test itemType: template item: services: - - type: "TestApp:1.1.0-SNAPSHOT" # CLOCKER_VERSION + - type: "TestApp:1.1.0" # CLOCKER_VERSION brooklyn.config: appToTest: $brooklyn:entitySpec: - - type: "docker-cloud-single:1.1.0-SNAPSHOT" # CLOCKER_VERSION + - type: "docker-cloud-single:1.1.0" # CLOCKER_VERSION id: infrastructure1 brooklyn.config: docker.host.cluster.initial.size: 2 docker.registry.start: false docker.version: 1.10.3 # DOCKER_VERSION entity.dynamicLocation.name: "" - - type: "TestApp:1.1.0-SNAPSHOT" # CLOCKER_VERSION + - type: "TestApp:1.1.0" # CLOCKER_VERSION brooklyn.config: appToTest: $brooklyn:entitySpec: - - type: "docker-cloud-calico:1.1.0-SNAPSHOT" # CLOCKER_VERSION + - type: "docker-cloud-calico:1.1.0" # CLOCKER_VERSION id: infrastructure2 brooklyn.config: docker.host.cluster.initial.size: 2 diff --git a/dist/src/test/resources/quality_assurance/deploy_sdn_app_test.yaml b/dist/src/test/resources/quality_assurance/deploy_sdn_app_test.yaml index 80681142..3e33bab8 100644 --- a/dist/src/test/resources/quality_assurance/deploy_sdn_app_test.yaml +++ b/dist/src/test/resources/quality_assurance/deploy_sdn_app_test.yaml @@ -1,6 +1,6 @@ brooklyn.catalog: id: sdn-test - version: 1.1.0-SNAPSHOT # CLOCKER_VERSION + version: 1.1.0 # CLOCKER_VERSION name: SDN Test itemType: template item: @@ -10,7 +10,7 @@ brooklyn.catalog: infrastructure.deployment.location.sensor: entity.dynamicLocation infrastructure.deployment.spec: $brooklyn:entitySpec: - - type: "docker-cloud-calico:1.1.0-SNAPSHOT" # CLOCKER_VERSION + - type: "docker-cloud-calico:1.1.0" # CLOCKER_VERSION id: infrastructure brooklyn.config: entity.dynamicLocation.name: my-docker-cloud diff --git a/dist/src/test/resources/quality_assurance/deploy_simple_app_test.yaml b/dist/src/test/resources/quality_assurance/deploy_simple_app_test.yaml index 202ffa58..74c1905d 100644 --- a/dist/src/test/resources/quality_assurance/deploy_simple_app_test.yaml +++ b/dist/src/test/resources/quality_assurance/deploy_simple_app_test.yaml @@ -1,6 +1,6 @@ brooklyn.catalog: id: simple-test - version: 1.1.0-SNAPSHOT # CLOCKER_VERSION + version: 1.1.0 # CLOCKER_VERSION name: Simple Test itemType: template item: diff --git a/dist/src/test/resources/quality_assurance/locations/test_location_aws_cali.yaml b/dist/src/test/resources/quality_assurance/locations/test_location_aws_cali.yaml index b69c136a..0c56ddc1 100644 --- a/dist/src/test/resources/quality_assurance/locations/test_location_aws_cali.yaml +++ b/dist/src/test/resources/quality_assurance/locations/test_location_aws_cali.yaml @@ -1,6 +1,6 @@ brooklyn.catalog: id: cal - version: 1.1.0-SNAPSHOT # CLOCKER_VERSION + version: 1.1.0 # CLOCKER_VERSION itemType: location name: cal item: diff --git a/dist/src/test/resources/quality_assurance/locations/test_location_softlayer.yaml b/dist/src/test/resources/quality_assurance/locations/test_location_softlayer.yaml index 4e835ead..0ad1fb64 100644 --- a/dist/src/test/resources/quality_assurance/locations/test_location_softlayer.yaml +++ b/dist/src/test/resources/quality_assurance/locations/test_location_softlayer.yaml @@ -1,6 +1,6 @@ brooklyn.catalog: id: soft - version: 1.1.0-SNAPSHOT # CLOCKER_VERSION + version: 1.1.0 # CLOCKER_VERSION itemType: location name: soft item: diff --git a/dist/src/test/resources/quality_assurance/test_app.yaml b/dist/src/test/resources/quality_assurance/test_app.yaml index 871c2cd1..57674dbe 100644 --- a/dist/src/test/resources/quality_assurance/test_app.yaml +++ b/dist/src/test/resources/quality_assurance/test_app.yaml @@ -1,12 +1,12 @@ brooklyn.catalog: id: simple-test-app - version: 1.1.0-SNAPSHOT # CLOCKER_VERSION + version: 1.1.0 # CLOCKER_VERSION itemType: template name: Simple Test App license: Apache-2.0 item: services: - - type: "docker-cloud-single:1.1.0-SNAPSHOT" # CLOCKER_VERSION + - type: "docker-cloud-single:1.1.0" # CLOCKER_VERSION id: infrastructure1 brooklyn.config: entity.dynamicLocation.name: my-docker-cloud diff --git a/dist/src/test/resources/quality_assurance/very_basic_test.yaml b/dist/src/test/resources/quality_assurance/very_basic_test.yaml index 89d62775..f2367c2c 100644 --- a/dist/src/test/resources/quality_assurance/very_basic_test.yaml +++ b/dist/src/test/resources/quality_assurance/very_basic_test.yaml @@ -1,6 +1,6 @@ brooklyn.catalog: id: simple-test - version: 1.1.0-SNAPSHOT # CLOCKER_VERSION + version: 1.1.0 # CLOCKER_VERSION name: Simple Test itemType: template item: diff --git a/dist/src/test/resources/test_location.yaml b/dist/src/test/resources/test_location.yaml index 2391a915..1dc0d517 100644 --- a/dist/src/test/resources/test_location.yaml +++ b/dist/src/test/resources/test_location.yaml @@ -1,6 +1,6 @@ brooklyn.catalog: id: cal1 - version: 1.1.0-SNAPSHOT # CLOCKER_VERSION + version: 1.1.0 # CLOCKER_VERSION itemType: location name: cal1 item: diff --git a/docker/pom.xml b/docker/pom.xml index fb1f3a9d..d2927f15 100644 --- a/docker/pom.xml +++ b/docker/pom.xml @@ -22,7 +22,7 @@ brooklyn-clocker-parent io.brooklyn.clocker - 1.1.0-PREVIEW.20160402 + 1.1.0 ../pom.xml diff --git a/docker/src/main/resources/clocker/docker/entity/container/SshdDockerfile b/docker/src/main/resources/clocker/docker/entity/container/SshdDockerfile index 67d0b3d2..ff446521 100644 --- a/docker/src/main/resources/clocker/docker/entity/container/SshdDockerfile +++ b/docker/src/main/resources/clocker/docker/entity/container/SshdDockerfile @@ -18,7 +18,7 @@ FROM ${fullyQualifiedImageName} MAINTAINER Cloudsoft "brooklyn@cloudsoftcorp.com" # CLOCKER_VERSION_BELOW -LABEL version="1.1.0-PREVIEW.20160402" +LABEL version="1.1.0" # setup locale RUN type locale-gen ; if [ "$?" -eq "0" ] ; then locale-gen en_US.UTF-8 ; fi diff --git a/docker/src/main/resources/clocker/docker/entity/container/centos/Dockerfile b/docker/src/main/resources/clocker/docker/entity/container/centos/Dockerfile index bc2b400f..96230aba 100644 --- a/docker/src/main/resources/clocker/docker/entity/container/centos/Dockerfile +++ b/docker/src/main/resources/clocker/docker/entity/container/centos/Dockerfile @@ -18,4 +18,4 @@ FROM centos:6.6 MAINTAINER Cloudsoft "brooklyn@cloudsoftcorp.com" # CLOCKER_VERSION_BELOW -LABEL version="1.1.0-PREVIEW.20160402" +LABEL version="1.1.0" diff --git a/docker/src/main/resources/clocker/docker/entity/container/coreos/Dockerfile b/docker/src/main/resources/clocker/docker/entity/container/coreos/Dockerfile index 1133a417..1f6a5256 100644 --- a/docker/src/main/resources/clocker/docker/entity/container/coreos/Dockerfile +++ b/docker/src/main/resources/clocker/docker/entity/container/coreos/Dockerfile @@ -18,7 +18,7 @@ FROM ubuntu:12.04 MAINTAINER Cloudsoft "brooklyn@cloudsoftcorp.com" # CLOCKER_VERSION_BELOW -LABEL version="1.1.0-PREVIEW.20160402" +LABEL version="1.1.0" # make sure the package repository is up to date RUN ( echo "deb http://archive.ubuntu.com/ubuntu precise main universe" ; echo "deb http://archive.ubuntu.com/ubuntu precise-updates main universe" ) > /etc/apt/sources.list diff --git a/docker/src/main/resources/clocker/docker/entity/container/ubuntu/Dockerfile b/docker/src/main/resources/clocker/docker/entity/container/ubuntu/Dockerfile index ed88c1f8..91ad3ab8 100644 --- a/docker/src/main/resources/clocker/docker/entity/container/ubuntu/Dockerfile +++ b/docker/src/main/resources/clocker/docker/entity/container/ubuntu/Dockerfile @@ -18,7 +18,7 @@ FROM ubuntu:14.04 MAINTAINER Cloudsoft "brooklyn@cloudsoftcorp.com" # CLOCKER_VERSION_BELOW -LABEL version="1.1.0-PREVIEW.20160402" +LABEL version="1.1.0" # Make sure the package repository is up to date RUN ( echo "deb http://archive.ubuntu.com/ubuntu trusty main universe" ; echo "deb http://archive.ubuntu.com/ubuntu trusty-updates main universe" ) > /etc/apt/sources.list diff --git a/docker/src/main/resources/clocker/docker/entity/container/ubuntu/NetworkingDockerfile b/docker/src/main/resources/clocker/docker/entity/container/ubuntu/NetworkingDockerfile index 45e9f7cf..c049c5b0 100644 --- a/docker/src/main/resources/clocker/docker/entity/container/ubuntu/NetworkingDockerfile +++ b/docker/src/main/resources/clocker/docker/entity/container/ubuntu/NetworkingDockerfile @@ -18,7 +18,7 @@ FROM ubuntu:14.04 MAINTAINER Cloudsoft "brooklyn@cloudsoftcorp.com" # CLOCKER_VERSION_BELOW -LABEL version="1.1.0-PREVIEW.20160402" +LABEL version="1.1.0" # make sure the package repository is up to date RUN ( echo "deb http://archive.ubuntu.com/ubuntu trusty main universe" ; echo "deb http://archive.ubuntu.com/ubuntu trusty-updates main universe" ) > /etc/apt/sources.list diff --git a/docker/src/main/resources/clocker/docker/entity/container/ubuntu/UsesJavaDockerfile b/docker/src/main/resources/clocker/docker/entity/container/ubuntu/UsesJavaDockerfile index 83ba3966..0d1db42b 100644 --- a/docker/src/main/resources/clocker/docker/entity/container/ubuntu/UsesJavaDockerfile +++ b/docker/src/main/resources/clocker/docker/entity/container/ubuntu/UsesJavaDockerfile @@ -18,7 +18,7 @@ FROM ubuntu:14.04 MAINTAINER Cloudsoft "brooklyn@cloudsoftcorp.com" # CLOCKER_VERSION_BELOW -LABEL version="1.1.0-PREVIEW.20160402" +LABEL version="1.1.0" # make sure the package repository is up to date RUN ( echo "deb http://archive.ubuntu.com/ubuntu trusty main universe" ; echo "deb http://archive.ubuntu.com/ubuntu trusty-updates main universe" ) > /etc/apt/sources.list diff --git a/extras/pom.xml b/extras/pom.xml index ca05d7ac..be544374 100644 --- a/extras/pom.xml +++ b/extras/pom.xml @@ -22,7 +22,7 @@ brooklyn-clocker-parent io.brooklyn.clocker - 1.1.0-SNAPSHOT + 1.1.0 ../pom.xml diff --git a/jsgui/pom.xml b/jsgui/pom.xml index 8dc48b39..398b57ec 100644 --- a/jsgui/pom.xml +++ b/jsgui/pom.xml @@ -15,7 +15,7 @@ io.brooklyn.clocker brooklyn-clocker-parent - 1.1.0-PREVIEW.20160402 + 1.1.0 ../pom.xml diff --git a/jsgui/src/main/webapp/assets/tpl/help/page.html b/jsgui/src/main/webapp/assets/tpl/help/page.html index a821a953..879a22cc 100644 --- a/jsgui/src/main/webapp/assets/tpl/help/page.html +++ b/jsgui/src/main/webapp/assets/tpl/help/page.html @@ -32,7 +32,7 @@

Clocker Help

using Docker and Marathon in the Cloud.

- You are currently using Clocker Version 1.1.0-PREVIEW.20160402 + You are currently using Clocker Version 1.1.0


References

diff --git a/jsgui/src/main/webapp/index.html b/jsgui/src/main/webapp/index.html index 089d9373..4c776dbe 100644 --- a/jsgui/src/main/webapp/index.html +++ b/jsgui/src/main/webapp/index.html @@ -1,13 +1,13 @@ - + - Clocker 1.1.0-PREVIEW.20160402 + Clocker 1.1.0 diff --git a/mesos/pom.xml b/mesos/pom.xml index f843235e..5a511f8b 100644 --- a/mesos/pom.xml +++ b/mesos/pom.xml @@ -22,7 +22,7 @@ brooklyn-clocker-parent io.brooklyn.clocker - 1.1.0-PREVIEW.20160402 + 1.1.0 ../pom.xml diff --git a/patches/pom.xml b/patches/pom.xml index 27f33ee6..f4e6dbfe 100644 --- a/patches/pom.xml +++ b/patches/pom.xml @@ -22,7 +22,7 @@ brooklyn-clocker-parent io.brooklyn.clocker - 1.1.0-PREVIEW.20160402 + 1.1.0 ../pom.xml diff --git a/pom.xml b/pom.xml index 59fa3fdf..48ee2e53 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ io.brooklyn.clocker brooklyn-clocker-parent - 1.1.0-PREVIEW.20160402 + 1.1.0 pom Clocker Project (Parent)