[groovy-release] branch master updated: tweaks for latest release

[pa...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy-release.git


The following commit(s) were added to refs/heads/master by this push:
     new 499a34f  tweaks for latest release
499a34f is described below

commit 499a34fa5e9303b75a2ddd5af20badeffff68db8
Author: Paul King <pa...@asert.com.au>
AuthorDate: Mon Sep 6 21:29:41 2021 +1000

    tweaks for latest release
---
 gradle/phase2.gradle | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gradle/phase2.gradle b/gradle/phase2.gradle
index 7f76f20..21eae20 100644
--- a/gradle/phase2.gradle
+++ b/gradle/phase2.gradle
@@ -58,7 +58,7 @@ task jiraCheckPhase2(dependsOn: assumesRelVersion) {
         request = HttpUtil.getRequest("$prefix/version/$versionId/unresolvedIssueCount", apacheUser, apachePassword)
         response = HttpUtil.send(client, request)
         if (response.json.issuesUnresolvedCount) {
-            logger.warn "Warning found $resp.issuesUnresolvedCount unresolved issues for version $relVersion"
+            logger.warn "Warning found $response.json.issuesUnresolvedCount unresolved issues for version $relVersion"
         }
         request = HttpUtil.getRequest("$prefix/version/$versionId/relatedIssueCounts", apacheUser, apachePassword)
         response = HttpUtil.send(client, request)
@@ -177,9 +177,9 @@ task publishZipsOnArtifactory(dependsOn: [jiraCheckPhase2, assumesRelVersion]) {
         def client = HttpUtil.newClient()
         fileTree("$distParentDir/distributions").files.each { File f ->
             println "Uploading $f.name"
-            def request = HttpUtil.putRequest(prefix, f, apacheUser, apachePassword)
+            def request = HttpUtil.putRequest(prefix, f, artifactoryUser, artifactoryPassword)
             def response = HttpUtil.send(client, request)
-            assert response.statusCode() == 200
+            assert response.statusCode() in [200, 201]
         }
         println "Zips uploaded! You may need to release manually."
     }
@@ -192,7 +192,7 @@ task waitForArtifactoryZipPublication(dependsOn: [publishZipsOnArtifactory/*, pr
         def delay = 30000 // 1/2 a minute
         def numTries = 60 // wait for up to 30 mins
         def url = "https://groovy.jfrog.io/artifactory/dist-release-local/groovy-zips/apache-groovy-sdk-${relVersion}.zip"
-        def found = HttpUtil.awaitPublication(url, apacheUser, apachePassword, delay, numTries)
+        def found = HttpUtil.awaitPublication(url, artifactoryUser, artifactoryPassword, delay, numTries)
         assert found, 'Timed out waiting for artifactory publish/sync - please check manually'
     }
 }