Fix failing tests caused by removing 'artifactory.'

Author: Or-Geva

build-info-extractor-gradle/src/test/resources/integration/buildinfo.properties.deployer

@@ -1,10 +1,10 @@
 # Deployer settings
-artifactory.publish.publications=${publications}
-artifactory.publish.contextUrl=${contextUrl}
-artifactory.publish.repoKey=${localRepo}
-artifactory.publish.username=${username}
-artifactory.publish.password=${password}
-artifactory.publish.unstable=false
-artifactory.publish.buildInfo=true
-artifactory.publish.maven=true
-artifactory.publish.ivy=true
+publish.publications=${publications}
+publish.contextUrl=${contextUrl}
+publish.repoKey=${localRepo}
+publish.username=${username}
+publish.password=${password}
+publish.unstable=false
+publish.buildInfo=true
+publish.maven=true
+publish.ivy=true

build-info-extractor-gradle/src/test/resources/integration/buildinfo.properties.resolver

@@ -1,5 +1,5 @@
 # Resolver settings
-artifactory.resolve.contextUrl=${contextUrl}
-artifactory.resolve.repoKey=${virtualRepo}
-artifactory.resolve.username=${username}
-artifactory.resolve.password=${password}
+resolve.contextUrl=${contextUrl}
+resolve.repoKey=${virtualRepo}
+resolve.username=${username}
+resolve.password=${password}

build-info-extractor/src/test/java/org/jfrog/build/extractor/client/DeploymentUrlUtilsTest.java

@@ -37,7 +37,7 @@ public void getDeploymentUrl() throws UnsupportedEncodingException {
         props.put(ClientProperties.PROP_DEPLOY_PARAM_PROP_PREFIX + "buildName", "moo");
         props.put(ClientProperties.PROP_DEPLOY_PARAM_PROP_PREFIX + "buildNumber", "1");
         String deploymentUrl = DeploymentUrlUtils.getDeploymentUrl(artifactoryUrl, props);
-        Assert.assertEquals(deploymentUrl, artifactoryUrl + ";buildName=moo;buildNumber=1");
+        Assert.assertEquals(deploymentUrl, artifactoryUrl + ";buildNumber=1;buildName=moo");
     }
 
     public void getDeploymentUrlWithEncodingNeeded() throws UnsupportedEncodingException {
@@ -46,7 +46,7 @@ public void getDeploymentUrlWithEncodingNeeded() throws UnsupportedEncodingExcep
         props.put(ClientProperties.PROP_DEPLOY_PARAM_PROP_PREFIX + "build Name", "moo");
         props.put(ClientProperties.PROP_DEPLOY_PARAM_PROP_PREFIX + "build Number", "1");
         String deploymentUrl = DeploymentUrlUtils.getDeploymentUrl(artifactoryUrl, props);
-        Assert.assertEquals(deploymentUrl, artifactoryUrl + ";build+Number=1;build+Name=moo");
+        Assert.assertEquals(deploymentUrl, artifactoryUrl + ";build+Name=moo;build+Number=1");
     }