Version 1.1.0-PREVIEW.20160118

brooklyncentral · Jan 21, 2016 · ecc964d · ecc964d
1 parent d869b2e
commit ecc964d
Showing 16 changed files with 21 additions and 21 deletions.
diff --git a/clocker.bom b/clocker.bom
@@ -13,13 +13,13 @@
 # limitations under the License.
 
 brooklyn.catalog:
-  version: "1.1.0-ea-cloudsoft.20160113" # CLOCKER_VERSION
+  version: "1.1.0-PREVIEW.20160118" # CLOCKER_VERSION
 
   brooklyn.libraries:
 
-  - "http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-patches/1.1.0-ea-cloudsoft.20160113/brooklyn-clocker-patches-1.1.0-ea-cloudsoft.20160113.jar" # CLOCKER_VERSION
-  - "http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-docker/1.1.0-ea-cloudsoft.20160113/brooklyn-clocker-docker-1.1.0-ea-cloudsoft.20160113.jar" # CLOCKER_VERSION
-  - "http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-dist/1.1.0-ea-cloudsoft.20160113/brooklyn-clocker-dist-1.1.0-ea-cloudsoft.20160113.jar" # CLOCKER_VERSION
+  - "http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-patches/1.1.0-PREVIEW.20160118/brooklyn-clocker-patches-1.1.0-PREVIEW.20160118.jar" # CLOCKER_VERSION
+  - "http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-docker/1.1.0-PREVIEW.20160118/brooklyn-clocker-docker-1.1.0-PREVIEW.20160118.jar" # CLOCKER_VERSION
+  - "http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-dist/1.1.0-PREVIEW.20160118/brooklyn-clocker-dist-1.1.0-PREVIEW.20160118.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

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-ea-cloudsoft.20160113</version>  <!-- CLOCKER_VERSION -->
+        <version>1.1.0-PREVIEW.20160118</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-ea-cloudsoft.20160113"
+LABEL version="1.1.0-PREVIEW.20160118"
 
 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-ea-cloudsoft.20160113/brooklyn-clocker-dist-1.1.0-ea-cloudsoft.20160113-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-PREVIEW.20160118/brooklyn-clocker-dist-1.1.0-PREVIEW.20160118-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-ea-cloudsoft.20160113</version>  <!-- CLOCKER_VERSION -->
+        <version>1.1.0-PREVIEW.20160118</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-ea-cloudsoft.20160113 # CLOCKER_VERSION
+  version: 1.1.0-PREVIEW.20160118 # CLOCKER_VERSION
   items:
 
   # load everything in the classpath with a @Catalog annotation

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-ea-cloudsoft.20160113</version>  <!-- CLOCKER_VERSION -->
+        <version>1.1.0-PREVIEW.20160118</version>  <!-- CLOCKER_VERSION -->
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/docker/src/main/resources/brooklyn/entity/container/docker/SshdDockerfile b/docker/src/main/resources/brooklyn/entity/container/docker/SshdDockerfile
@@ -18,7 +18,7 @@ FROM ${fullyQualifiedImageName}
 MAINTAINER Cloudsoft "brooklyn@cloudsoftcorp.com"
 
 # CLOCKER_VERSION_BELOW
-LABEL version="1.1.0-ea-cloudsoft.20160113"
+LABEL version="1.1.0-PREVIEW.20160118"
 
 # setup locale
 RUN type locale-gen ; if [ "$?" -eq "0" ] ; then locale-gen en_US.UTF-8 ; fi

diff --git a/docker/src/main/resources/brooklyn/entity/container/docker/centos/Dockerfile b/docker/src/main/resources/brooklyn/entity/container/docker/centos/Dockerfile
@@ -18,4 +18,4 @@ FROM centos:6.6
 MAINTAINER Cloudsoft "brooklyn@cloudsoftcorp.com"
 
 # CLOCKER_VERSION_BELOW
