Deprecate 'artifactory.' properties prefix (#570)

Author: Or-Geva

Diff for: build-info-extractor-maven3/src/main/java/org/jfrog/build/extractor/maven/BuildDeploymentHelper.java

@@ -60,11 +60,6 @@ public void deploy( Build                          build,
         logger.debug("Build Info Recorder: publication fork count: " + clientConf.publisher.getPublishForkCount());
         logger.debug("Build Info Recorder: publish build info: " + clientConf.publisher.isPublishBuildInfo());
 
-
-        if (clientConf.publisher.isPublishBuildInfo() || StringUtils.isNotBlank(clientConf.info.getGeneratedBuildInfoFilePath())) {
-            saveBuildInfoToFile(build, clientConf, basedir);
-        }
-
         if (!StringUtils.isEmpty(clientConf.info.getGeneratedBuildInfoFilePath())) {
             try {
                 BuildInfoExtractorUtils.saveBuildInfoToFile(build, new File(clientConf.info.getGeneratedBuildInfoFilePath()));

Diff for: build-info-extractor-maven3/src/main/java/org/jfrog/build/extractor/maven/BuildInfoRecorder.java

@@ -530,7 +530,9 @@ private void addArtifactsToCurrentModule(MavenProject project, ModuleBuilder mod
             if (artifactFile != null && artifactFile.isFile()) {
                 boolean pathConflicts = PatternMatcher.pathConflicts(deploymentPath, patterns);
                 addArtifactToBuildInfo(artifact, pathConflicts, excludeArtifactsFromBuild, module);
-                addDeployableArtifact(artifact, artifactFile, pathConflicts, groupId, artifactId, artifactVersion, artifactClassifier, artifactExtension);
+                if (conf.publisher.isPublishArtifacts()) {
+                    addDeployableArtifact(artifact, artifactFile, pathConflicts, groupId, artifactId, artifactVersion, artifactClassifier, artifactExtension);
+                }
             }
         }
         /*
@@ -561,7 +563,9 @@ private void addPomArtifact(Artifact nonPomArtifact, ModuleBuilder module,
                 if (pomFile != null && pomFile.isFile()) {
                     boolean pathConflicts = PatternMatcher.pathConflicts(deploymentPath, patterns);
                     addArtifactToBuildInfo(pomArtifact, pathConflicts, excludeArtifactsFromBuild, module);
-                    addDeployableArtifact(pomArtifact, pomFile, pathConflicts, nonPomArtifact.getGroupId(), nonPomArtifact.getArtifactId(), nonPomArtifact.getVersion(), nonPomArtifact.getClassifier(), "pom");
+                    if (conf.publisher.isPublishArtifacts()) {
+                        addDeployableArtifact(pomArtifact, pomFile, pathConflicts, nonPomArtifact.getGroupId(), nonPomArtifact.getArtifactId(), nonPomArtifact.getVersion(), nonPomArtifact.getClassifier(), "pom");
+                    }
                 }
                 break;
             }

Diff for: build-info-extractor/src/main/java/org/jfrog/build/extractor/clientConfiguration/ClientProperties.java

@@ -28,57 +28,57 @@ public interface ClientProperties {
      * top level property.
      */
     @Deprecated
-    String PROP_CONTEXT_URL = ARTIFACTORY_PREFIX + "contextUrl";
+    String PROP_CONTEXT_URL = "contextUrl";
 
-    String PROP_CONNECTION_RETRIES = ARTIFACTORY_PREFIX + "connectionRetries";
+    String PROP_CONNECTION_RETRIES = "connectionRetries";
 
-    String PROP_TIMEOUT = ARTIFACTORY_PREFIX + "timeout";
+    String PROP_TIMEOUT = "timeout";
 
-    String PROP_SO_TIMEOUT = ARTIFACTORY_PREFIX + "timeout.socket";
+    String PROP_SO_TIMEOUT = "timeout.socket";
 
-    String PROP_MAX_CO_PER_ROUTE = ARTIFACTORY_PREFIX + "maxConPerRoute";
+    String PROP_MAX_CO_PER_ROUTE = "maxConPerRoute";
 
-    String PROP_MAX_TOTAL_CO = ARTIFACTORY_PREFIX + "maxTotalCon";
+    String PROP_MAX_TOTAL_CO = "maxTotalCon";
 
-    String PROP_PROXY_PREFIX = ARTIFACTORY_PREFIX + "proxy.";
+    String PROP_PROXY_PREFIX = "proxy.";
 
-    String PROP_PACKAGE_MANAGER_PREFIX = ARTIFACTORY_PREFIX + "package.manager.";
+    String PROP_PACKAGE_MANAGER_PREFIX = "package.manager.";
 
-    String PROP_NPM_PREFIX = ARTIFACTORY_PREFIX + "npm.";
+    String PROP_NPM_PREFIX = "npm.";
 
-    String PROP_PIP_PREFIX = ARTIFACTORY_PREFIX + "pip.";
+    String PROP_PIP_PREFIX = "pip.";
 
-    String PROP_DOTNET_PREFIX = ARTIFACTORY_PREFIX + "dotnet.";
+    String PROP_DOTNET_PREFIX = "dotnet.";
 
-    String PROP_DOCKER_PREFIX = ARTIFACTORY_PREFIX + "docker.";
+    String PROP_DOCKER_PREFIX = "docker.";
 
-    String PROP_KANIKO_PREFIX = ARTIFACTORY_PREFIX + "kaniko.";
+    String PROP_KANIKO_PREFIX = "kaniko.";
 
-    String PROP_GO_PREFIX = ARTIFACTORY_PREFIX + "go.";
+    String PROP_GO_PREFIX = "go.";
 
     /**
      * The repo key in Artifactory from where to resolve artifacts.
      */
-    String PROP_RESOLVE_PREFIX = ARTIFACTORY_PREFIX + "resolve.";
+    String PROP_RESOLVE_PREFIX = "resolve.";
 
     /**
      * The repo key in Artifactory to where to publish release artifacts.
      */
-    String PROP_PUBLISH_PREFIX = ARTIFACTORY_PREFIX + "publish.";
+    String PROP_PUBLISH_PREFIX = "publish.";
 
     /**
      * Property for whether to publish the artifacts even if the build is unstable
      */
-    String PROP_PUBLISH_EVEN_UNSTABLE = ARTIFACTORY_PREFIX + "publish.unstable";
+    String PROP_PUBLISH_EVEN_UNSTABLE = "publish.unstable";
 
 
     /**
      * Prefix for properties that are dynamically added to deployment (as matrix params)
      */
-    String PROP_DEPLOY_PARAM_PROP_PREFIX = ARTIFACTORY_PREFIX + "deploy.";
+    String PROP_DEPLOY_PARAM_PROP_PREFIX = "deploy.";
 
     /**
      * Property for whether to use relaxed ssl check and ignore issues with server certificate
      */
-    String PROP_INSECURE_TLS = ARTIFACTORY_PREFIX + "insecureTls";
+    String PROP_INSECURE_TLS = "insecureTls";
 }