Commit b5a17a4 1 parent 76f4f58 commit b5a17a4 Copy full SHA for b5a17a4
File tree 5 files changed +41
-6
lines changed
5 files changed +41
-6
lines changed Original file line number Diff line number Diff line change 28
28
- zeppelin-web/bower_components
29
29
30
30
addons :
31
+ chrome : stable
31
32
apt :
32
33
sources :
33
34
- r-packages-precise
Original file line number Diff line number Diff line change 89
89
<scalatest .version>2.2.4</scalatest .version>
90
90
<scalacheck .version>1.12.5</scalacheck .version>
91
91
92
+ <!-- frontend maven plugin related versions-->
93
+ <node .version>v6.9.1</node .version>
94
+ <yarn .version>v0.18.1</yarn .version>
95
+ <npm .version>4.2.0</npm .version>
96
+ <plugin .frontned.version>1.3</plugin .frontned.version>
97
+
92
98
<!-- common library versions -->
93
99
<slf4j .version>1.7.10</slf4j .version>
94
100
<log4j .version>1.2.17</log4j .version>
Original file line number Diff line number Diff line change 32
32
<version >0.8.0-SNAPSHOT</version >
33
33
<name >Zeppelin: Server</name >
34
34
35
+ <!-- See https://github.com/eirslett/frontend-maven-plugin/issues/229 -->
36
+ <prerequisites >
37
+ <maven >3.1.0</maven >
38
+ </prerequisites >
39
+
35
40
<properties >
36
41
<!-- library versions-->
37
42
<commons .httpclient.version>4.3.6</commons .httpclient.version>
427
432
</executions >
428
433
</plugin >
429
434
435
+ <!-- IMPORTANT: frontend-maven-plugin should be placed before maven-antrun-plugin
436
+ so that browser-side integration test can run before stopping zeppelin daemon -->
437
+ <plugin >
438
+ <groupId >com.github.eirslett</groupId >
439
+ <artifactId >frontend-maven-plugin</artifactId >
440
+ <version >${plugin.frontned.version} </version >
441
+
442
+ <executions >
443
+ <execution >
444
+ <id >yarn e2e</id >
445
+ <goals >
446
+ <goal >yarn</goal >
447
+ </goals >
448
+ <phase >post-integration-test</phase >
449
+ <configuration >
450
+ <arguments >run e2e</arguments >
451
+ </configuration >
452
+ </execution >
453
+ </executions >
454
+
455
+ <configuration >
456
+ <!-- use existing yarn -->
457
+ <workingDirectory >${project.parent.basedir} /zeppelin-web</workingDirectory >
458
+ </configuration >
459
+ </plugin >
460
+
461
+ <!-- IMPORTANT: maven-antrun-plugin should be placed after frontend-maven-plugin
462
+ so that stopping zeppelin daemon after executing browser-side integration test -->
430
463
<plugin >
431
464
<groupId >org.apache.maven.plugins</groupId >
432
465
<artifactId >maven-antrun-plugin</artifactId >
Original file line number Diff line number Diff line change 19
19
"dev:watch" : " grunt watch-webpack-dev" ,
20
20
"dev" : " npm-run-all --parallel dev:server lint:watch dev:watch" ,
21
21
"test:watch" : " karma start karma.conf.js --single-run=false" ,
22
+ "pree2e" : " webdriver-manager update" ,
22
23
"e2e" : " protractor protractor.conf.js" ,
23
24
"test" : " karma start karma.conf.js"
24
25
},
Original file line number Diff line number Diff line change 38
38
</prerequisites >
39
39
40
40
<properties >
41
- <node .version>v6.9.1</node .version>
42
- <yarn .version>v0.18.1</yarn .version>
43
- <npm .version>4.2.0</npm .version>
44
41
<project .build.sourceEncoding>UTF-8</project .build.sourceEncoding>
45
-
46
- <!-- plugin versions-->
47
- <plugin .frontned.version>1.3</plugin .frontned.version>
48
42
</properties >
49
43
50
44
<build >
You can’t perform that action at this time.
0 commit comments