BI-162 - Added vcsUrl to capture the version control URL (in addition to the existing vcsRevision)

liorhson · liorhson · commit dd8dd111c182 · 2014-03-27T11:32:58.000+02:00
diff --git a/build-info-api/src/main/java/org/jfrog/build/api/Build.java b/build-info-api/src/main/java/org/jfrog/build/api/Build.java
@@ -51,6 +51,8 @@ public class Build extends BaseBuildBean {
     private String parentName;
     private String parentNumber;
     private String vcsRevision;
+    private String vcsUrl;
+
     @Deprecated
     private String parentBuildId;
 
@@ -177,6 +179,24 @@ public void setVcsRevision(String vcsRevision) {
         this.vcsRevision = vcsRevision;
     }
 
+    /**
+     * Returns the vcs URL (format is vcs specific)
+     *
+     * @return The vcs URL
+     */
+    public String getVcsUrl() {
+        return vcsUrl;
+    }
+
+    /**
+     * Sets the vcs URL (format is vcs specific)
+     *
+     * @param vcsUrl The vcs URL
+     */
+    public void setVcsUrl(String vcsUrl) {
+        this.vcsUrl = vcsUrl;
+    }
+
     /**
      * Returns the type of the build
      *
@@ -351,7 +371,7 @@ public String getParentBuildId() {
      *
      * @param parentBuildId Build parent build ID
      * @deprecated Use {@link org.jfrog.build.api.Build#setParentName(String)} and {@link Build#setParentNumber(String)}
-     *             instead.
+     * instead.
      */
     @Deprecated
     public void setParentBuildId(String parentBuildId) {
diff --git a/build-info-api/src/main/java/org/jfrog/build/api/BuildInfoFields.java b/build-info-api/src/main/java/org/jfrog/build/api/BuildInfoFields.java
@@ -26,6 +26,7 @@ public interface BuildInfoFields {
     String BUILD_PARENT_NAME = "build.parentName";
     String BUILD_PARENT_NUMBER = "build.parentNumber";
     String VCS_REVISION = "vcs.revision";
+    String VCS_URL = "vcs.url";
     String PRINCIPAL = "principal";
     String BUILD_URL = "buildUrl";
     String BUILD_AGENT_NAME = "buildAgent.name";
diff --git a/build-info-api/src/main/java/org/jfrog/build/api/builder/BuildInfoBuilder.java b/build-info-api/src/main/java/org/jfrog/build/api/builder/BuildInfoBuilder.java
@@ -18,16 +18,7 @@
 
 import com.google.common.collect.Lists;
 import org.apache.commons.lang.StringUtils;
-import org.jfrog.build.api.Agent;
-import org.jfrog.build.api.BlackDuckProperties;
-import org.jfrog.build.api.Build;
-import org.jfrog.build.api.BuildAgent;
-import org.jfrog.build.api.BuildRetention;
-import org.jfrog.build.api.BuildType;
-import org.jfrog.build.api.Governance;
-import org.jfrog.build.api.Issues;
-import org.jfrog.build.api.LicenseControl;
-import org.jfrog.build.api.Module;
+import org.jfrog.build.api.*;
 import org.jfrog.build.api.release.PromotionStatus;
 
 import java.text.SimpleDateFormat;
@@ -56,6 +47,7 @@ public class BuildInfoBuilder {
     private String parentName;
     private String parentNumber;
     private String vcsRevision;
+    private String vcsUrl;
     private List<Module> modules;
     private List<PromotionStatus> statuses;
     private Properties properties;
@@ -104,6 +96,7 @@ public Build build() {
         build.setStatuses(statuses);
         build.setProperties(properties);
         build.setVcsRevision(vcsRevision);
+        build.setVcsUrl(vcsUrl);
         build.setLicenseControl(licenseControl);
         build.setBuildRetention(buildRetention);
         build.setIssues(issues);
@@ -278,6 +271,17 @@ public BuildInfoBuilder vcsRevision(String vcsRevision) {
         return this;
     }
 
+    /**
+     * Sets the vcs revision (format is vcs specific)
+     *
+     * @param vcsUrl The vcs revision
+     * @return Builder instance
+     */
+    public BuildInfoBuilder vcsUrl(String vcsUrl) {
+        this.vcsUrl = vcsUrl;
+        return this;
+    }
+
     /**
      * Sets the modules of the build
      *
diff --git a/build-info-api/src/main/java/org/jfrog/build/api/builder/BuildInfoMavenBuilder.java b/build-info-api/src/main/java/org/jfrog/build/api/builder/BuildInfoMavenBuilder.java
@@ -50,6 +50,7 @@ public class BuildInfoMavenBuilder {
     private String parentName;
     private String parentNumber;
     private String vcsRevision;
+    private String vcsUrl;
     private List<Module> modules;
     private List<PromotionStatus> statuses;
     private Properties properties;
@@ -98,6 +99,7 @@ public Build build() {
         build.setStatuses(statuses);
         build.setProperties(properties);
         build.setVcsRevision(vcsRevision);
+        build.setVcsUrl(vcsUrl);
         build.setLicenseControl(licenseControl);
         build.setBuildRetention(buildRetention);
         build.setIssues(issues);
@@ -272,6 +274,17 @@ public BuildInfoMavenBuilder vcsRevision(String vcsRevision) {
         return this;
     }
 
+    /**
+     * Sets the vcs URL (format is vcs specific)
+     *
+     * @param vcsUrl The vcs revision
+     * @return Builder instance
+     */
+    public BuildInfoMavenBuilder vcsUrl(String vcsUrl) {
+        this.vcsUrl = vcsUrl;
+        return this;
+    }
+
     /**
      * Sets the modules of the build
      *
diff --git a/build-info-client/src/main/java/org/jfrog/build/client/ArtifactoryClientConfiguration.java b/build-info-client/src/main/java/org/jfrog/build/client/ArtifactoryClientConfiguration.java
@@ -93,7 +93,7 @@ public Map<String, String> getAllRootConfig() {
     }
 
     public void persistToPropertiesFile() {
-        if ( StringUtils.isEmpty( getPropertiesFile())) {
+        if (StringUtils.isEmpty(getPropertiesFile())) {
             return;
         }
         Predicate<String> nonNullPredicate = new Predicate<String>() {
@@ -278,28 +278,28 @@ public String getSnapshotRepoKey() {
             return getStringValue(SNAPSHOT_REPO_KEY);
         }
 
-        public void setAggregateArtifacts ( String path ) {
-            setStringValue( AGGREGATE_ARTIFACTS, path);
+        public void setAggregateArtifacts(String path) {
+            setStringValue(AGGREGATE_ARTIFACTS, path);
         }
 
-        public String getAggregateArtifacts () {
-            return getStringValue( AGGREGATE_ARTIFACTS );
+        public String getAggregateArtifacts() {
+            return getStringValue(AGGREGATE_ARTIFACTS);
         }
 
-        public void setCopyAggregatedArtifacts ( Boolean enabled ) {
-            setBooleanValue( COPY_AGGREGATED_ARTIFACTS, enabled );
+        public void setCopyAggregatedArtifacts(Boolean enabled) {
+            setBooleanValue(COPY_AGGREGATED_ARTIFACTS, enabled);
         }
 
-        public void setPublishAggregatedArtifacts ( Boolean enabled ) {
-            setBooleanValue( PUBLISH_AGGREGATED_ARTIFACTS, enabled );
+        public void setPublishAggregatedArtifacts(Boolean enabled) {
+            setBooleanValue(PUBLISH_AGGREGATED_ARTIFACTS, enabled);
         }
 
-        public Boolean isCopyAggregatedArtifacts () {
-            return getBooleanValue( COPY_AGGREGATED_ARTIFACTS, false );
+        public Boolean isCopyAggregatedArtifacts() {
+            return getBooleanValue(COPY_AGGREGATED_ARTIFACTS, false);
         }
 
-        public Boolean isPublishAggregatedArtifacts () {
-            return getBooleanValue( PUBLISH_AGGREGATED_ARTIFACTS, false );
+        public Boolean isPublishAggregatedArtifacts() {
+            return getBooleanValue(PUBLISH_AGGREGATED_ARTIFACTS, false);
         }
 
         public void setPublishArtifacts(Boolean enabled) {
@@ -331,7 +331,7 @@ public String getIncludePatterns() {
         }
 
         public boolean isFilterExcludedArtifactsFromBuild() {
-            return getBooleanValue(FILTER_EXCLUDED_ARTIFACTS_FROM_BUILD,false);
+            return getBooleanValue(FILTER_EXCLUDED_ARTIFACTS_FROM_BUILD, false);
         }
 
         public void setExcludePatterns(String patterns) {
@@ -440,7 +440,9 @@ public void setUrl(String url) {
         }
 
         public String urlWithMatrixParams(String rootUrl) {
-            if ( rootUrl == null ) { return null; }
+            if (rootUrl == null) {
+                return null;
+            }
             rootUrl = StringUtils.stripEnd(rootUrl, "/;");
             Map<String, String> matrixParams = getMatrixParams();
             if (matrixParams.isEmpty()) {
@@ -842,6 +844,14 @@ public String getVcsRevision() {
             return getStringValue(VCS_REVISION);
         }
 
+        public void setVcsUrl(String vcsUrl) {
+            setStringValue(VCS_URL, vcsUrl);
+        }
+
+        public String getVcsUrl() {
+            return getStringValue(VCS_URL);
+        }
+
         public void setAgentName(String agentName) {
             setStringValue(AGENT_NAME, agentName);
         }
diff --git a/build-info-extractor-gradle/src/main/groovy/org/jfrog/gradle/plugin/artifactory/extractor/GradleBuildInfoExtractor.java b/build-info-extractor-gradle/src/main/groovy/org/jfrog/gradle/plugin/artifactory/extractor/GradleBuildInfoExtractor.java
@@ -141,6 +141,11 @@ public Build extract(Project rootProject) {
             bib.vcsRevision(vcsRevision);
         }
 
+        String vcsUrl = clientConf.info.getVcsUrl();
+        if (StringUtils.isNotBlank(vcsUrl)) {
+            bib.vcsUrl(vcsUrl);
+        }
+
         LicenseControl licenseControl = new LicenseControl(clientConf.info.licenseControl.isRunChecks());
         String notificationRecipients = clientConf.info.licenseControl.getViolationRecipients();
         if (StringUtils.isNotBlank(notificationRecipients)) {
diff --git a/build-info-extractor-ivy/src/main/java/org/jfrog/build/extractor/listener/ArtifactoryBuildListener.java b/build-info-extractor-ivy/src/main/java/org/jfrog/build/extractor/listener/ArtifactoryBuildListener.java
@@ -233,6 +233,14 @@ private void doDeploy(BuildEvent event) {
         if (StringUtils.isNotBlank(buildUrl)) {
             builder.url(buildUrl);
         }
+        String vcsRevision = clientConf.info.getVcsRevision();
+        if (StringUtils.isNotBlank(vcsRevision)) {
+            builder.vcsRevision(vcsRevision);
+        }
+        String vcsUrl = clientConf.info.getVcsUrl();
+        if (StringUtils.isNotBlank(vcsUrl)) {
+            builder.vcsUrl(vcsUrl);
+        }
         String principal = clientConf.info.getPrincipal();
         if (StringUtils.isNotBlank(principal)) {
             builder.principal(principal);
diff --git a/build-info-extractor-ivy/src/main/java/org/jfrog/build/extractor/trigger/ArtifactoryBuildInfoTrigger.java b/build-info-extractor-ivy/src/main/java/org/jfrog/build/extractor/trigger/ArtifactoryBuildInfoTrigger.java
@@ -143,7 +143,7 @@ private void collectDependencyInformation(IvyEvent event) {
     private void collectModuleInformation(IvyEvent event) {
         ArtifactoryClientConfiguration.PublisherHandler publisher = ctx.getClientConf().publisher;
         IncludeExcludePatterns patterns = new IncludeExcludePatterns(
-                publisher.getIncludePatterns(),publisher.getExcludePatterns());
+                publisher.getIncludePatterns(), publisher.getExcludePatterns());
         boolean excludeArtifactsFromBuild = publisher.isFilterExcludedArtifactsFromBuild();
         Project project = (Project) IvyContext.peekInContextStack(IvyTask.ANT_PROJECT_CONTEXT_KEY);
 
@@ -180,7 +180,7 @@ private void collectModuleInformation(IvyEvent event) {
         project.log("[buildinfo:collect] Collecting artifact " + name + " for module " + moduleName +
                 " using file " + file, Project.MSG_INFO);
 
-        if (isArtifactExist(module.getArtifacts(), name)||isArtifactExist(module.getExcludedArtifacts(), name)) {
+        if (isArtifactExist(module.getArtifacts(), name) || isArtifactExist(module.getExcludedArtifacts(), name)) {
             return;
         }
         ArtifactBuilder artifactBuilder = new ArtifactBuilder(name);
@@ -192,9 +192,9 @@ private void collectModuleInformation(IvyEvent event) {
         String sha1 = checksums.get(SHA1);
         artifactBuilder.md5(md5).sha1(sha1);
         Artifact artifact = artifactBuilder.build();
-        if(excludeArtifactsFromBuild && PatternMatcher.pathConflicts(fullPath,patterns)){
+        if (excludeArtifactsFromBuild && PatternMatcher.pathConflicts(fullPath, patterns)) {
             module.getExcludedArtifacts().add(artifact);
-        }else{
+        } else {
             module.getArtifacts().add(artifact);
         }
         @SuppressWarnings("unchecked") DeployDetails deployDetails =
@@ -229,6 +229,9 @@ private DeployDetails buildDeployDetails(File artifactFile, Artifact artifact,
         if (StringUtils.isNotBlank(clientConf.info.getVcsRevision())) {
             builder.addProperty(BuildInfoFields.VCS_REVISION, clientConf.info.getVcsRevision());
         }
+        if (StringUtils.isNotBlank(clientConf.info.getVcsUrl())) {
+            builder.addProperty(BuildInfoFields.VCS_URL, clientConf.info.getVcsUrl());
+        }
         if (StringUtils.isNotBlank(clientConf.info.getBuildName())) {
             builder.addProperty(BuildInfoFields.BUILD_NAME, clientConf.info.getBuildName());
         }
diff --git a/build-info-extractor-maven3/src/main/java/org/jfrog/build/extractor/maven/BuildInfoModelPropertyResolver.java b/build-info-extractor-maven3/src/main/java/org/jfrog/build/extractor/maven/BuildInfoModelPropertyResolver.java
@@ -1,6 +1,5 @@
 package org.jfrog.build.extractor.maven;
 
-import static org.jfrog.build.api.BuildInfoFields.*;
 import com.google.common.io.Closeables;
 import org.apache.commons.lang.StringUtils;
 import org.apache.maven.Maven;
@@ -23,6 +22,8 @@
 import java.util.Properties;
 import java.util.Set;
 
+import static org.jfrog.build.api.BuildInfoFields.*;
+
 
 /**
  * @author Noam Y. Tenne
@@ -49,6 +50,10 @@ public BuildInfoMavenBuilder resolveProperties(ExecutionEvent event, Artifactory
         if (StringUtils.isNotBlank(vcsRevision)) {
             builder.vcsRevision(vcsRevision);
         }
+        String vcsUrl = clientConf.info.getVcsUrl();
+        if (StringUtils.isNotBlank(vcsUrl)) {
+            builder.vcsUrl(vcsUrl);
+        }
         BuildAgent buildAgent = new BuildAgent("Maven", getMavenVersion());
         builder.buildAgent(buildAgent);
 
@@ -140,7 +145,7 @@ private void attachStagingIfNeeded(ArtifactoryClientConfiguration clientConf, Bu
     }
 
     private BuildInfoMavenBuilder resolveCoreProperties(ExecutionEvent event,
-            ArtifactoryClientConfiguration clientConf) {
+                                                        ArtifactoryClientConfiguration clientConf) {
         String buildName = clientConf.info.getBuildName();
         if (StringUtils.isBlank(buildName)) {
             buildName = event.getSession().getTopLevelProject().getName();
@@ -169,14 +174,14 @@ private BuildInfoMavenBuilder resolveCoreProperties(ExecutionEvent event,
     private String getMavenVersion() {
         Properties mavenVersionProperties = new Properties();
         InputStream inputStream = BuildInfoRecorder.class.getClassLoader().
-                                  getResourceAsStream( "org/apache/maven/messages/build.properties" );
+                getResourceAsStream("org/apache/maven/messages/build.properties");
         if (inputStream == null) {
             inputStream = Maven.class.getClassLoader().
-                          getResourceAsStream( "META-INF/maven/org.apache.maven/maven-core/pom.properties" );
+                    getResourceAsStream("META-INF/maven/org.apache.maven/maven-core/pom.properties");
         }
         if (inputStream == null) {
             throw new RuntimeException("Could not extract Maven version: unable to find resources " +
-                                       "'org/apache/maven/messages/build.properties' or 'META-INF/maven/org.apache.maven/maven-core/pom.properties'");
+                    "'org/apache/maven/messages/build.properties' or 'META-INF/maven/org.apache.maven/maven-core/pom.properties'");
         }
         try {
             mavenVersionProperties.load(inputStream);
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Oct 06 22:28:40 CEST 2013
+#Tue Mar 18 16:58:19 IST 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.8-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.8-all.zip

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ public Map<String, String> getAllRootConfig() {`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`public void persistToPropertiesFile() {`
`96`		`- if ( StringUtils.isEmpty( getPropertiesFile())) {`
	`96`	`+ if (StringUtils.isEmpty(getPropertiesFile())) {`
`97`	`97`	`return;`
`98`	`98`	`}`
`99`	`99`	`Predicate<String> nonNullPredicate = new Predicate<String>() {`
`@@ -278,28 +278,28 @@ public String getSnapshotRepoKey() {`
`278`	`278`	`return getStringValue(SNAPSHOT_REPO_KEY);`
`279`	`279`	`}`
`280`	`280`
`281`		`- public void setAggregateArtifacts ( String path ) {`
`282`		`- setStringValue( AGGREGATE_ARTIFACTS, path);`
	`281`	`+ public void setAggregateArtifacts(String path) {`
	`282`	`+ setStringValue(AGGREGATE_ARTIFACTS, path);`
`283`	`283`	`}`
`284`	`284`
`285`		`- public String getAggregateArtifacts () {`
`286`		`- return getStringValue( AGGREGATE_ARTIFACTS );`
	`285`	`+ public String getAggregateArtifacts() {`
	`286`	`+ return getStringValue(AGGREGATE_ARTIFACTS);`
`287`	`287`	`}`
`288`	`288`
`289`		`- public void setCopyAggregatedArtifacts ( Boolean enabled ) {`
`290`		`- setBooleanValue( COPY_AGGREGATED_ARTIFACTS, enabled );`
	`289`	`+ public void setCopyAggregatedArtifacts(Boolean enabled) {`
	`290`	`+ setBooleanValue(COPY_AGGREGATED_ARTIFACTS, enabled);`
`291`	`291`	`}`
`292`	`292`
`293`		`- public void setPublishAggregatedArtifacts ( Boolean enabled ) {`
`294`		`- setBooleanValue( PUBLISH_AGGREGATED_ARTIFACTS, enabled );`
	`293`	`+ public void setPublishAggregatedArtifacts(Boolean enabled) {`
	`294`	`+ setBooleanValue(PUBLISH_AGGREGATED_ARTIFACTS, enabled);`
`295`	`295`	`}`
`296`	`296`
`297`		`- public Boolean isCopyAggregatedArtifacts () {`
`298`		`- return getBooleanValue( COPY_AGGREGATED_ARTIFACTS, false );`
	`297`	`+ public Boolean isCopyAggregatedArtifacts() {`
	`298`	`+ return getBooleanValue(COPY_AGGREGATED_ARTIFACTS, false);`
`299`	`299`	`}`
`300`	`300`
`301`		`- public Boolean isPublishAggregatedArtifacts () {`
`302`		`- return getBooleanValue( PUBLISH_AGGREGATED_ARTIFACTS, false );`
	`301`	`+ public Boolean isPublishAggregatedArtifacts() {`
	`302`	`+ return getBooleanValue(PUBLISH_AGGREGATED_ARTIFACTS, false);`
`303`	`303`	`}`
`304`	`304`
`305`	`305`	`public void setPublishArtifacts(Boolean enabled) {`
`@@ -331,7 +331,7 @@ public String getIncludePatterns() {`
`331`	`331`	`}`
`332`	`332`
`333`	`333`	`public boolean isFilterExcludedArtifactsFromBuild() {`
`334`		`- return getBooleanValue(FILTER_EXCLUDED_ARTIFACTS_FROM_BUILD,false);`
	`334`	`+ return getBooleanValue(FILTER_EXCLUDED_ARTIFACTS_FROM_BUILD, false);`
`335`	`335`	`}`
`336`	`336`
`337`	`337`	`public void setExcludePatterns(String patterns) {`
`@@ -440,7 +440,9 @@ public void setUrl(String url) {`
`440`	`440`	`}`
`441`	`441`
`442`	`442`	`public String urlWithMatrixParams(String rootUrl) {`
`443`		`- if ( rootUrl == null ) { return null; }`
	`443`	`+ if (rootUrl == null) {`
	`444`	`+ return null;`
	`445`	`+ }`
`444`	`446`	`rootUrl = StringUtils.stripEnd(rootUrl, "/;");`
`445`	`447`	`Map<String, String> matrixParams = getMatrixParams();`
`446`	`448`	`if (matrixParams.isEmpty()) {`
`@@ -842,6 +844,14 @@ public String getVcsRevision() {`
`842`	`844`	`return getStringValue(VCS_REVISION);`
`843`	`845`	`}`
`844`	`846`
	`847`	`+ public void setVcsUrl(String vcsUrl) {`
	`848`	`+ setStringValue(VCS_URL, vcsUrl);`
	`849`	`+ }`
	`850`	`+`
	`851`	`+ public String getVcsUrl() {`
	`852`	`+ return getStringValue(VCS_URL);`
	`853`	`+ }`
	`854`	`+`
`845`	`855`	`public void setAgentName(String agentName) {`
`846`	`856`	`setStringValue(AGENT_NAME, agentName);`
`847`	`857`	`}`