Version 1.1.1

grkvlt · grkvlt · commit 4c059bf70e63 · 2016-05-04T23:19:22.000+01:00
diff --git a/clocker.bom b/clocker.bom
@@ -13,15 +13,15 @@
 # limitations under the License.
 
 brooklyn.catalog:
-  version: "1.1.0" # CLOCKER_VERSION
+  version: "1.1.1" # CLOCKER_VERSION
 
   brooklyn.libraries:
 
-  - "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
+  - "http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-patches/1.1.1/brooklyn-clocker-patches-1.1.1.jar" # CLOCKER_VERSION
+  - "http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-extras/1.1.1/brooklyn-clocker-extras-1.1.1.jar" # CLOCKER_VERSION
+  - "http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-docker/1.1.1/brooklyn-clocker-docker-1.1.1.jar" # CLOCKER_VERSION
+  - "http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-mesos/1.1.1/brooklyn-clocker-mesos-1.1.1.jar" # CLOCKER_VERSION
+  - "http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-dist/1.1.1/brooklyn-clocker-dist-1.1.1.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
diff --git a/console/pom.xml b/console/pom.xml
@@ -31,7 +31,7 @@
     <parent>
         <groupId>io.brooklyn.clocker</groupId>
         <artifactId>brooklyn-clocker-parent</artifactId>
-        <version>1.1.0</version>  <!-- CLOCKER_VERSION -->
+        <version>1.1.1</version>  <!-- CLOCKER_VERSION -->
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git 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"
+LABEL version="1.1.1"
 
 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/brooklyn-clocker-dist-1.1.0-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.1/brooklyn-clocker-dist-1.1.1-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
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>brooklyn-clocker-parent</artifactId>
         <groupId>io.brooklyn.clocker</groupId>
-        <version>1.1.0</version>  <!-- CLOCKER_VERSION -->
+        <version>1.1.1</version>  <!-- CLOCKER_VERSION -->
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git 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 # CLOCKER_VERSION
+  version: 1.1.1 # 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
@@ -1,6 +1,6 @@
 brooklyn.catalog:
   id: TestApp
-  version: 1.1.0 # CLOCKER_VERSION
+  version: 1.1.1 # CLOCKER_VERSION
   name: TestApp
   itemType: template
   item:
@@ -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" # CLOCKER_VERSION
+            - type: "nodejs-demo-application:1.1.1" # 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
@@ -1,26 +1,26 @@
 brooklyn.catalog:
   id: test
-  version: 1.1.0 # CLOCKER_VERSION
+  version: 1.1.1 # CLOCKER_VERSION
   name: Test
   itemType: template
   item:
     services:
-    - type: "TestApp:1.1.0" # CLOCKER_VERSION
+    - type: "TestApp:1.1.1" # CLOCKER_VERSION
       brooklyn.config:
         appToTest:
           $brooklyn:entitySpec:
-            type: "docker-cloud-single:1.1.0" # CLOCKER_VERSION
+            type: "docker-cloud-single:1.1.1" # 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" # CLOCKER_VERSION
+    - type: "TestApp:1.1.1" # CLOCKER_VERSION
       brooklyn.config:
         appToTest:
           $brooklyn:entitySpec:
-            type: "docker-cloud-calico:1.1.0" # CLOCKER_VERSION
+            type: "docker-cloud-calico:1.1.1" # 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
@@ -1,6 +1,6 @@
 brooklyn.catalog:
   id: sdn-test
-  version: 1.1.0 # CLOCKER_VERSION
+  version: 1.1.1 # 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" # CLOCKER_VERSION
+            type: "docker-cloud-calico:1.1.1" # 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
@@ -1,6 +1,6 @@
 brooklyn.catalog:
   id: simple-test
-  version: 1.1.0 # CLOCKER_VERSION
+  version: 1.1.1 # 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
@@ -1,6 +1,6 @@
 brooklyn.catalog:
   id: cal
-  version: 1.1.0 # CLOCKER_VERSION
+  version: 1.1.1 # 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
@@ -1,6 +1,6 @@
 brooklyn.catalog:
   id: soft
-  version: 1.1.0 # CLOCKER_VERSION
+  version: 1.1.1 # 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
@@ -1,12 +1,12 @@
 brooklyn.catalog:
   id: simple-test-app
-  version: 1.1.0 # CLOCKER_VERSION
+  version: 1.1.1 # CLOCKER_VERSION
   itemType: template
   name: Simple Test App
   license: Apache-2.0
   item:
     services:
-    - type: "docker-cloud-single:1.1.0" # CLOCKER_VERSION
+    - type: "docker-cloud-single:1.1.1" # 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
@@ -1,6 +1,6 @@
 brooklyn.catalog:
   id: simple-test
-  version: 1.1.0 # CLOCKER_VERSION
+  version: 1.1.1 # 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
@@ -1,6 +1,6 @@
 brooklyn.catalog:
   id: cal1
-  version: 1.1.0 # CLOCKER_VERSION
+  version: 1.1.1 # CLOCKER_VERSION
   itemType: location
   name: cal1
   item:
