Bump versions to meet web-console dependencies (#2)

* Bump versions to meet web-console dependencies

* Remove un-needed dependencies.

bower.json

@@ -27,26 +27,18 @@
     "url": "git://github.com/openshift/origin-web-common.git"
   },
   "dependencies": {
-    "angular": "1.5.11 < 2.0.0",
-    "angular-sanitize": "1.5.11 < 2.0.0",
-    "angular-utf8-base64": "0.0.5",
-    "hawtio-core": "2.0.11",
-    "hawtio-extension-service": "2.0.2",
-    "jquery": "2.1.4",
-    "kubernetes-container-terminal": "1.0.2",
-    "lodash": "3.10.1",
-    "messenger": "1.4.1",
-    "microplugin": "0.0.3",
-    "openshift-object-describer": "1.1.2",
-    "sifter": "0.4.1",
-    "uri.js": "1.18.0"
+    "angular": "~1.5.11",
+    "angular-sanitize": "~1.5.11",
+    "angular-utf8-base64": "~0.0.5",
+    "hawtio-core": "~2.0.37",
+    "hawtio-extension-service": "~2.0.2",
+    "jquery": "~2.1.4",
+    "lodash": "~3.10.1",
+    "messenger": "~1.4.1",
+    "uri.js": "~1.18.0"
   },
   "devDependencies": {
-    "angular-mocks": "1.5.11 < 2.0.0",
-    "angular-scenario": "1.5.11 < 2.0.0"
-  },
-  "resolutions": {
-    "angular-sanitize": "~1.5.11",
-    "angular": "~1.5.11"
+    "angular-mocks": "~1.5.11",
+    "angular-scenario": "~1.5.11"
   }
 }

dist/origin-web-common.js

@@ -4,17 +4,14 @@
  * @description
  *   Base module for openshiftCommon.
  */
-angular.module('openshiftCommon', ['kubernetesUI', 'ab-base64'])
+angular.module('openshiftCommon', ['ab-base64'])
   .config(["AuthServiceProvider", function(AuthServiceProvider) {
     AuthServiceProvider.UserStore('MemoryUserStore');
   }])
   .constant("API_CFG", _.get(window.OPENSHIFT_CONFIG, "api", {}))
   .constant("APIS_CFG", _.get(window.OPENSHIFT_CONFIG, "apis", {}))
   .constant("AUTH_CFG", _.get(window.OPENSHIFT_CONFIG, "auth", {}))
