| diff --git a/python/pom.xml b/python/pom.xml |
| index 3f55c92f1..bc50512f4 100644 |
| --- a/python/pom.xml |
| +++ b/python/pom.xml |
| @@ -84,7 +84,7 @@ |
| <dependency> |
| <groupId>io.grpc</groupId> |
| <artifactId>grpc-stub</artifactId> |
| - <version>${grpc.version}</version> |
| + <version>1.28.0</version> |
| </dependency> |
| |
| <!-- test libraries --> |
| @@ -118,9 +118,11 @@ |
| <artifactId>protobuf-maven-plugin</artifactId> |
| <version>0.5.0</version> |
| <configuration> |
| - <protocArtifact>com.google.protobuf:protoc:3.3.0:exe:${os.detected.classifier}</protocArtifact> |
| + <!-- Protoc-3.3.0 doesn't Support Arm64, upgrading to 3.5.0 --> |
| + <protocArtifact>com.google.protobuf:protoc:3.5.0:exe:${os.detected.classifier}</protocArtifact> |
| <pluginId>grpc-java</pluginId> |
| - <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.4.0:exe:${os.detected.classifier}</pluginArtifact> |
| + <!-- protoc-gen-grpc-java-1.4.0 doesn't Support Arm64, upgrading to 1.28.0 --> |
| + <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.28.0:exe:${os.detected.classifier}</pluginArtifact> |
| </configuration> |
| <executions> |
| <execution> |
| diff --git a/zeppelin-web/Gruntfile.js b/zeppelin-web/Gruntfile.js |
| index c25b56070..58a75f24e 100644 |
| --- a/zeppelin-web/Gruntfile.js |
| +++ b/zeppelin-web/Gruntfile.js |
| @@ -373,7 +373,7 @@ module.exports = function(grunt) { |
| karma: { |
| unit: { |
| configFile: 'karma.conf.js', |
| - singleRun: true |
| + singleRun: false |
| } |
| } |
| }); |
| diff --git a/zeppelin-web/package-lock.json b/zeppelin-web/package-lock.json |
| index 443c7b770..5ff7f08e8 100644 |
| --- a/zeppelin-web/package-lock.json |
| +++ b/zeppelin-web/package-lock.json |
| @@ -6857,193 +6857,6 @@ |
| } |
| } |
| }, |
| - "karma": { |
| - "version": "1.3.0", |
| - "resolved": "https://registry.npmjs.org/karma/-/karma-1.3.0.tgz", |
| - "integrity": "sha1-srlOj0mfrdAGnVT5rvSk1I7FzB8=", |
| - "dev": true, |
| - "requires": { |
| - "bluebird": "3.5.1", |
| - "body-parser": "1.18.2", |
| - "chokidar": "1.7.0", |
| - "colors": "1.1.2", |
| - "combine-lists": "1.0.1", |
| - "connect": "3.6.5", |
| - "core-js": "2.5.2", |
| - "di": "0.0.1", |
| - "dom-serialize": "2.2.1", |
| - "expand-braces": "0.1.2", |
| - "glob": "7.1.2", |
| - "graceful-fs": "4.1.11", |
| - "http-proxy": "1.16.2", |
| - "isbinaryfile": "3.0.2", |
| - "lodash": "3.10.1", |
| - "log4js": "0.6.38", |
| - "mime": "1.4.1", |
| - "minimatch": "3.0.4", |
| - "optimist": "0.6.1", |
| - "qjobs": "1.1.5", |
| - "range-parser": "1.2.0", |
| - "rimraf": "2.6.2", |
| - "socket.io": "1.4.7", |
| - "source-map": "0.5.7", |
| - "tmp": "0.0.28", |
| - "useragent": "2.2.1" |
| - }, |
| - "dependencies": { |
| - "glob": { |
| - "version": "7.1.2", |
| - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", |
| - "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", |
| - "dev": true, |
| - "requires": { |
| - "fs.realpath": "1.0.0", |
| - "inflight": "1.0.6", |
| - "inherits": "2.0.3", |
| - "minimatch": "3.0.4", |
| - "once": "1.4.0", |
| - "path-is-absolute": "1.0.1" |
| - } |
| - }, |
| - "lodash": { |
| - "version": "3.10.1", |
| - "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", |
| - "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=", |
| - "dev": true |
| - }, |
| - "minimatch": { |
| - "version": "3.0.4", |
| - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", |
| - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", |
| - "dev": true, |
| - "requires": { |
| - "brace-expansion": "1.1.8" |
| - } |
| - }, |
| - "source-map": { |
| - "version": "0.5.7", |
| - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", |
| - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", |
| - "dev": true |
| - } |
| - } |
| - }, |
| - "karma-coverage": { |
| - "version": "1.1.1", |
| - "resolved": "https://registry.npmjs.org/karma-coverage/-/karma-coverage-1.1.1.tgz", |
| - "integrity": "sha1-Wv+LOc9plNwi3kyENix2ABtjfPY=", |
| - "dev": true, |
| - "requires": { |
| - "dateformat": "1.0.12", |
| - "istanbul": "0.4.5", |
| - "lodash": "3.10.1", |
| - "minimatch": "3.0.4", |
| - "source-map": "0.5.7" |
| - }, |
| - "dependencies": { |
| - "dateformat": { |
| - "version": "1.0.12", |
| - "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz", |
| - "integrity": "sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk=", |
| - "dev": true, |
| - "requires": { |
| - "get-stdin": "4.0.1", |
| - "meow": "3.7.0" |
| - } |
| - }, |
| - "lodash": { |
| - "version": "3.10.1", |
| - "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", |
| - "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=", |
| - "dev": true |
| - }, |
| - "minimatch": { |
| - "version": "3.0.4", |
| - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", |
| - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", |
| - "dev": true, |
| - "requires": { |
| - "brace-expansion": "1.1.8" |
| - } |
| - }, |
| - "source-map": { |
| - "version": "0.5.7", |
| - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", |
| - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", |
| - "dev": true |
| - } |
| - } |
| - }, |
| - "karma-jasmine": { |
| - "version": "1.0.2", |
| - "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-1.0.2.tgz", |
| - "integrity": "sha1-wLOrMnvyB9tg4X+ifbN8/e9djmw=", |
| - "dev": true |
| - }, |
| - "karma-phantomjs-launcher": { |
| - "version": "1.0.4", |
| - "resolved": "https://registry.npmjs.org/karma-phantomjs-launcher/-/karma-phantomjs-launcher-1.0.4.tgz", |
| - "integrity": "sha1-0jyjSAG9qYY60xjju0vUBisTrNI=", |
| - "dev": true, |
| - "requires": { |
| - "lodash": "4.17.4", |
| - "phantomjs-prebuilt": "2.1.16" |
| - } |
| - }, |
| - "karma-sourcemap-loader": { |
| - "version": "0.3.7", |
| - "resolved": "https://registry.npmjs.org/karma-sourcemap-loader/-/karma-sourcemap-loader-0.3.7.tgz", |
| - "integrity": "sha1-kTIsd/jxPUb+0GKwQuEAnUxFBdg=", |
| - "dev": true, |
| - "requires": { |
| - "graceful-fs": "4.1.11" |
| - } |
| - }, |
| - "karma-spec-reporter": { |
| - "version": "0.0.31", |
| - "resolved": "https://registry.npmjs.org/karma-spec-reporter/-/karma-spec-reporter-0.0.31.tgz", |
| - "integrity": "sha1-SDDccUihVcfXoYbmMjOaDYD63sM=", |
| - "dev": true, |
| - "requires": { |
| - "colors": "1.1.2" |
| - } |
| - }, |
| - "karma-webpack": { |
| - "version": "1.8.1", |
| - "resolved": "https://registry.npmjs.org/karma-webpack/-/karma-webpack-1.8.1.tgz", |
| - "integrity": "sha1-OdX9Lt7qPMPvW0BZibN9Ww5qO04=", |
| - "dev": true, |
| - "requires": { |
| - "async": "0.9.2", |
| - "loader-utils": "0.2.17", |
| - "lodash": "3.10.1", |
| - "source-map": "0.1.43", |
| - "webpack-dev-middleware": "1.12.2" |
| - }, |
| - "dependencies": { |
| - "async": { |
| - "version": "0.9.2", |
| - "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz", |
| - "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=", |
| - "dev": true |
| - }, |
| - "lodash": { |
| - "version": "3.10.1", |
| - "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", |
| - "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=", |
| - "dev": true |
| - }, |
| - "source-map": { |
| - "version": "0.1.43", |
| - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", |
| - "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", |
| - "dev": true, |
| - "requires": { |
| - "amdefine": "1.0.1" |
| - } |
| - } |
| - } |
| - }, |
| "kew": { |
| "version": "0.7.0", |
| "resolved": "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz", |
| @@ -8392,40 +8205,6 @@ |
| "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", |
| "dev": true |
| }, |
| - "phantomjs-prebuilt": { |
| - "version": "2.1.16", |
| - "resolved": "https://registry.npmjs.org/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.16.tgz", |
| - "integrity": "sha1-79ISpKOWbTZHaE6ouniFSb4q7+8=", |
| - "dev": true, |
| - "requires": { |
| - "es6-promise": "4.1.1", |
| - "extract-zip": "1.6.6", |
| - "fs-extra": "1.0.0", |
| - "hasha": "2.2.0", |
| - "kew": "0.7.0", |
| - "progress": "1.1.8", |
| - "request": "2.83.0", |
| - "request-progress": "2.0.1", |
| - "which": "1.3.0" |
| - }, |
| - "dependencies": { |
| - "es6-promise": { |
| - "version": "4.1.1", |
| - "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.1.1.tgz", |
| - "integrity": "sha512-OaU1hHjgJf+b0NzsxCg7NdIYERD6Hy/PEmFLTjw+b65scuisG3Kt4QoTvJ66BBkPZ581gr0kpoVzKnxniM8nng==", |
| - "dev": true |
| - }, |
| - "which": { |
| - "version": "1.3.0", |
| - "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz", |
| - "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==", |
| - "dev": true, |
| - "requires": { |
| - "isexe": "2.0.0" |
| - } |
| - } |
| - } |
| - }, |
| "pify": { |
| "version": "2.3.0", |
| "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", |
| diff --git a/zeppelin-web/package.json b/zeppelin-web/package.json |
| index 0c54eeac0..6db67fe9c 100644 |
| --- a/zeppelin-web/package.json |
| +++ b/zeppelin-web/package.json |
| @@ -18,11 +18,8 @@ |
| "dev:helium": "HELIUM_BUNDLE_DEV=true webpack-dev-server --hot", |
| "dev:watch": "grunt watch-webpack-dev", |
| "dev": "npm-run-all --parallel dev:server lint:watch dev:watch", |
| - "test:watch": "karma start karma.conf.js --single-run=false", |
| "pree2e": "webdriver-manager update --gecko false --versions.chrome=2.35", |
| - "e2e": "protractor protractor.conf.js", |
| - "pretest": "npm rebuild phantomjs-prebuilt", |
| - "test": "karma start karma.conf.js" |
| + "e2e": "protractor protractor.conf.js" |
| }, |
| "dependencies": { |
| "angular-ui-grid": "4.4.6", |
| @@ -80,13 +77,6 @@ |
| "istanbul-instrumenter-loader": "^0.2.0", |
| "jasmine-core": "^2.5.2", |
| "jasmine-spec-reporter": "^4.1.1", |
| - "karma": "~1.3.0", |
| - "karma-coverage": "^1.1.1", |
| - "karma-jasmine": "~1.0.2", |
| - "karma-phantomjs-launcher": "^1.0.4", |
| - "karma-sourcemap-loader": "^0.3.7", |
| - "karma-spec-reporter": "0.0.31", |
| - "karma-webpack": "^1.8.1", |
| "load-grunt-tasks": "^0.4.0", |
| "ng-annotate-loader": "^0.2.0", |
| "npm-run-all": "^3.1.2", |
