Merge pull request #3121 from alexkieling/enterprise-3.11

Fix bug 1668002 - Increase default Collection Size parameter in jolokia
openshift · Mar 15, 2019 · e7e7636 · e7e7636
2 parents 4df3ce8 + 0ea3661
commit e7e7636
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 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-a15571faaa.js"></script>
+    <script src="libs-a07e8842c6.js"></script>
 
     <!-- add any scripts under dist/ here -->
     <script src="app-747a60cd4f.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-a15571faaa.js"></script>
+    <script src="libs-a07e8842c6.js"></script>
 
     <!-- add any scripts under dist/ here -->
     <script src="app-747a60cd4f.js"></script>

diff --git a/dist.java/java/libs-a07e8842c6.js b/dist.java/java/libs-a07e8842c6.js
diff --git a/dist.java/java/libs-a15571faaa.js b/dist.java/java/libs-a15571faaa.js
diff --git a/dist.java/java/version.json b/dist.java/java/version.json
@@ -1,7 +1,7 @@
 {
   "name": "openshift-jvm",
-  "version": "1.3.0",
-  "commitId": "86841d0720c2b014d97a9ce6b6620937be817599",
+  "version": "1.3.2",
+  "commitId": "39b559ffc2662f68556c9fe2876e42a60275f86a",
   "packages": {
     "angular": {
       "version": "1.5.11"
@@ -85,10 +85,10 @@
       "version": "2.0.41"
     },
     "hawtio-integration": {
-      "version": "2.2.1"
+      "version": "2.2.2"
     },
     "hawtio-jmx": {
-      "version": "2.0.84"
+      "version": "2.0.85"
     },
     "hawtio-preferences": {
       "version": "2.0.10"
@@ -106,7 +106,7 @@
       "version": "1.3.2"
     },
     "humanize-duration": {
-      "version": "3.15.3"
+      "version": "3.18.0"
     },
     "jquery": {
       "version": "2.1.4"
@@ -139,7 +139,7 @@
       "version": "1.1.7"
     },
     "patternfly-bootstrap-treeview": {
-      "version": "2.1.5"
+      "version": "2.1.8"
     },
     "toastr": {
       "version": "2.1.3"

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