-  .constant("LOGGING_URL", _.get(window.OPENSHIFT_CONFIG, "loggingURL"))
-  .constant("METRICS_URL", _.get(window.OPENSHIFT_CONFIG, "metricsURL"))
-  .constant("LIMIT_REQUEST_OVERRIDES", _.get(window.OPENSHIFT_CONFIG, "limitRequestOverrides"))
-  .config(["$httpProvider", "AuthServiceProvider", "RedirectLoginServiceProvider", "AUTH_CFG", "API_CFG", "kubernetesContainerSocketProvider", function($httpProvider, AuthServiceProvider, RedirectLoginServiceProvider, AUTH_CFG, API_CFG, kubernetesContainerSocketProvider) {
+  .config(["$httpProvider", "AuthServiceProvider", "RedirectLoginServiceProvider", "AUTH_CFG", function($httpProvider, AuthServiceProvider, RedirectLoginServiceProvider, AUTH_CFG) {
     $httpProvider.interceptors.push('AuthInterceptor');
 
     AuthServiceProvider.LoginService('RedirectLoginService');
@@ -25,9 +22,6 @@ angular.module('openshiftCommon', ['kubernetesUI', 'ab-base64'])
     RedirectLoginServiceProvider.OAuthClientID(AUTH_CFG.oauth_client_id);
     RedirectLoginServiceProvider.OAuthAuthorizeURI(AUTH_CFG.oauth_authorize_uri);
     RedirectLoginServiceProvider.OAuthRedirectURI(URI(AUTH_CFG.oauth_redirect_base).segment("oauth").toString());
-
-    // Configure the container terminal
-    kubernetesContainerSocketProvider.WebSocketFactory = "ContainerWebSocket";
   }]);
 
 hawtioPluginLoader.addModule('openshiftCommon');

src/openshiftCommon.module.js

@@ -4,17 +4,14 @@
  * @description
  *   Base module for openshiftCommon.
  */
-angular.module('openshiftCommon', ['kubernetesUI', 'ab-base64'])
+angular.module('openshiftCommon', ['ab-base64'])
   .config(function(AuthServiceProvider) {
     AuthServiceProvider.UserStore('MemoryUserStore');
   })
   .constant("API_CFG", _.get(window.OPENSHIFT_CONFIG, "api", {}))
   .constant("APIS_CFG", _.get(window.OPENSHIFT_CONFIG, "apis", {}))
   .constant("AUTH_CFG", _.get(window.OPENSHIFT_CONFIG, "auth", {}))
-  .constant("LOGGING_URL", _.get(window.OPENSHIFT_CONFIG, "loggingURL"))
-  .constant("METRICS_URL", _.get(window.OPENSHIFT_CONFIG, "metricsURL"))
-  .constant("LIMIT_REQUEST_OVERRIDES", _.get(window.OPENSHIFT_CONFIG, "limitRequestOverrides"))
-  .config(function($httpProvider, AuthServiceProvider, RedirectLoginServiceProvider, AUTH_CFG, API_CFG, kubernetesContainerSocketProvider) {
+  .config(function($httpProvider, AuthServiceProvider, RedirectLoginServiceProvider, AUTH_CFG) {
     $httpProvider.interceptors.push('AuthInterceptor');
 
     AuthServiceProvider.LoginService('RedirectLoginService');
@@ -25,9 +22,6 @@ angular.module('openshiftCommon', ['kubernetesUI', 'ab-base64'])
     RedirectLoginServiceProvider.OAuthClientID(AUTH_CFG.oauth_client_id);
     RedirectLoginServiceProvider.OAuthAuthorizeURI(AUTH_CFG.oauth_authorize_uri);
     RedirectLoginServiceProvider.OAuthRedirectURI(URI(AUTH_CFG.oauth_redirect_base).segment("oauth").toString());
-
-    // Configure the container terminal
-    kubernetesContainerSocketProvider.WebSocketFactory = "ContainerWebSocket";
   });
 
 hawtioPluginLoader.addModule('openshiftCommon');

test/karma.conf.js

@@ -28,7 +28,7 @@ module.exports = function(config) {
       "bower_components/uri.js/src/URITemplate.js",
       "bower_components/uri.js/src/jquery.URI.js",
       "bower_components/uri.js/src/URI.fragmentURI.js",
-      "bower_components/hawtio-core/hawtio-core.js",
+      "bower_components/hawtio-core/dist/hawtio-core.js",
       "bower_components/kubernetes-container-terminal/dist/container-terminal.js",
       "bower_components/hawtio-extension-service/dist/hawtio-extension-service.js",
       'src/**/*.js',

test/spec/spec-helper.js

@@ -40,9 +40,6 @@ beforeEach(module(function ($provide) {
     .constant("API_CFG", _.get(window.OPENSHIFT_CONFIG, "api", {}))
     .constant("APIS_CFG", _.get(window.OPENSHIFT_CONFIG, "apis", {}))
     .constant("AUTH_CFG", _.get(window.OPENSHIFT_CONFIG, "auth", {}))
-    .constant("LOGGING_URL", _.get(window.OPENSHIFT_CONFIG, "loggingURL"))
-    .constant("METRICS_URL", _.get(window.OPENSHIFT_CONFIG, "metricsURL"))
-    .constant("LIMIT_REQUEST_OVERRIDES", _.get(window.OPENSHIFT_CONFIG, "limitRequestOverrides"))
     .config(function($httpProvider, AuthServiceProvider, AUTH_CFG, API_CFG) {
       AuthServiceProvider.LoginService('RedirectLoginService');
       AuthServiceProvider.LogoutService('DeleteTokenLogoutService');