git commit: SAMZA-52; cleaning up build.gradle to allow for custom overrides. also fixing jacoco and idea plugin issues.

[cr...@apache.org]

Updated Branches:
  refs/heads/master 7bbde2cc2 -> 79a4376d0


SAMZA-52; cleaning up build.gradle to allow for custom overrides. also fixing jacoco and idea plugin issues.


Project: http://git-wip-us.apache.org/repos/asf/incubator-samza/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-samza/commit/79a4376d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-samza/tree/79a4376d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-samza/diff/79a4376d

Branch: refs/heads/master
Commit: 79a4376d09e4a8187571f8ac65e41dc75e2aea18
Parents: 7bbde2c
Author: Chris Riccomini <cr...@criccomi-mn.linkedin.biz>
Authored: Mon Oct 7 12:46:02 2013 -0700
Committer: Chris Riccomini <cr...@criccomi-mn.linkedin.biz>
Committed: Mon Oct 7 12:46:02 2013 -0700

----------------------------------------------------------------------
 build.gradle              | 14 ++++++++++----
 gradle.properties         |  1 +
 gradle/environment.gradle | 14 ++++++++++++++
 gradle/maven.gradle       |  1 -
 4 files changed, 25 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/79a4376d/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index cb96683..1482ea9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,17 +19,23 @@ allprojects {
 }
 
 apply from: file('gradle/license.gradle')
-apply from: file('gradle/maven.gradle')
+apply from: file('gradle/environment.gradle')
 apply from: file("gradle/dependency-versions.gradle")
 apply from: file("gradle/dependency-versions-scala-" + scalaVersion + ".gradle")
 
-subprojects {
-  group = "org.apache.samza"
+allprojects {
+  apply plugin: 'idea'
+}
 
+subprojects {
   apply plugin: 'jacoco'
   apply plugin: 'eclipse'
-  apply plugin: 'idea'
   apply plugin: 'project-report'
+
+  // Required for now, becaues of GRADLE-2917.
+  dependencies {
+    jacocoAgent "org.jacoco:org.jacoco.agent:${jacoco.toolVersion}"
+  }
 }
 
 project(':samza-api') {

http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/79a4376d/gradle.properties
----------------------------------------------------------------------
diff --git a/gradle.properties b/gradle.properties
index f7730b1..ed6390b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,4 @@
+group=org.apache.samza
 version=0.7.0
 scalaVersion=2.9.2
 yarnVersion=2.0.5-alpha

http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/79a4376d/gradle/environment.gradle
----------------------------------------------------------------------
diff --git a/gradle/environment.gradle b/gradle/environment.gradle
new file mode 100644
index 0000000..07541c4
--- /dev/null
+++ b/gradle/environment.gradle
@@ -0,0 +1,14 @@
+/*
+ * This script allows the Gradle environment to be overridden with custom 
+ * settings. This is useful in environments (such as a private company) where a 
+ * third party wishes to use custom repositories, or inject certain 
+ * functionality into the default Gradle build lifecycle. 
+ */
+
+if(!project.hasProperty('overrideBuildEnvironment')) {
+  // If overrideBuildEnvironment is not set, then just use the default environment.
+  apply from: file('gradle/maven.gradle')
+} else {
+  // Otherwise, assume overrideBuildEnvironment defines a path to a file, and apply it.
+  apply from: project.overrideBuildEnvironment
+} 

http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/79a4376d/gradle/maven.gradle
----------------------------------------------------------------------
diff --git a/gradle/maven.gradle b/gradle/maven.gradle
index 3613879..fd54fad 100644
--- a/gradle/maven.gradle
+++ b/gradle/maven.gradle
@@ -8,7 +8,6 @@ subprojects {
 
         if(project.name == 'samza-shell') {
           artifact shellTarGz {
-            group "org.apache.samza"
             name "samza-shell"
             classifier "dist"
           }