didn't update description or local variable name when we switched bintray to artifactory instance
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 @@
// 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 @@
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