diff --git a/docker/pom.xml b/docker/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>brooklyn-clocker-parent</artifactId>
         <groupId>io.brooklyn.clocker</groupId>
-        <version>1.1.0</version>  <!-- CLOCKER_VERSION -->
+        <version>1.1.1</version>  <!-- CLOCKER_VERSION -->
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git 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"
+LABEL version="1.1.1"
 
 # 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
@@ -18,4 +18,4 @@ FROM centos:6.6
 MAINTAINER Cloudsoft "brooklyn@cloudsoftcorp.com"
 
 # CLOCKER_VERSION_BELOW
-LABEL version="1.1.0"
+LABEL version="1.1.1"
diff --git 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"
+LABEL version="1.1.1"
 
 # 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
@@ -18,7 +18,7 @@ FROM ubuntu:14.04
 MAINTAINER Cloudsoft "brooklyn@cloudsoftcorp.com"
 
 # CLOCKER_VERSION_BELOW
-LABEL version="1.1.0"
+LABEL version="1.1.1"
 
 # 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
@@ -18,7 +18,7 @@ FROM ubuntu:14.04
 MAINTAINER Cloudsoft "brooklyn@cloudsoftcorp.com"
 
 # CLOCKER_VERSION_BELOW
-LABEL version="1.1.0"
+LABEL version="1.1.1"
 
 # 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
@@ -18,7 +18,7 @@ FROM ubuntu:14.04
 MAINTAINER Cloudsoft "brooklyn@cloudsoftcorp.com"
 
 # CLOCKER_VERSION_BELOW
-LABEL version="1.1.0"
+LABEL version="1.1.1"
 
 # 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
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>brooklyn-clocker-parent</artifactId>
         <groupId>io.brooklyn.clocker</groupId>
-        <version>1.1.0</version>  <!-- CLOCKER_VERSION -->
+        <version>1.1.1</version>  <!-- CLOCKER_VERSION -->
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/pom.xml b/features/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>io.brooklyn.clocker</groupId>
         <artifactId>brooklyn-clocker-parent</artifactId>
-        <version>1.2.0-SNAPSHOT</version> <!-- CLOCKER_VERSION -->
+        <version>1.1.1</version> <!-- CLOCKER_VERSION -->
     </parent>
 
     <artifactId>brooklyn-clocker-features</artifactId>
diff --git a/jsgui/pom.xml b/jsgui/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>io.brooklyn.clocker</groupId>
         <artifactId>brooklyn-clocker-parent</artifactId>
-        <version>1.1.0</version> <!-- CLOCKER_VERSION -->
+        <version>1.1.1</version> <!-- CLOCKER_VERSION -->
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/jsgui/src/main/webapp/assets/tpl/help/page.html b/jsgui/src/main/webapp/assets/tpl/help/page.html
@@ -32,7 +32,7 @@ <h3>Clocker Help</h3>
     using Docker and Marathon in the Cloud.
     </p>
     <p>
-    You are currently using Clocker Version 1.1.0 <!-- CLOCKER_VERSION -->
+    You are currently using Clocker Version 1.1.1 <!-- CLOCKER_VERSION -->
     </p>
     <hr/>
     <h3>References</h3>
diff --git a/jsgui/src/main/webapp/index.html b/jsgui/src/main/webapp/index.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!-- github GIT_SHA_1 -->
-<!-- clocker 1.1.0 --> <!-- CLOCKER_VERSION -->
+<!-- clocker 1.1.1 --> <!-- CLOCKER_VERSION -->
 <!-- brooklyn 0.9.0 --> <!-- BROOKLYN_VERSION -->
 <!-- advanced-networking 0.9.0 --> <!-- ADVANCED_NETWORKING_VERSION -->
 <!-- jclouds 1.9.2 --> <!-- JCLOUDS_VERSION -->
 <html>
 <head>
     <meta charset='utf-8'/>
-    <title>Clocker 1.1.0</title><!-- CLOCKER_VERSION -->
+    <title>Clocker 1.1.1</title><!-- CLOCKER_VERSION -->
 
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
diff --git a/mesos/pom.xml b/mesos/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>brooklyn-clocker-parent</artifactId>
         <groupId>io.brooklyn.clocker</groupId>
-        <version>1.1.0</version>  <!-- CLOCKER_VERSION -->
+        <version>1.1.1</version>  <!-- CLOCKER_VERSION -->
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/patches/pom.xml b/patches/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>brooklyn-clocker-parent</artifactId>
         <groupId>io.brooklyn.clocker</groupId>
-        <version>1.1.0</version>  <!-- CLOCKER_VERSION -->
+        <version>1.1.1</version>  <!-- CLOCKER_VERSION -->
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
@@ -34,7 +34,7 @@
 
     <groupId>io.brooklyn.clocker</groupId>
     <artifactId>brooklyn-clocker-parent</artifactId>
-    <version>1.1.0</version>  <!-- CLOCKER_VERSION -->
+    <version>1.1.1</version>  <!-- CLOCKER_VERSION -->
     <packaging>pom</packaging>
     <name>Clocker Project (Parent)</name>
     <description>
