Skip to content

Commit

Permalink
[FLINK-3262] [web-dashboard] Remove fuzzy versioning from Bower depen…
Browse files Browse the repository at this point in the history
…dencies

Several packages had been updated locally by users when compiling the templates
without changing the version in bower.json. The following packages have been
explicitly updated.

 jquery              2.1.4  →   2.2.0
 angular            1.3.15  →   1.4.8
 angular-moment      0.9.2  →  0.10.3
 angular-ui-router  0.2.13  →  0.2.15
 bootstrap           3.3.5  →   3.3.6
 d3                  3.5.5  →  3.5.12
 dagre-d3           0.4.10  →  0.4.11
 font-awesome        4.3.0  →   4.5.0

This closes apache#1525
  • Loading branch information
greghogan authored and StephanEwen committed Jan 28, 2016
1 parent 40422d5 commit 1ea5e13
Show file tree
Hide file tree
Showing 18 changed files with 18,309 additions and 15,553 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ _site
docs/api
build-target
flink-batch-connectors/flink-avro/src/test/java/org/apache/flink/api/io/avro/generated/
flink-runtime-web/web-dashboard/assets/fonts/
flink-runtime-web/web-dashboard/node_modules/
flink-runtime-web/web-dashboard/bower_components/
atlassian-ide-plugin.xml
Expand Down
Binary file not shown.
Binary file not shown.
565 changes: 0 additions & 565 deletions flink-runtime-web/web-dashboard/assets/fonts/fontawesome-webfont.svg

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
20 changes: 10 additions & 10 deletions flink-runtime-web/web-dashboard/bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@
"tests"
],
"dependencies": {
"jquery": "~2.1.4",
"angular": "~1.3.15",
"angular-moment": "~0.9.2",
"angular-ui-router": "~0.2.13",
"bootstrap": "~3.3.5",
"d3": "~3.5.5",
"dagre-d3": "~0.4.10",
"font-awesome": "~4.3.0",
"moment-duration-format": "~1.3.0",
"qtip2": "~2.2.1"
"jquery": "2.2.0",
"angular": "1.4.8",
"angular-moment": "0.10.3",
"angular-ui-router": "0.2.15",
"bootstrap": "3.3.6",
"d3": "3.5.12",
"dagre-d3": "0.4.11",
"font-awesome": "4.5.0",
"moment-duration-format": "1.3.0",
"qtip2": "2.2.1"
},
"overrides": {
"dagre-d3": {
Expand Down
13 changes: 6 additions & 7 deletions flink-runtime-web/web-dashboard/gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*/

// ----------------------------------------------------------------------------
// Builde file for the web dashboard
// Build file for the web dashboard
// ----------------------------------------------------------------------------

var gulp = require('gulp');
Expand Down Expand Up @@ -66,17 +66,16 @@ gulp.task('assets', function() {
.pipe(gulp.dest(paths.dest));
});


gulp.task('bootstrap', function () {
return gulp.src(paths.src + 'styles/bootstrap_custom.less')
gulp.task('pre-process-vendor-styles', function () {
return gulp.src(mainBowerFiles('**/*.less').concat(paths.src + 'styles/bootstrap_custom.less'))
.pipe(less({
paths: [ path.join(__dirname, 'less', 'includes') ]
}))
.pipe(gulp.dest(paths.tmp + 'css/'));
});

gulp.task('vendor-styles', [ 'bootstrap' ], function() {
stream = gulp.src(mainBowerFiles().concat([paths.tmp + 'css/bootstrap_custom.css']).concat([paths.vendor + 'qtip2/jquery.qtip.css']))
gulp.task('vendor-styles', [ 'pre-process-vendor-styles' ], function() {
stream = gulp.src(mainBowerFiles().concat([paths.tmp + 'css/*.css']).concat([paths.vendor + 'qtip2/jquery.qtip.css']))
.pipe(filter(['*.css', '!bootstrap.css']))
.pipe(sourcemaps.init())
.pipe(concat("vendor.css"))
Expand All @@ -87,7 +86,7 @@ gulp.task('vendor-styles', [ 'bootstrap' ], function() {
}

stream.pipe(gulp.dest(paths.dest + 'css/'))
});
});

gulp.task('vendor-scripts', function() {
stream = gulp.src(mainBowerFiles({
Expand Down
Loading

0 comments on commit 1ea5e13

Please sign in to comment.