diff --git a/designer_base/build.gradle b/designer_base/build.gradle index bbf5bea8b..be559ab93 100644 --- a/designer_base/build.gradle +++ b/designer_base/build.gradle @@ -10,8 +10,8 @@ jar{ } -def srcDir="${System.getenv()['JENKINS_HOME']}/workspace/design" -def libDir="${System.getenv()['JENKINS_HOME']}/workspace/lib" +def srcDir="." + sourceSets{ main{ @@ -24,8 +24,6 @@ sourceSets{ dependencies{ compile fileTree(dir:'../../',include:'**/*.jar') -compile fileTree(dir:libDir,include:'*.jar') -compile fileTree(dir:"${libDir}/jetty",include:'*.jar') testCompile 'junit:junit:4.12' } @@ -44,7 +42,7 @@ task copyFile(type:Copy,dependsOn:compileJava){ task compressJS{ ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ classpath { - fileset(dir:'../../build',includes:'**/*.jar') + fileset(dir:'../../fr-build-8.0-gradle',includes:'**/*.jar') } } ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", , charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ diff --git a/designer_chart/build.gradle b/designer_chart/build.gradle index 4bfcf85a6..6df215461 100644 --- a/designer_chart/build.gradle +++ b/designer_chart/build.gradle @@ -6,8 +6,8 @@ tasks.withType(JavaCompile){ version='8.0' -def srcDir="${System.getenv()['JENKINS_HOME']}/workspace/design" -def libDir="${System.getenv()['JENKINS_HOME']}/workspace/lib" +def srcDir="." + jar{ @@ -23,8 +23,6 @@ sourceSets{ } dependencies{ compile fileTree(dir:'../../',include:'**/*.jar') -compile fileTree(dir:libDir,include:'*.jar') -compile fileTree(dir:"${libDir}/jetty",include:'*.jar') testCompile 'junit:junit:4.12' } @@ -42,7 +40,7 @@ task copyFile(type:Copy,dependsOn:compileJava){ task compressJS{ ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ classpath { - fileset(dir:'../../build',includes:'**/*.jar') + fileset(dir:'../../fr-build-8.0-gradle',includes:'**/*.jar') } } ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", , charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ diff --git a/designer_form/build.gradle b/designer_form/build.gradle index 4a59d04d5..f87ff3d9c 100644 --- a/designer_form/build.gradle +++ b/designer_form/build.gradle @@ -6,8 +6,8 @@ tasks.withType(JavaCompile){ version='8.0' -def srcDir="${System.getenv()['JENKINS_HOME']}/workspace/design" -def libDir="${System.getenv()['JENKINS_HOME']}/workspace/lib" +def srcDir="." + jar{ @@ -24,8 +24,6 @@ sourceSets{ } dependencies{ compile fileTree(dir:'../../',include:'**/*.jar') -compile fileTree(dir:libDir,include:'*.jar') -compile fileTree(dir:"${libDir}/jetty",include:'*.jar') testCompile 'junit:junit:4.12' } @@ -46,7 +44,7 @@ task copyFile(type:Copy,dependsOn:compileJava){ task compressJS{ ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ classpath { - fileset(dir:'../../build',includes:'**/*.jar') + fileset(dir:'../../fr-build-8.0-gradle',includes:'**/*.jar') } } ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", , charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){