-LABEL version="1.1.0-ea-cloudsoft.20160113"
+LABEL version="1.1.0-PREVIEW.20160118"
diff --git a/docker/src/main/resources/brooklyn/entity/container/docker/coreos/Dockerfile b/docker/src/main/resources/brooklyn/entity/container/docker/coreos/Dockerfile
@@ -18,7 +18,7 @@ FROM ubuntu:12.04
 MAINTAINER Cloudsoft "brooklyn@cloudsoftcorp.com"
 
 # CLOCKER_VERSION_BELOW
-LABEL version="1.1.0-ea-cloudsoft.20160113"
+LABEL version="1.1.0-PREVIEW.20160118"
 
 # 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/brooklyn/entity/container/docker/ubuntu/Dockerfile b/docker/src/main/resources/brooklyn/entity/container/docker/ubuntu/Dockerfile
@@ -18,7 +18,7 @@ FROM ubuntu:14.04
 MAINTAINER Cloudsoft "brooklyn@cloudsoftcorp.com"
 
 # CLOCKER_VERSION_BELOW
-LABEL version="1.1.0-ea-cloudsoft.20160113"
+LABEL version="1.1.0-PREVIEW.20160118"
 
 # 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/brooklyn/entity/container/docker/ubuntu/NetworkingDockerfile b/docker/src/main/resources/brooklyn/entity/container/docker/ubuntu/NetworkingDockerfile
@@ -18,7 +18,7 @@ FROM ubuntu:14.04
 MAINTAINER Cloudsoft "brooklyn@cloudsoftcorp.com"
 
 # CLOCKER_VERSION_BELOW
-LABEL version="1.1.0-ea-cloudsoft.20160113"
+LABEL version="1.1.0-PREVIEW.20160118"
 
 # 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/brooklyn/entity/container/docker/ubuntu/UsesJavaDockerfile b/docker/src/main/resources/brooklyn/entity/container/docker/ubuntu/UsesJavaDockerfile
@@ -18,7 +18,7 @@ FROM ubuntu:14.04
 MAINTAINER Cloudsoft "brooklyn@cloudsoftcorp.com"
 
 # CLOCKER_VERSION_BELOW
-LABEL version="1.1.0-ea-cloudsoft.20160113"
+LABEL version="1.1.0-PREVIEW.20160118"
 
 # 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/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-ea-cloudsoft.20160113 <!-- CLOCKER_VERSION -->
+    You are currently using Clocker Version 1.1.0-PREVIEW.20160118 <!-- 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-PREVIEW.20160112 --> <!-- CLOCKER_VERSION -->
+<!-- clocker 1.1.0-PREVIEW.20160118 --> <!-- CLOCKER_VERSION -->
 <!-- brooklyn 0.9.0-SNAPSHOT --> <!-- BROOKLYN_VERSION -->
 <!-- advanced-networking 0.9.0-SNAPSHOT --> <!-- ADVANCED_NETWORKING_VERSION -->
 <!-- jclouds 1.9.2 --> <!-- JCLOUDS_VERSION -->
 <html>
 <head>
     <meta charset='utf-8'/>
-    <title>Clocker 1.1.0-ea-cloudsoft.20160113</title><!-- CLOCKER_VERSION -->
+    <title>Clocker 1.1.0-PREVIEW.20160118</title><!-- CLOCKER_VERSION -->
 
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">

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-ea-cloudsoft.20160113</version>  <!-- CLOCKER_VERSION -->
+        <version>1.1.0-PREVIEW.20160118</version>  <!-- CLOCKER_VERSION -->
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/pom.xml b/pom.xml
@@ -35,7 +35,7 @@
 
     <groupId>io.brooklyn.clocker</groupId>
     <artifactId>brooklyn-clocker-parent</artifactId>
-    <version>1.1.0-ea-cloudsoft.20160113</version>  <!-- CLOCKER_VERSION -->
+    <version>1.1.0-PREVIEW.20160118</version>  <!-- CLOCKER_VERSION -->
     <packaging>pom</packaging>
     <name>Clocker Project (Parent)</name>
     <description>