ship cassandra-stress jar with elassandra (strapdata#19)

* integrate cassandra ant into gradle
* add a CASSANDRA_JAVA_HOME var to select the jdk used to build cassandra 
* fix packaging filterhack applied to wrong binary files
* update contributing doc
* update cassandra submodule

Author: DBarthe

.travis.yml

@@ -6,6 +6,8 @@ env:
     - LATEST_VERSION=6.2.3
     # Make sure gcloud command is on our PATH and the App Engine SDK is in the Python path
     - GAE_PYTHONPATH=${HOME}/.cache/google_appengine PATH=$PATH:${HOME}/google-cloud-sdk/bin PYTHONPATH=${PYTHONPATH}:${GAE_PYTHONPATH} CLOUDSDK_CORE_DISABLE_PROMPTS=1
+    # jdk used to build some cassandra artifacts
+    - CASSANDRA_JAVA_HOME=/usr/lib/jvm/java-8-oracle
 
 language: 
   - java
@@ -38,7 +40,7 @@ matrix:
 
 install: ./gradlew --version
 
-script: 
+script:
 - ./gradlew server:test -Dbuild.snapshot=false
 - ./gradlew assemble -Dbuild.snapshot=false
 

CONTRIBUTING.md

@@ -52,9 +52,18 @@ When cloning Elassandra, use **git clone --recurse-submodules https://github.com
 
 If you forgot the **--recurse-submodules** when cloning, you can also fetch the cassandra submodule with **git submodule update --init** and **git checkout cassandra-3.x-strapdata** to set the strapdata branch.
 
-Then, to build from sources:
-* Elassandra v5.x: run **mvn clean packages -DskipTests**.
-* Elassandra v6.x: run **gradle clean distribution:deb:assemble -Dbuild.snapshot=false**.
+Then, to build from sources: 
+
+* Elassandra v5.x:
+
+      gradle clean assemble -Dbuild.snapshot=false
+    
+    
+* Elassandra v6.x:
+      
+      export JAVA_HOME=/path/to/jdk-10
+      export CASSANDRA_JAVA_HOME=/path/to/jdk-8
+      ./gradlew clean assemble -Dbuild.snapshot=false
 
 Note: For elassandra v6.X, javadoc task failed due to [https://bugs.java.com/bugdatabase/view_bug.do?bug_id=8194281](https://bugs.java.com/bugdatabase/view_bug.do?bug_id=8194281).
 

build.gradle

@@ -39,6 +39,7 @@ plugins {
   id 'com.github.jk1.dependency-license-report' version '1.3'
 }
 
+apply plugin:'base'
 apply plugin: 'com.github.jk1.dependency-license-report'
 
 licenseReport {
@@ -566,3 +567,15 @@ gradle.projectsEvaluated {
     }
   }
 }
+
+
+gradle.projectsEvaluated {
+// import ant tasks from cassandra
+  ant.importBuild('server/cassandra/build.xml') { antTargetName ->
+    'cassandra-' + antTargetName
+  }
+
+  ant.setProperty("javac.executable", project.cassandraJavaHome + "/bin/javac")
+}
+
+tasks.getByName('clean').dependsOn('cassandra-realclean')

buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy

@@ -59,6 +59,9 @@ class BuildPlugin implements Plugin<Project> {
 
     static final JavaVersion minimumRuntimeVersion = JavaVersion.VERSION_1_8
     static final JavaVersion minimumCompilerVersion = JavaVersion.VERSION_1_9
+    static final JavaVersion minimumCassandraVersion = JavaVersion.VERSION_1_8
+    static final JavaVersion maximumCassandraVersion = JavaVersion.VERSION_1_8
+
 
     @Override
     void apply(Project project) {
@@ -86,6 +89,7 @@ class BuildPlugin implements Plugin<Project> {
         configureJavadoc(project)
         configureSourcesJar(project)
         configurePomGeneration(project)
+        configureCassandraStress(project)
 
         configureTest(project)
         configurePrecommit(project)
@@ -97,6 +101,7 @@ class BuildPlugin implements Plugin<Project> {
         if (project.rootProject.ext.has('buildChecksDone') == false) {
             String compilerJavaHome = findCompilerJavaHome()
             String runtimeJavaHome = findRuntimeJavaHome(compilerJavaHome)
+            String cassandraJavaHome = findCassandraJavaHome(runtimeJavaHome)
             File gradleJavaHome = Jvm.current().javaHome
             String javaVendor = System.getProperty('java.vendor')
             String javaVersion = System.getProperty('java.version')
@@ -117,19 +122,28 @@ class BuildPlugin implements Plugin<Project> {
                 runtimeJavaVersionEnum = JavaVersion.toVersion(findJavaSpecificationVersion(project, runtimeJavaHome))
             }
 
+            String cassandraJavaVersionDetails = gradleJavaVersionDetails
+            JavaVersion cassandraJavaVersionEnum = JavaVersion.current()
+            if (new File(cassandraJavaHome).canonicalPath != gradleJavaHome.canonicalPath) {
+                cassandraJavaVersionDetails = findJavaVersionDetails(project, cassandraJavaHome)
+                cassandraJavaVersionEnum = JavaVersion.toVersion(findJavaSpecificationVersion(project, cassandraJavaHome))
+            }
+
             // Build debugging info
             println '======================================='
             println 'Elasticsearch Build Hamster says Hello!'
             println '======================================='
             println "  Gradle Version        : ${project.gradle.gradleVersion}"
             println "  OS Info               : ${System.getProperty('os.name')} ${System.getProperty('os.version')} (${System.getProperty('os.arch')})"
-            if (gradleJavaVersionDetails != compilerJavaVersionDetails || gradleJavaVersionDetails != runtimeJavaVersionDetails) {
+            if (gradleJavaVersionDetails != compilerJavaVersionDetails || gradleJavaVersionDetails != runtimeJavaVersionDetails || gradleJavaVersionDetails != cassandraJavaVersionDetails) {
                 println "  JDK Version (gradle)  : ${gradleJavaVersionDetails}"
                 println "  JAVA_HOME (gradle)    : ${gradleJavaHome}"
                 println "  JDK Version (compile) : ${compilerJavaVersionDetails}"
                 println "  JAVA_HOME (compile)   : ${compilerJavaHome}"
                 println "  JDK Version (runtime) : ${runtimeJavaVersionDetails}"
                 println "  JAVA_HOME (runtime)   : ${runtimeJavaHome}"
+                println "  JDK Version (cassandra) : ${cassandraJavaVersionDetails}"
+                println "  JAVA_HOME (cassandra)   : ${cassandraJavaHome}"
             } else {
                 println "  JDK Version           : ${gradleJavaVersionDetails}"
                 println "  JAVA_HOME             : ${gradleJavaHome}"
@@ -153,10 +167,16 @@ class BuildPlugin implements Plugin<Project> {
                 throw new GradleException("Java ${minimumRuntimeVersion} or above is required to run Elasticsearch")
             }
 
+            if (cassandraJavaVersionEnum < minimumCassandraVersion || cassandraJavaVersionEnum > maximumCassandraVersion) {
+                throw new GradleException("Java ${minimumCassandraVersion} is required to build cassandra")
+            }
+
             project.rootProject.ext.compilerJavaHome = compilerJavaHome
             project.rootProject.ext.runtimeJavaHome = runtimeJavaHome
+            project.rootProject.ext.cassandraJavaHome = cassandraJavaHome
             project.rootProject.ext.compilerJavaVersion = compilerJavaVersionEnum
             project.rootProject.ext.runtimeJavaVersion = runtimeJavaVersionEnum
+            project.rootProject.ext.cassandraJavaVersion = cassandraJavaVersionEnum
             project.rootProject.ext.buildChecksDone = true
         }
 
@@ -188,6 +208,12 @@ class BuildPlugin implements Plugin<Project> {
         return System.getenv('RUNTIME_JAVA_HOME') ?: compilerJavaHome
     }
 
+    private static String findCassandraJavaHome(final String runtimeJavaHome) {
+        assert runtimeJavaHome != null
+        return System.getenv('CASSANDRA_JAVA_HOME') ?: runtimeJavaHome
+    }
+
+
     /** Finds printable java version of the given JAVA_HOME */
     private static String findJavaVersionDetails(Project project, String javaHome) {
         String versionInfoScript = 'print(' +
@@ -519,6 +545,10 @@ class BuildPlugin implements Plugin<Project> {
         project.assemble.dependsOn(sourcesJarTask)
     }
 
+    static void configureCassandraStress(Project project) {
+      project.assemble.dependsOn(':cassandra-stress-jar')
+    }
+
     /** Adds additional manifest info to jars */
     static void configureJars(Project project) {
         project.ext.licenseFile = null

distribution/build.gradle

@@ -133,7 +133,6 @@ task customClean(type: Delete) {
 }
 clean.dependsOn customClean
 
-
 configure(distributions) {
   /*****************************************************************************
    *                            Rest test config                               *
@@ -233,7 +232,6 @@ configure(distributions) {
 
     pylibFiles = copySpec {
       from '../../server/cassandra/pylib'
-      MavenFilteringHack.filter(it, expansions)
     }
 
 	cassandraLicenseFiles = copySpec {
@@ -242,17 +240,17 @@ configure(distributions) {
 
     sigarFiles = copySpec {
       from '../../server/cassandra/lib/sigar-bin'
-      eachFile { it.setMode(0755) }
-      MavenFilteringHack.filter(it, expansions)
     }
 
     toolsFiles = copySpec {
       from '../../server/cassandra/tools'
       exclude 'stress/**'
       eachFile { it.setMode(0755) }
-      MavenFilteringHack.filter(it, expansions)
     }
 
+    stressFiles = copySpec {
+      from '../../server/cassandra/build/tools'
+    }
 
     commonFiles = copySpec {
       from rootProject.projectDir
@@ -355,6 +353,7 @@ configure(distributions.findAll { ['zip', 'tar', 'integ-test-zip'].contains(it.n
       }
       into('tools') {
         with toolsFiles
+        with stressFiles
       }
       into('') {
         from {
@@ -580,6 +579,7 @@ configure(distributions.findAll { ['deb', 'rpm'].contains(it.name) }) {
       into('tools') {
         with copySpec {
           with toolsFiles
+          with stressFiles
           exclude 'bin/*.bat'
           exclude 'bin/*.exe'
           exclude 'bin/*.ps1'