other updates to match gradle 3.1 Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/66d8df38 Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/66d8df38 Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/66d8df38
Branch: refs/heads/master Commit: 66d8df38d61a7e9e80aa21a7ed52742b79a671bf Parents: 30991df Author: Dale LaBossiere <dlab...@us.ibm.com> Authored: Tue Sep 27 09:06:43 2016 -0400 Committer: Dale LaBossiere <dlab...@us.ibm.com> Committed: Tue Sep 27 09:06:43 2016 -0400 ---------------------------------------------------------------------- DEVELOPMENT.md | 8 +++++--- build.gradle | 11 ++++++----- 2 files changed, 11 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/66d8df38/DEVELOPMENT.md ---------------------------------------------------------------------- diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index 735afc8..dd945c9 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -139,12 +139,14 @@ Work is ongoing to replace the Ant based build system with a Gradle based one [EDGENT-139](https://issues.apache.org/jira/browse/EDGENT-139). Delivered functionality is expected to work though is not yet complete. -**TODO: The primary build process is using Gradle, any pull request is expected to +**TODO: The primary build process is using [Gradle](https://gradle.org/), any pull request is expected to maintain the build success of `clean, assemble, test, reports`.** -The Gradle wrapper `edgent/{gradlew,gradlew.bat}` should be used to ensure an appropriate -version of Gradle is used, e.g.: +The Gradle wrapper `edgent/{gradlew,gradlew.bat}` should be used. +The wrapper ensures the appropriate version of gradle is used and it +will automatically download it if needed. e.g.: ``` sh +$ ./gradlew --version $ ./gradlew clean build ``` http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/66d8df38/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index 0ba3d3c..2657beb 100644 --- a/build.gradle +++ b/build.gradle @@ -547,13 +547,14 @@ task copyScripts(type: Copy) { } //Create Junit Report +// need to setup classpath to junit/jacoco for ant.junitreport task configurations { junitLibs } -dependencies { - junitLibs 'org.apache.ant:ant-junit:1.9.5' - junitLibs 'org.apache.ant:ant-junit4:1.9.5' - junitLibs 'org.jacoco:org.jacoco.ant:0.7.5.201505241946' +dependencies { // versions with gradle 3.1 + junitLibs 'org.apache.ant:ant-junit:1.9.6' + junitLibs 'org.apache.ant:ant-junit4:1.9.6' + junitLibs 'org.jacoco:org.jacoco.ant:0.7.7.201606060606' } task createJunitReport << { @@ -564,7 +565,7 @@ task createJunitReport << { classname: 'org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator', classpath: configurations.junitLibs.asPath) ant.junitreport(todir: './') { - fileset(dir: './', includes: '**/test-results/TEST-*.xml') + fileset(dir: './', includes: '**/test-results/test/TEST-*.xml') report(format: 'frames', todir: "${target_report_dir}/tests") } ant.move(file: "TESTS-TestSuites.xml", tofile: "${target_report_dir}/TESTS-TestSuites.xml")
