Fixed issue with GString in matrix params

Changed wrapper to Gradle 0.9.2
Removed repo-init.gradle and made init.gradle the default
Made init.gradle download latest snapshot of Artifactory plugin
Removed Wharf specific switch in gradlew scripts
Made the artifactory convention configuration unique (no diff CI or no CI)

Author: Fred Simon

Diff for: README.txt

@@ -1,4 +1,9 @@
 
-* How to build
-gradle --init-script buildSrc/repo-init.gradle -S build
+* How to build (with gradle 0.9.2 or above)
+gradle -I init.gradle -S build
+
+or with the wrapper in *nix
+./gradlew -I init.gradle -S build
+and wrapper in Windows
+gradlew.bat -I init.gradle -S build
 

Diff for: build-info-extractor-gradle/src/main/groovy/org/jfrog/build/extractor/gradle/BuildInfoRecorderTask.java

@@ -35,12 +35,7 @@
 import org.gradle.api.logging.LogLevel;
 import org.gradle.api.logging.Logger;
 import org.gradle.api.logging.Logging;
-import org.gradle.api.tasks.InputFile;
-import org.gradle.api.tasks.InputFiles;
-import org.gradle.api.tasks.Optional;
-import org.gradle.api.tasks.TaskAction;
-import org.gradle.api.tasks.TaskContainer;
-import org.gradle.api.tasks.Upload;
+import org.gradle.api.tasks.*;
 import org.gradle.util.ConfigureUtil;
 import org.jfrog.build.api.Build;
 import org.jfrog.build.api.util.FileChecksumCalculator;
