azkaban-aplcache
Details
azkaban-webserver/build.gradle 27(+25 -2)
diff --git a/azkaban-webserver/build.gradle b/azkaban-webserver/build.gradle
index 186751f..7440c4a 100644
--- a/azkaban-webserver/build.gradle
+++ b/azkaban-webserver/build.gradle
@@ -1,3 +1,24 @@
+plugins {
+ id 'com.craigburke.bower-installer' version '2.5.1'
+}
+
+bower {
+ installBase = 'bower' // <1>
+
+ 'moment'('2.14.1'){
+ source 'min/moment.min.js' >> '/'
+ }
+
+ 'moment-timezone'('0.5.5') {
+ source 'builds/moment-timezone-with-data-2010-2020.min.js' >> '/'
+ }
+
+ 'eonasdan-bootstrap-datetimepicker'('4.0.0') {
+ source 'build/js/*.min.js' >> '/'
+ excludes 'jquery'
+ }
+}
+
apply plugin: 'lesscss'
apply plugin: 'dustjs'
@@ -114,8 +135,8 @@ task copyDust(type: Copy, dependsOn: ['dustjs', 'copyWeb']) {
into('build/package/web/js')
}
-task copyJSLibs(type: Copy, dependsOn: ['dustjs', 'copyWeb']) {
- from('../bower/')
+task copyJSLibs(type: Copy, dependsOn: ['bowerInstall', 'dustjs', 'copyWeb']) {
+ from('bower/')
into('build/package/web/js')
}
@@ -145,3 +166,5 @@ task copy(dependsOn: [
'copyLibs',
'copyPackage']) {
}
+
+clean.dependsOn 'bowerClean'
build.gradle 23(+1 -22)
diff --git a/build.gradle b/build.gradle
index 136421c..d798528 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,27 +13,6 @@ buildscript {
}
}
-plugins {
- id 'com.craigburke.bower-installer' version '2.5.1'
-}
-
-bower {
- installBase = 'bower' // <1>
-
- 'moment'('2.14.1'){
- source 'min/moment.min.js' >> '/'
- }
-
- 'moment-timezone'('0.5.5') {
- source 'builds/moment-timezone-with-data-2010-2020.min.js' >> '/'
- }
-
- 'eonasdan-bootstrap-datetimepicker'('4.0.0') {
- source 'build/js/*.min.js' >> '/'
- excludes 'jquery'
- }
-}
-
apply plugin: 'com.cinnober.gradle.semver-git'
apply plugin: 'idea'
apply plugin: 'distribution'
@@ -166,7 +145,7 @@ migrationDistTar.compression = Compression.GZIP
migrationDistTar.extension = 'tar.gz'
migrationDistZip.dependsOn ':azkaban-common:build', ':azkaban-migration:copy'
-webserverDistTar.dependsOn ':azkaban-common:build', 'bowerInstall', ':azkaban-webserver:copy'
+webserverDistTar.dependsOn ':azkaban-common:build', ':azkaban-webserver:copy'
webserverDistTar.compression = Compression.GZIP
webserverDistTar.extension = 'tar.gz'
webserverDistZip.dependsOn ':azkaban-common:build', ':azkaban-webserver:copy'