From 1706ae29f50be38a37aab551b5f605059f592f8b Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Thu, 11 Jun 2020 22:56:06 -0700 Subject: [PATCH] Support octet-stream response from sonatype See gh-21474 --- .../concourse/releasescripts/sonatype/SonatypeService.java | 4 ++-- .../releasescripts/sonatype/SonatypeServiceTests.java | 3 ++- ci/scripts/sync-to-maven-central.sh | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ci/images/releasescripts/src/main/java/io/spring/concourse/releasescripts/sonatype/SonatypeService.java b/ci/images/releasescripts/src/main/java/io/spring/concourse/releasescripts/sonatype/SonatypeService.java index 82b955c8cb..0ef88e5639 100644 --- a/ci/images/releasescripts/src/main/java/io/spring/concourse/releasescripts/sonatype/SonatypeService.java +++ b/ci/images/releasescripts/src/main/java/io/spring/concourse/releasescripts/sonatype/SonatypeService.java @@ -58,9 +58,9 @@ public class SonatypeService { */ public boolean artifactsPublished(ReleaseInfo releaseInfo) { try { - ResponseEntity entity = this.restTemplate + ResponseEntity entity = this.restTemplate .getForEntity(String.format(SONATYPE_REPOSITORY_URI + "%s/spring-boot-%s.jar.sha1", - releaseInfo.getVersion(), releaseInfo.getVersion()), Object.class); + releaseInfo.getVersion(), releaseInfo.getVersion()), byte[].class); if (HttpStatus.OK.equals(entity.getStatusCode())) { logger.info("Already published to Sonatype."); return true; diff --git a/ci/images/releasescripts/src/test/java/io/spring/concourse/releasescripts/sonatype/SonatypeServiceTests.java b/ci/images/releasescripts/src/test/java/io/spring/concourse/releasescripts/sonatype/SonatypeServiceTests.java index aff6d43e9e..ae0a257ecd 100644 --- a/ci/images/releasescripts/src/test/java/io/spring/concourse/releasescripts/sonatype/SonatypeServiceTests.java +++ b/ci/images/releasescripts/src/test/java/io/spring/concourse/releasescripts/sonatype/SonatypeServiceTests.java @@ -57,7 +57,8 @@ class SonatypeServiceTests { void artifactsPublishedWhenPublishedShouldReturnTrue() { this.server.expect(requestTo(String.format( "https://oss.sonatype.org/service/local/repositories/releases/content/org/springframework/boot/spring-boot/%s/spring-boot-%s.jar.sha1", - "1.1.0.RELEASE", "1.1.0.RELEASE"))).andExpect(method(HttpMethod.GET)).andRespond(withSuccess()); + "1.1.0.RELEASE", "1.1.0.RELEASE"))).andExpect(method(HttpMethod.GET)) + .andRespond(withSuccess().body("ce8d8b6838ecceb68962b975b18682f4237ccf71".getBytes())); boolean published = this.service.artifactsPublished(getReleaseInfo()); assertThat(published).isTrue(); this.server.verify(); diff --git a/ci/scripts/sync-to-maven-central.sh b/ci/scripts/sync-to-maven-central.sh index d1a0069a22..32e882b5d4 100755 --- a/ci/scripts/sync-to-maven-central.sh +++ b/ci/scripts/sync-to-maven-central.sh @@ -2,7 +2,7 @@ export BUILD_INFO_LOCATION=$(pwd)/artifactory-repo/build-info.json version=$( cat artifactory-repo/build-info.json | jq -r '.buildInfo.modules[0].id' | sed 's/.*:.*:\(.*\)/\1/' ) -java -jar /spring-boot-release-scripts.jar syncToCentral "RELEASE" $BUILD_INFO_LOCATION > /dev/null || { exit 1; } +java -jar /spring-boot-release-scripts.jar syncToCentral "RELEASE" $BUILD_INFO_LOCATION || { exit 1; } echo "Sync complete" echo $version > version/version