@@ -81,21 +76,29 @@ public class BuildInfoRecorderTask extends DefaultTask {
     @Optional
     private Set<Configuration> publishConfigurations = Sets.newHashSet();
 
+    @Input
+    private final Multimap<String, String> properties = HashMultimap.create();
+
     private boolean lastInGraph = false;
-    private final Multimap<String, String> props = HashMultimap.create();
+
     private Map<String, String> propsToAdd;
 
     public void setLastInGraph(boolean lastInGraph) {
         this.lastInGraph = lastInGraph;
     }
 
     public void setProperties(Map<String, String> props) {
-        if (props == null) {
+        if (props == null || props.isEmpty()) {
             return;
         }
         for (Map.Entry<String, String> entry : props.entrySet()) {
-            if (StringUtils.isNotBlank(entry.getKey())) {
-                this.props.put(entry.getKey(), entry.getValue());
+            String key = entry.getKey();
+            if (StringUtils.isNotBlank(key)) {
+                String value = entry.getValue();
+                if (value != null) {
+                    // Make sure all GString are now Java Strings
+                    this.properties.put(key.toString(), value.toString());
+                }
             }
         }
     }
@@ -267,7 +270,7 @@ private void uploadDescriptorsAndArtifacts(Set<GradleDeployDetails> allDeployabl
         Map<String, String> params = clientConf.publisher.getMatrixParams();
         for (Map.Entry<String, String> entry : params.entrySet()) {
             if (StringUtils.isNotBlank(entry.getKey())) {
-                props.put(entry.getKey(), entry.getValue());
+                properties.put(entry.getKey(), entry.getValue());
             }
         }
         Set<GradleDeployDetails> deployDetailsFromProject = getDeployArtifactsProject();
@@ -486,13 +489,15 @@ private Set<GradleDeployDetails> getDeployArtifactsProject() {
     private Map<String, String> getPropsToAdd() {
         if (this.propsToAdd == null) {
             this.propsToAdd = Maps.newHashMap();
-            for (Map.Entry<String, String> entry : props.entries()) {
-                if (!this.propsToAdd.containsKey(entry.getKey())) {
-                    this.propsToAdd.put(entry.getKey(), entry.getValue());
+            for (Map.Entry<String, String> entry : properties.entries()) {
+                // Make sure all GString are now Java Strings
+                String key = entry.getKey().toString();
+                String value = entry.getValue().toString();
+                if (!this.propsToAdd.containsKey(key)) {
+                    this.propsToAdd.put(key, value);
                 } else {
-                    String value = this.propsToAdd.get(entry.getKey());
-                    value = value + ", " + entry.getValue();
-                    this.propsToAdd.put(entry.getKey(), value);
+                    value = this.propsToAdd.get(key) + ", " + value;
+                    this.propsToAdd.put(key, value);
                 }
             }
             ArtifactoryClientConfiguration configuration = getArtifactoryClientConfiguration(getProject());

Diff for: build.gradle

@@ -24,25 +24,20 @@ baseProjectNames = ['build-info-api', 'build-info-client', 'build-info-extractor
 
 allprojects {
     apply plugin: 'idea'
-    //apply plugin: 'artifactory'
+    if (!ciBuild()) {
+        apply plugin: 'artifactory'
+    }
     group = 'org.jfrog.buildinfo'
 }
 
-if (!ciBuild()) {
-    artifactory {
-        contextUrl = 'http://repo.jfrog.org/artifactory'
-        projectPublish {
-            publishConfigs('archives', 'published')
-        }
-        resolve {
-            repoKey = 'gradle'
-        }
+artifactory {
+    contextUrl = 'http://repo.jfrog.org/artifactory'
+    projectPublish {
+        publishConfigs('archives', 'published')
+        properties = ['build.status': "$it.project.status".toString()]
     }
-} else {
-    artifactory {
-        projectPublish {
-            publishConfigs('archives', 'published')
-        }
+    resolve {
+        repoKey = 'gradle'
     }
 }
 
@@ -62,9 +57,7 @@ subprojects {
     buildInfoVersion = new Version(rootProject, baseProjectNames)
 
     configurations {
-        published {
-            extendsFrom archives
-        }
+        published
     }
 
     dependencies {

Diff for: buildSrc/repo-init.gradle

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://repo.jfrog.org/artifactory/distributions/org/gradle/gradle-0.9.1-20110224063219-bin.zip
+distributionUrl=http\://repo.gradle.org/gradle/distributions/gradle-0.9.2-bin.zip

Diff for: gradle/wrapper/gradle-wrapper.properties

@@ -144,6 +144,4 @@ GRADLE_APP_BASE_NAME=`basename "$0"`
         -Dorg.gradle.appname="$GRADLE_APP_BASE_NAME" \
         -Dorg.gradle.wrapper.properties="$WRAPPER_PROPERTIES" \
         $STARTER_MAIN_CLASS \
-        --wharf \
-	--init-script "$REPO_INIT_SCRIPT" \
         "$@"

Diff for: gradlew

@@ -103,12 +103,11 @@ set CMD_LINE_ARGS=%$
 set STARTER_MAIN_CLASS=org.gradle.wrapper.GradleWrapperMain
 set CLASSPATH=%DIRNAME%\gradle\wrapper\gradle-wrapper.jar
 set WRAPPER_PROPERTIES=%DIRNAME%\gradle\wrapper\gradle-wrapper.properties
-set REPO_INIT_SCRIPT=%DIRNAME%\buildSrc\repo-init.gradle
 set JAVA_EXE=%JAVA_HOME%\bin\java.exe
 
 set GRADLE_OPTS=%JAVA_OPTS% %GRADLE_OPTS% -Dorg.gradle.wrapper.properties="%WRAPPER_PROPERTIES%"
 
-"%JAVA_EXE%" %GRADLE_OPTS% -classpath "%CLASSPATH%" %STARTER_MAIN_CLASS% --wharf --init-script %REPO_INIT_SCRIPT% %CMD_LINE_ARGS%
+"%JAVA_EXE%" %GRADLE_OPTS% -classpath "%CLASSPATH%" %STARTER_MAIN_CLASS% %CMD_LINE_ARGS%
 
 :end
 @rem End local scope for the variables with windows NT shell

Diff for: gradlew.bat

@@ -1,6 +1,8 @@
-def artifactoryPluginUrl = 'http://repo.jfrog.org/artifactory/libs-releases/org/jfrog/buildinfo/build-info-extractor-gradle/2.0.0/build-info-extractor-gradle-2.0.0-uber.jar'
+String pluginVersion='2.0.x-20110503.140016-63'
+def artifactoryPluginUrl = "http://repo.jfrog.org/artifactory/gradle-plugins-snapshots/org/jfrog/buildinfo/build-info-extractor-gradle/2.0.x-SNAPSHOT/build-info-extractor-gradle-$pluginVersion-uber.jar"
+//def artifactoryPluginUrl = "http://repo.jfrog.org/artifactory/libs-releases/org/jfrog/buildinfo/build-info-extractor-gradle/$pluginVersion/build-info-extractor-gradle-$pluginVersion-uber.jar"
 
-def file = new File(gradle.gradleUserHomeDir, 'artifactory-tmp/artifactory-uber.jar')
+def file = new File(gradle.gradleUserHomeDir, "plugins/artifactory-$pluginVersion-uber.jar")
 if (!file.exists()) {
     file.parentFile.mkdirs()
     println "Downloading the latest Artifactory plugin to '$file.absolutePath'..."