You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2021/04/28 04:22:00 UTC
[groovy-release] branch master updated: didn't update description
or local variable name when we switched bintray to artifactory instance
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 d164eb4 didn't update description or local variable name when we switched bintray to artifactory instance
d164eb4 is described below
commit d164eb44eed58f28ab69d109ff5b99936e176571
Author: Paul King <pa...@asert.com.au>
AuthorDate: Wed Apr 28 14:21:52 2021 +1000
didn't update description or local variable name when we switched bintray to artifactory instance
---
gradle/phase1.gradle | 2 +-
gradle/phase2.gradle | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/gradle/phase1.gradle b/gradle/phase1.gradle
index a484f84..dc40fe1 100644
--- a/gradle/phase1.gradle
+++ b/gradle/phase1.gradle
@@ -145,7 +145,7 @@ task updateVersionProperties(dependsOn: [assumesPropsSet, createReleaseBranch])
// use Exec rather the GradleBuild to ensure we use the correct gradle version for the groovy version being built
task buildAndUploadStep1(type: Exec, dependsOn: [assumesPropsSet, updateVersionProperties, checkCompatibility]) {
group = "Pre-vote phase"
- description = "Builds Apache Groovy and publishes the Maven artifacts to the staging repository on Bintray"
+ description = "Builds Apache Groovy and publishes the Maven artifacts to the Artifactory staging repository"
workingDir stagingDir
ext.theArgs = []
if (Os.isFamily(Os.FAMILY_WINDOWS)) {
diff --git a/gradle/phase2.gradle b/gradle/phase2.gradle
index fe6ed52..ffd7a6d 100644
--- a/gradle/phase2.gradle
+++ b/gradle/phase2.gradle
@@ -217,12 +217,12 @@ task waitForArtifactoryZipPublication(dependsOn: [publishZipsOnArtifactory/*, pr
def found = false
def delay = 30000 // 1/2 a minute
def numTries = 60 // wait for up to 30 mins
- def bintray = HttpBuilder.configure {
+ def artifactory = HttpBuilder.configure {
request.uri = 'https://groovy.jfrog.io/'
}
while (!found && numTries-- > 0) {
found = true
- bintray.head {
+ artifactory.head {
request.uri.path = "/artifactory/dist-release-local/groovy-zips/apache-groovy-sdk-${relVersion}.zip"
response.failure { fs ->
sleep delay