Merge branch '2.1.x' into 2.2.x

Author: wilkinsona

ci/images/releasescripts/src/main/java/io/spring/concourse/releasescripts/bintray/BintrayService.java

@@ -78,7 +78,7 @@ public boolean isDistributionStarted(ReleaseInfo releaseInfo) {
 		logger.debug("Checking if distribution is started");
 		RequestEntity<Void> request = getPackageFilesRequest(releaseInfo, 1);
 		try {
-			logger.debug("Checking bintray");
+			logger.debug("Checking Bintray");
 			this.restTemplate.exchange(request, PackageFile[].class).getBody();
 			return true;
 		}
@@ -100,7 +100,7 @@ public boolean isDistributionComplete(ReleaseInfo releaseInfo, Set<String> requi
 		RequestEntity<Void> request = getPackageFilesRequest(releaseInfo, 0);
 		try {
 			waitAtMost(timeout).with().pollDelay(Duration.ZERO).pollInterval(pollInterval).until(() -> {
-				logger.debug("Checking bintray");
+				logger.debug("Checking Bintray");
 				try {
 					PackageFile[] published = this.restTemplate.exchange(request, PackageFile[].class).getBody();
 					return hasPublishedAll(published, requiredDigests);
@@ -111,7 +111,7 @@ public boolean isDistributionComplete(ReleaseInfo releaseInfo, Set<String> requi
 			});
 		}
 		catch (ConditionTimeoutException ex) {
-			logger.debug("Timeout checking bintray");
+			logger.debug("Timeout checking Bintray");
 			return false;
 		}
 		return true;
@@ -132,7 +132,7 @@ private boolean hasPublishedAll(PackageFile[] published, Set<String> requiredDig
 			logger.debug("Found all required digests");
 			return true;
 		}
-		logger.debug("Some digests have not been published:");
+		logger.debug(remaining.size() + " digests have not been published:");
 		remaining.forEach(logger::debug);
 		return false;
 	}
@@ -148,18 +148,18 @@ private RequestEntity<Void> getPackageFilesRequest(ReleaseInfo releaseInfo, int
 	 * @param releaseInfo the release information
 	 */
 	public void publishGradlePlugin(ReleaseInfo releaseInfo) {
-		logger.debug("Publishing Gradle Pluging");
+		logger.debug("Publishing Gradle plugin");
 		RequestEntity<String> requestEntity = RequestEntity
 				.post(URI.create(BINTRAY_URL + "packages/" + this.bintrayProperties.getSubject() + "/"
 						+ this.bintrayProperties.getRepo() + "/" + releaseInfo.getGroupId() + "/versions/"
 						+ releaseInfo.getVersion() + "/attributes"))
 				.contentType(MediaType.APPLICATION_JSON).body(GRADLE_PLUGIN_REQUEST);
 		try {
 			this.restTemplate.exchange(requestEntity, Object.class);
-			logger.debug("Publishing Gradle Pluging complete");
+			logger.debug("Publishing Gradle plugin complete");
 		}
 		catch (HttpClientErrorException ex) {
-			logger.info("Failed to add attribute to gradle plugin.");
+			logger.info("Failed to add attribute to Gradle plugin");
 			throw ex;
 		}
 	}
@@ -184,7 +184,7 @@ public void syncToMavenCentral(ReleaseInfo releaseInfo) {
 			logger.debug("Sync complete");
 		}
 		catch (HttpClientErrorException ex) {
-			logger.info("Failed to sync.");
+			logger.info("Failed to sync");
 			throw ex;
 		}
 	}