Merge branch 'dev'

Netflix · Oct 4, 2018 · 9e6b121 · 9e6b121
2 parents a7a6e32 + 04e5c47
commit 9e6b121
Show file tree

Hide file tree

Showing 40 changed files with 528 additions and 288 deletions.
diff --git a/.codecov.yml b/.codecov.yml
@@ -0,0 +1,3 @@
+codecov:
+  branch: dev
+  # strict_yaml_branch: master # Enable this if we want to use the yml file in master to dictate the reports for all branches
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,9 @@
 language: java
 jdk:
 - oraclejdk8
+
+after_success:
+  - bash <(curl -s https://codecov.io/bash)
 install: true
 script: "./buildViaTravis.sh"
 git:

diff --git a/README.md b/README.md
@@ -1,11 +1,23 @@
 ![Conductor](docs/docs/img/conductor-vector-x.png)
 
+
 ## Conductor
 Conductor is an _orchestration_ engine that runs in the cloud.
 
-[![Build Status](https://travis-ci.org/Netflix/conductor.svg?branch=master)](https://travis-ci.org/Netflix/conductor)
 
 
+[![Download](https://api.bintray.com/packages/netflixoss/maven/conductor/images/download.svg)](https://bintray.com/netflixoss/maven/conductor/_latestVersion)
+[![License](https://img.shields.io/github/license/Netflix/conductor.svg)](http://www.apache.org/licenses/LICENSE-2.0)
+[![Issues](https://img.shields.io/github/issues/Netflix/conductor.svg)](https://github.com/Netflix/conductor/issues)
+[![NetflixOSS Lifecycle](https://img.shields.io/osslifecycle/Netflix/conductor.svg)]()
+
+## Builds
+Conductor builds are run on Travis CI [here](https://travis-ci.org/Netflix/conductor).
+
+| Branch |                                                     Build                                                     |                                                                 Coverage (coveralls.io)                                                                |                                                        Coverage (codecov.io)                                                       |
+|:------:|:-------------------------------------------------------------------------------------------------------------:|:------------------------------------------------------------------------------------------------------------------------------------------------------:|:----------------------------------------------------------------------------------------------------------------------------------:|
+| master | [![Build Status](https://travis-ci.org/Netflix/conductor.svg?branch=master)](https://travis-ci.org/Netflix/conductor) | [![Coverage Status](https://coveralls.io/repos/github/Netflix/conductor/badge.svg?branch=master)](https://coveralls.io/github/Netflix/conductor?branch=master) | [![codecov](https://codecov.io/gh/Netflix/conductor/branch/master/graph/badge.svg)](https://codecov.io/gh/Netflix/conductor/branch/master) |
+| dev | [![Build Status](https://travis-ci.org/Netflix/conductor.svg?branch=dev)](https://travis-ci.org/Netflix/conductor) | [![Coverage Status](https://coveralls.io/repos/github/Netflix/conductor/badge.svg?branch=dev)](https://coveralls.io/github/Netflix/conductor?branch=dev) | [![codecov](https://codecov.io/gh/Netflix/conductor/branch/dev/graph/badge.svg)](https://codecov.io/gh/Netflix/conductor/branch/dev) |
 
 ## Documentation & Getting Started
 [http://netflix.github.io/conductor/](http://netflix.github.io/conductor/)
@@ -41,6 +53,7 @@ To build the server, use the following dependencies in your classpath:
 * conductor-es2-persistence _or_ conductor-es5-persistence (_unless using your own index module_)
 * conductor-contribs (_optional_)
 
+
 ### Deploying Jersey JAX-RS resources
 Add the following packages to classpath scan:
 
@@ -67,18 +80,3 @@ com.netflix.conductor.dao.RedisWorkflowModule
 ## Get Support
 Conductor is maintained by Media Workflow Infrastructure team at Netflix.  Use github issue tracking for any support request.  
 
-## LICENSE
-
-Copyright (c) 2018 Netflix, Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-<http://www.apache.org/licenses/LICENSE-2.0>
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/build.gradle b/build.gradle
@@ -2,14 +2,15 @@ buildscript {
 	repositories {
         jcenter()
     }
-    
+
     dependencies {
         classpath 'com.netflix.nebula:gradle-extra-configurations-plugin:4.0.1'
         classpath 'org.apache.ant:ant:1.9.7'
     }
 }
 plugins {
-    id 'nebula.netflixoss' version '6.0.3'
+    id 'nebula.netflixoss' version '5.1.1'
+    id 'com.github.kt3k.coveralls' version '2.8.2'
 }
 
 // Establish version and status
@@ -18,22 +19,28 @@ ext.githubProjectName = rootProject.name // Change if github project name is not
 apply plugin: 'project-report'
 apply from: "$rootDir/versionsOfDependencies.gradle"
 
+allprojects {
+    apply plugin: 'idea'
+    apply plugin: 'jacoco'
+    apply plugin: 'eclipse'
+
+    repositories {
+        jcenter()
+    }
+}
 
-subprojects {
+def javaProjects = subprojects.findAll {
+    it.name != "ui"
+}
 
+configure(javaProjects) {
     apply plugin: 'nebula.netflixoss'
     apply plugin: 'java'
-    apply plugin: 'idea'
-    apply plugin: 'eclipse'
     apply plugin: 'project-report'
 
     sourceCompatibility = 1.8
     targetCompatibility = 1.8
 
-    repositories {
-        jcenter()
-    }
-
     dependencies {
         testCompile "junit:junit:${revJUnit}"
         testCompile("org.mockito:mockito-core:${revMockito}") {
@@ -42,18 +49,80 @@ subprojects {
     }
 
     group = "com.netflix.${githubProjectName}"
-    
+
     tasks.withType(Test)  {
         maxParallelForks = 100
     }
-    
+
     license {
 		excludes(['**/*.txt', '**/*.conf', '**/*.properties', '**/*.json', '**/swagger-ui/*'])
 	}
-	
+
 	task licenseFormatTests (type:nl.javadude.gradle.plugins.license.License) {
     	source = fileTree(dir: "src/test").include("**/*")
 	}
 	licenseFormat.dependsOn licenseFormatTests
 
+
+
+    tasks.withType(Test) {
+        task ->
+            // set heap size for the test JVM(s)
+            minHeapSize = "256m"
+            maxHeapSize = "2g"
+
+            jacocoTestReport.executionData += files("$buildDir/jacoco/${task.name}.exec")
+    }
+
+    jacocoTestReport {
+        reports {
+            html.enabled = true
+            xml.enabled = true
+            csv.enabled = false
+        }
+    }
 }
+
+
+
+/**********************************
+ * Coverage Tasks
+ **********************************/
+task codeCoverageReport(type: JacocoReport, group: "Coverage reports") {
+    executionData fileTree(project.rootDir.absolutePath).include("**/build/jacoco/*.exec")
+    dependsOn subprojects*.test
+
+    subprojects.each {
+        sourceSets it.sourceSets.main
+    }
+
+    reports {
+        xml.enabled = true
+        xml.destination new File("${buildDir}/reports/jacoco/report.xml")
+        html.enabled = true
+        html.destination new File("${buildDir}/reports/jacoco/html")
+        csv.enabled = false
+    }
+    afterEvaluate {
+        // Exclude generated files from top-level coverage report
+        classDirectories = files(
+                classDirectories.files.collect {
+                    fileTree(
+                            dir: it
+                    )
+                }
+        )
+    }
+}
+
+coveralls {
+    sourceDirs = subprojects.sourceSets.main.allSource.srcDirs.flatten()
+    jacocoReportPath = "${project.buildDir}/reports/jacoco/report.xml"
+}
+
+tasks.coveralls {
+    group = "Coverage reports"
+    description = "Uploads the aggregated coverage report to Coveralls"
+    dependsOn codeCoverageReport
+}
+
diff --git a/buildViaTravis.sh b/buildViaTravis.sh
@@ -2,21 +2,22 @@
 # This script will build the project.
 if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
   echo -e "Build Pull Request #$TRAVIS_PULL_REQUEST => Branch [$TRAVIS_BRANCH]"
-  ./gradlew build
+  ./gradlew build codeCoverageReport coveralls
 elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" == "" ]; then
   echo -e 'Build Branch with Snapshot => Branch ['$TRAVIS_BRANCH']'
-  ./gradlew -Prelease.travisci=true -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PsonatypeUsername="${sonatypeUsername}" -PsonatypePassword="${sonatypePassword}" build snapshot --info --stacktrace
+  ./gradlew -Prelease.travisci=true -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PsonatypeUsername="${sonatypeUsername}" -PsonatypePassword="${sonatypePassword}" build snapshot codeCoverageReport coveralls --info --stacktrace
 elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" != "" ]; then
   echo -e 'Build Branch for Release => Branch ['$TRAVIS_BRANCH']  Tag ['$TRAVIS_TAG']'
   case "$TRAVIS_TAG" in
   *-rc\.*)
-    ./gradlew -Prelease.travisci=true -Prelease.useLastTag=true -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PsonatypeUsername="${sonatypeUsername}" -PsonatypePassword="${sonatypePassword}" candidate --info --stacktrace
+    ./gradlew -Prelease.travisci=true -Prelease.useLastTag=true -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PsonatypeUsername="${sonatypeUsername}" -PsonatypePassword="${sonatypePassword}" candidate codeCoverageReport coveralls --info --stacktrace
     ;;
   *)
-    ./gradlew -Prelease.travisci=true -Prelease.useLastTag=true -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PsonatypeUsername="${sonatypeUsername}" -PsonatypePassword="${sonatypePassword}" final --info --stacktrace
+    ./gradlew -Prelease.travisci=true -Prelease.useLastTag=true -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PsonatypeUsername="${sonatypeUsername}" -PsonatypePassword="${sonatypePassword}" final codeCoverageReport coveralls --info --stacktrace
     ;;
   esac
 else
   echo -e 'WARN: Should not be here => Branch ['$TRAVIS_BRANCH']  Tag ['$TRAVIS_TAG']  Pull Request ['$TRAVIS_PULL_REQUEST']'
-  ./gradlew build
+  ./gradlew build codeCoverageReport coveralls
 fi
+