Repository: incubator-myriad Updated Branches: refs/heads/master 6af9d3713 -> 18dda1591
MYRIAD-274 Fix auto-incremented dependencies Myriad.js is not added to the jar in the build In the construction phase of the scheduler, the buffer / uglify task fails without a trace and does not add myriad.js to the js folder. Possibly it is due to an incompatibility between versions and how the versions in Node are handled with ~ and ^. JIRA: [MYRIAD-274] https://issues.apache.org/jira/projects/MYRIAD/issues/MYRIAD-274 Pull Request: Closes #113 Author: jpgilaberte <jpgilabe...@stratio.com> Date: Fri Oct 19 16:35:11 2018 +0200 Project: http://git-wip-us.apache.org/repos/asf/incubator-myriad/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-myriad/commit/18dda159 Tree: http://git-wip-us.apache.org/repos/asf/incubator-myriad/tree/18dda159 Diff: http://git-wip-us.apache.org/repos/asf/incubator-myriad/diff/18dda159 Branch: refs/heads/master Commit: 18dda1591f3bc982e90c727e72af6cbabe41a46a Parents: 6af9d37 Author: jpgilaberte <jpgilabe...@stratio.com> Authored: Fri Oct 19 16:35:11 2018 +0200 Committer: Javi Roman <javiro...@apache.org> Committed: Fri Oct 26 07:54:15 2018 +0200 ---------------------------------------------------------------------- .../src/main/resources/webapp/package.json | 58 ++++++++++---------- 1 file changed, 29 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/18dda159/myriad-scheduler/src/main/resources/webapp/package.json ---------------------------------------------------------------------- diff --git a/myriad-scheduler/src/main/resources/webapp/package.json b/myriad-scheduler/src/main/resources/webapp/package.json index 350d6b8..8ad1066 100644 --- a/myriad-scheduler/src/main/resources/webapp/package.json +++ b/myriad-scheduler/src/main/resources/webapp/package.json @@ -14,36 +14,36 @@ "author": "", "license": "Apache-2.0", "dependencies": { - "change-case": "^2.2.0", - "react": "^0.12.2", - "react-bootstrap": "^0.16.1", - "react-router": "^0.12.4", - "react-router-bootstrap": "^0.9.1", - "superagent": "^1.0.0", - "xml2js": "^0.4.5" + "change-case": "2.2.0", + "react": "0.12.2", + "react-bootstrap": "0.16.1", + "react-router": "0.12.4", + "react-router-bootstrap": "0.9.1", + "superagent": "1.0.0", + "xml2js": "0.4.5" }, "devDependencies": { - "babelify": "^6.3.0", - "browserify": "^9.0.3", - "del": "^2.0.2", - "gulp": "^3.8.11", - "gulp-autoprefixer": "~2.3.1", - "gulp-cache": "~0.2.10", - "gulp-concat": "~2.5.2", - "gulp-connect": "~2.2.0", - "gulp-imagemin": "~2.2.1", - "gulp-jshint": "~1.11.0", - "gulp-livereload": "~3.8.0", - "gulp-minify-css": "~1.1.6", - "gulp-notify": "~2.2.0", - "gulp-rename": "~1.2.2", - "gulp-ruby-sass": "~1.0.5", - "gulp-sourcemaps": "^1.5.0", - "gulp-uglify": "~1.2.0", - "gulp-webserver": "^0.9.0", - "vinyl-buffer": "^1.0.0", - "vinyl-source-stream": "^1.1.0", - "vinyl-transform": "^1.0.0", - "watchify": "^2.4.0" + "babelify": "6.3.0", + "browserify": "9.0.3", + "del": "2.0.2", + "gulp": "3.8.11", + "gulp-autoprefixer": "2.3.1", + "gulp-cache": "0.2.10", + "gulp-concat": "2.5.2", + "gulp-connect": "2.2.0", + "gulp-imagemin": "2.2.1", + "gulp-jshint": "1.11.0", + "gulp-livereload": "3.8.0", + "gulp-minify-css": "1.1.6", + "gulp-notify": "2.2.0", + "gulp-rename": "1.2.2", + "gulp-ruby-sass": "1.0.5", + "gulp-sourcemaps": "1.5.0", + "gulp-uglify": "1.2.0", + "gulp-webserver": "0.9.0", + "vinyl-buffer": "1.0.0", + "vinyl-source-stream": "1.1.0", + "vinyl-transform": "1.0.0", + "watchify": "2.4.0" } }