Added uber jar function

Author: freds

build.gradle

@@ -30,12 +30,16 @@ def baseProjects() {
     subprojects.findAll { p -> baseProjectNames.contains(p.name) }
 }
 
+def extractorProjects() {
+    subprojects.findAll { p -> !baseProjectNames.contains(p.name) }
+}
+
 subprojects {
     apply plugin: 'maven'
     apply plugin: 'java'
     sourceCompatibility = 1.5
     targetCompatibility = 1.5
-    buildInfoVersion = new Version(rootProject, '1.4.9', false, baseProjectNames)
+    buildInfoVersion = new Version(rootProject, baseProjectNames)
     artifactId = "build-info-$name"
 
     dependencies {
@@ -58,11 +62,42 @@ configure(baseProjects()) {
     test.useTestNG()
 }
 
-/*
-configure(extractorProjects()) { p ->
-    version = new Version(p)
+configure(extractorProjects()) {
+    configurations {
+        tools
+        uberJar {
+            description = 'All jar that should be included in the Uber Jar'
+            transitive = true
+        }
+        compile {
+            extendsFrom uberJar
+        }
+    }
+
+    dependencies {
+        tools group: 'com.tonicsystems.jarjar', name: 'jarjar-plugin', version: '1.0'
+    }
+
+    task jarAll(type: Jar, dependsOn: jar) {
+      inputs.files jar.archivePath
+      classifier = 'uber'
+      doLast {
+        project.ant {
+          taskdef name: "jarjar", classname: "com.tonicsystems.jarjar.JarJarTask", classpath: configurations.tools.asPath
+          jarjar(jarfile: archivePath) {
+            zipfileset(src: jar.archivePath)
+            configurations.uberJar.files.each {jarjarFile ->
+              zipfileset(src: jarjarFile)
+            }
+          }
+        }
+      }
+    }
+
+    artifacts {
+      archives jarAll
+    }
 }
-*/
 
 project('api') {
     description = 'JFrog Build-Info API'
@@ -86,12 +121,12 @@ project('extractor') {
 }
 
 project('extractor-ivy') {
-    version = new Version(project, '1.0.5', false)
+    version = new Version(project)
     description = 'JFrog Build-Info Ivy Extractor'
     dependencies {
-        compile project(':extractor')
-        compile "org.slf4j:slf4j-api:1.5.8"
-        compile "org.aspectj:aspectjweaver:1.6.9"
+        uberJar project(':extractor')
+        uberJar "org.slf4j:slf4j-api:1.5.8"
+        uberJar "org.aspectj:aspectjweaver:1.6.9"
         compile("com.google.code.findbugs:jsr305:1.3.9") {
             provided: true
         }
@@ -107,12 +142,12 @@ project('extractor-ivy') {
 project('extractor-gradle') {
     apply plugin: 'groovy'
 
-    version = new Version(project, '1.0.6', false)
+    version = new Version(project)
     description = 'JFrog Build-Info Gradle Extractor'
 
     dependencies {
         compile gradleApi()
-        compile project(':extractor')
+        uberJar project(':extractor')
         compile("org.codehaus.plexus:plexus-component-annotations:1.5.4") {
             provided: true
         }
@@ -133,11 +168,11 @@ project('extractor-gradle') {
 }
 
 project('extractor-maven3') {
-    version = new Version(project, '1.0.4', false)
+    version = new Version(project)
     description = 'JFrog Build-Info Maven 3 Extractor'
 
     dependencies {
-        compile project(':extractor')
+        uberJar project(':extractor')
         compile("org.codehaus.plexus:plexus-component-annotations:1.5.4") {
             provided: true
         }

buildSrc/src/main/groovy/org/jfrog/build/Version.groovy

@@ -9,13 +9,13 @@ class Version {
     Date buildTime
     Boolean release = null
 
-    def Version(Project project, String versionNumber, boolean isRelease) {
-        this(project, versionNumber, isRelease, null)
+    def Version(Project project) {
+        this(project, null)
     }
 
-    def Version(Project project, String versionNumber, boolean isRelease, List<String> subProjects) {
-        this.versionNumber = versionNumber
-        this.release = isRelease
+    def Version(Project project, List<String> subProjects) {
+        this.versionNumber = project.getProperty("${project.name}-version")
+        this.release = Boolean.valueOf(project.getProperty("${project.name}-release"))
         File timestampFile = new File(project.buildDir, 'timestamp.txt')
         if (timestampFile.isFile()) {
             boolean uptodate = true

gradle.properties

@@ -1,3 +1,8 @@
-previousVersion=1.4.8
-nextVersion=1.4.9
-isRelease=false
+build-info-version=1.4.9
+build-info-release=false
+extractor-ivy-version=1.0.5
+extractor-ivy-release=false
+extractor-gradle-version=1.0.6
+extractor-gradle-release=false
+extractor-maven3-version=1.0.4
+extractor-maven3-release=false