Merge pull request #1292 from jwforres/openshift-jvm-1.1.6

Merged by openshift-bot
openshift · Feb 22, 2017 · 42c67c2 · 42c67c2
2 parents d3237d4 + e4caa54
commit 42c67c2
Show file tree

Hide file tree

Showing 7 changed files with 133 additions and 5,235 deletions.
diff --git a/dist.java/java/404.html b/dist.java/java/404.html
@@ -38,7 +38,7 @@ <h4>Connected to <span ng-bind="containerName"></span></h4>
       <div ng-include src="viewPartial"></div>
     </div>
 
-    <script src="libs-b320a1c6ab.js"></script>
+    <script src="libs-cee83b5806.js"></script>
 
     <!-- add any scripts under dist/ here -->
     <script src="app-f38f1f8a14.js"></script>

diff --git a/dist.java/java/index.html b/dist.java/java/index.html
@@ -38,7 +38,7 @@ <h4>Connected to <span ng-bind="containerName"></span></h4>
       <div ng-include src="viewPartial"></div>
     </div>
 
-    <script src="libs-b320a1c6ab.js"></script>
+    <script src="libs-cee83b5806.js"></script>
 
     <!-- add any scripts under dist/ here -->
     <script src="app-f38f1f8a14.js"></script>

diff --git a/dist.java/java/libs-b320a1c6ab.js b/dist.java/java/libs-b320a1c6ab.js
diff --git a/dist.java/java/libs-cee83b5806.js b/dist.java/java/libs-cee83b5806.js
diff --git a/dist.java/java/style.css b/dist.java/java/style.css
diff --git a/dist.java/java/version.json b/dist.java/java/version.json
@@ -1,7 +1,7 @@
 {
   "name": "openshift-jvm",
-  "version": "1.1.4",
-  "commitId": "69bb37390124033fdff239bca0099c7e759963a3",
+  "version": "1.1.6",
+  "commitId": "45c894110dd2045c20a9f3a3625930b6a5fd2a5a",
   "packages": {
     "angular": {
       "version": "1.5.11"
@@ -28,7 +28,7 @@
       "version": "1.10.0"
     },
     "bootstrap-switch": {
-      "version": "3.3.2"
+      "version": "3.3.3"
     },
     "bootstrap-touchspin": {
       "version": "3.1.2"
@@ -124,7 +124,7 @@
       "version": "0.3.6"
     },
     "matchHeight": {
-      "version": "0.7.0"
+      "version": "0.7.2"
     },
     "moment": {
       "version": "2.14.2"

diff --git a/hack/install-deps.sh b/hack/install-deps.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-OPENSHIFT_JVM_VERSION=v1.1.4
+OPENSHIFT_JVM_VERSION=v1.1.6
 
 STARTTIME=$(date +%s)
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ @@
     set -e
-    OPENSHIFT_JVM_VERSION=v1.1.4
+    OPENSHIFT_JVM_VERSION=v1.1.6
     STARTTIME=$(date +%s)
@@ Expand Down @@