From b494cd9de6002c59b7181cefab6854b9a0c88817 Mon Sep 17 00:00:00 2001
From: Jun Rao <junrao@gmail.com>
Date: Wed, 12 Feb 2014 08:22:51 -0800
Subject: [PATCH] kafka-1244,kafka-1246,kafka-1249; various gradle issues for
 release; patched by Jun Rao; reviewed by Neha Narkhede

---
 README.md       |  5 ++---
 build.gradle    | 37 ++++++++++++++++++++++++++++++++++---
 scala.gradle    |  5 +++++
 settings.gradle |  1 +
 4 files changed, 42 insertions(+), 6 deletions(-)
 create mode 100644 scala.gradle

diff --git a/README.md b/README.md
index 9b272b52c8b..e3fea22fe10 100644
--- a/README.md
+++ b/README.md
@@ -17,9 +17,8 @@
 See our [web site](http://kafka.apache.org) for details on the project.
 
 ## Building a jar and running it ##
-1. ./gradlew copyDependantLibs
-2. ./gradlew jar
-3. Follow instuctions in http://kafka.apache.org/documentation.html#quickstart
+1. ./gradlew jar
+2. Follow instuctions in http://kafka.apache.org/documentation.html#quickstart
 
 ## Running unit tests ##
 ./gradlew test
diff --git a/build.gradle b/build.gradle
index fd519d68072..9489914db19 100644
--- a/build.gradle
+++ b/build.gradle
@@ -28,6 +28,7 @@ allprojects {
 }
 
 apply from: file('gradle/license.gradle')
+apply from: file('scala.gradle')
 
 subprojects {
   apply plugin: 'java'
@@ -113,7 +114,7 @@ project(':core') {
   println "Building project 'core' with Scala version $scalaVersion"
 
   apply plugin: 'scala'
-  archivesBaseName = "kafka_${scalaVersion}"
+  archivesBaseName = "kafka_${baseScalaVersion}"
 
   def (major, minor, trivial) = scalaVersion.tokenize('.')
 
@@ -178,7 +179,6 @@ project(':core') {
   tasks.create(name: "releaseTarGz", dependsOn: configurations.archives.artifacts, type: Tar) { 
     into "."
     compression = Compression.GZIP 
-    classifier = 'dist'
     from(project.file("../bin")) { into "bin/" }
     from(project.file("../config")) { into "config/" }
     from '../LICENSE'
@@ -186,6 +186,12 @@ project(':core') {
     from(configurations.runtime) { into("libs/") }
     from(configurations.archives.artifacts.files) { into("libs/") }
   }
+  
+  jar {
+    dependsOn 'copyDependantLibs'
+    from '../LICENSE'
+    from '../NOTICE'
+  }
 
   task testJar(type: Jar) {
     appendix = 'test'
@@ -204,7 +210,7 @@ project(':perf') {
   println "Building project 'perf' with Scala version $scalaVersion"
 
   apply plugin: 'scala'
-  archivesBaseName = "kafka-perf_${scalaVersion}"
+  archivesBaseName = "kafka-perf_${baseScalaVersion}"
 
   dependencies {
     compile project(':core')
@@ -213,6 +219,11 @@ project(':perf') {
 
     zinc 'com.typesafe.zinc:zinc:0.2.5'
   }
+
+  jar {
+    from '../LICENSE'
+    from '../NOTICE'
+  }
 }
 
 project(':contrib:hadoop-consumer') {
@@ -238,6 +249,11 @@ project(':contrib:hadoop-consumer') {
     compile.exclude module: 'mail'
     compile.exclude module: 'netty'
   }
+
+  jar {
+    from '../LICENSE'
+    from '../NOTICE'
+  }
 }
 
 project(':contrib:hadoop-producer') {
@@ -263,6 +279,11 @@ project(':contrib:hadoop-producer') {
     compile.exclude module: 'mail'
     compile.exclude module: 'netty'
   }
+
+  jar {
+    from '../LICENSE'
+    from '../NOTICE'
+  }
 }
 
 project(':examples') {
@@ -271,6 +292,11 @@ project(':examples') {
   dependencies {
     compile project(':core')
   }
+
+  jar {
+    from '../LICENSE'
+    from '../NOTICE'
+  }
 }
 
 project(':clients') {
@@ -280,6 +306,11 @@ project(':clients') {
     testCompile 'com.novocode:junit-interface:0.9'
   }
 
+  jar {
+    from '../LICENSE'
+    from '../NOTICE'
+  }
+
   task testJar(type: Jar) {
     appendix = 'test'
     from sourceSets.test.output
diff --git a/scala.gradle b/scala.gradle
new file mode 100644
index 00000000000..ebd21b870c0
--- /dev/null
+++ b/scala.gradle
@@ -0,0 +1,5 @@
+if (!hasProperty('scalaVersion')) {
+  ext.scalaVersion = '2.8.0'
+}
+ext.defaultScalaVersion = '2.8.0'
+ext.baseScalaVersion = (scalaVersion.startsWith('2.10')) ? '2.10' : scalaVersion
diff --git a/settings.gradle b/settings.gradle
index 74e591a8a4a..6041784d6f8 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -13,4 +13,5 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+apply from: file('scala.gradle')
 include 'core', 'perf', 'contrib:hadoop-consumer', 'contrib:hadoop-producer', 'examples', 'clients'