updates from latest release - still needs a manual step automated
diff --git a/gradle/phase1.gradle b/gradle/phase1.gradle
index b573f85..a484f84 100644
--- a/gradle/phase1.gradle
+++ b/gradle/phase1.gradle
@@ -163,8 +163,10 @@
theArgs << "-PartifactoryRepoKey=${releaseBuild ? 'libs-release-local' : 'libs-snapshot-local'}"
if (project.hasProperty('skipPublish')) {
theArgs += ['install', 'dist']
- } else {
+ } else if (apacheGroupId) {
theArgs += ['install', 'dist', 'signSdkElements', 'artifactoryPublish']
+ } else {
+ theArgs += ['install', 'dist', 'artifactoryPublish']
}
commandLine theArgs
}
@@ -174,20 +176,21 @@
group = "Pre-vote phase"
description = "Publishes the Maven artifacts to the Apache staging repository"
workingDir stagingDir
- if (apacheGroupId) {
+// if (apacheGroupId) {
ext.theArgs = []
if (Os.isFamily(Os.FAMILY_WINDOWS)) {
theArgs += ['cmd', '/C', 'gradlew.bat']
} else {
theArgs += ['sh', './gradlew']
}
- if (!relVersion.startsWith('2.4')) {
+// if (!relVersion.startsWith('2.4')) {
theArgs << '--no-build-cache'
- }
+// }
theArgs += ['publishAllPublicationsToApacheRepository']
commandLine theArgs
- }
+// }
}
+uploadStep2.onlyIf{ apacheGroupId }
task cleanSvnDevWorkspace(type: Delete, dependsOn: [assumesBranch, uploadStep2]) {
delete devWorkspaceRoot
@@ -314,7 +317,7 @@
Convenience binaries: https://dist.apache.org/repos/dist/dev/groovy/$relVersion/distribution
Release artifacts are signed with a key from the following file:
-https://dist.apache.org/repos/dist/dev/groovy/KEYS
+https://dist.apache.org/repos/dist/release/groovy/KEYS
Please vote on releasing this package as Apache Groovy $relVersion.
diff --git a/gradle/phase2.gradle b/gradle/phase2.gradle
index 9b09e06..fe6ed52 100644
--- a/gradle/phase2.gradle
+++ b/gradle/phase2.gradle
@@ -54,7 +54,7 @@
consumerToken = findProperty('gvm.consumerPassword')
candidate = "groovy"
version = "$relVersion"
- url = "https://dl.bintray.com/groovy/maven/apache-groovy-sdk-${relVersion}.zip"
+ url = "https://groovy.jfrog.io/artifactory/dist-release-local/groovy-zips/apache-groovy-sdk-${relVersion}.zip"
hashtag = "#groovylang"
}
@@ -87,9 +87,10 @@
}
}
-task promoteOnBintray(dependsOn: jiraCheckPhase2) {
+/*
+task promoteJarsOnArtifactory(dependsOn: jiraCheckPhase2) {
group = "Post-passed phase"
- description = "Releases the version on Bintray"
+ description = "Releases the versions artifacts on Artifactory"
doLast {
def artifactory = HttpBuilder.configure {
request.uri = 'https://groovy.jfrog.io'
@@ -133,7 +134,9 @@
if (project.hasProperty('dryRun')) println resp
}
}
+*/
+/*
// we fix up properties to ensure paths are found, see link:
// https://jfrog.com/knowledge-base/why-doesnt-my-build-have-paths-to-published-artifacts-even-though-it-did-upload-them/
task augmentProperties(dependsOn: jiraCheckPhase2) {
@@ -185,32 +188,54 @@
}
}
augmentProperties.onlyIf{ apacheGroupId }
+*/
-task waitForBintrayPublication(dependsOn: [promoteOnBintray]) {
+task publishZipsOnArtifactory(dependsOn: [jiraCheckPhase2, assumesRelVersion]) {
group = "Post-passed phase"
- description = "Polls the Bintray website to check if it is released"
+ description = "Publish distribution zips to Groovy artifactory instance"
+ doLast {
+ def artifactory = HttpBuilder.configure {
+ request.uri = 'https://groovy.jfrog.io/'
+ request.headers['Authorization'] = 'Basic ' + "$artifactoryUser:$artifactoryPassword".getBytes('iso-8859-1').encodeBase64()
+ }
+ fileTree("$distParentDir/distributions").files.each { File f ->
+ println "Uploading $f.name"
+ artifactory.put {
+ request.uri.path = "/artifactory/dist-release-local/groovy-zips/${f.name}"
+ request.body = f.bytes
+ request.contentType = 'application/octet-stream'
+ }
+ }
+ println "Zips uploaded! You may need to release manually."
+ }
+}
+
+task waitForArtifactoryZipPublication(dependsOn: [publishZipsOnArtifactory/*, promoteJarsOnArtifactory*/]) {
+ group = "Post-passed phase"
+ description = "Polls the artifactory instance website to check if it is released"
doLast {
def found = false
def delay = 30000 // 1/2 a minute
def numTries = 60 // wait for up to 30 mins
def bintray = HttpBuilder.configure {
- request.uri = 'https://dl.bintray.com/'
+ request.uri = 'https://groovy.jfrog.io/'
}
while (!found && numTries-- > 0) {
found = true
bintray.head {
- request.uri.path = "/groovy/maven/apache-groovy-sdk-${relVersion}.zip"
+ request.uri.path = "/artifactory/dist-release-local/groovy-zips/apache-groovy-sdk-${relVersion}.zip"
response.failure { fs ->
sleep delay
found = false
}
}
}
- assert found, 'Timed out waiting for bintray publish/sync - please check manually'
+ assert found, 'Timed out waiting for artifactory publish/sync - please check manually'
}
}
-sdkReleaseVersion.dependsOn waitForBintrayPublication
+sdkReleaseVersion.dependsOn waitForArtifactoryZipPublication
+/*
task synchronizeWithMavenCentral(dependsOn: promoteOnBintray) {
group = "Post-passed phase"
description = "Syncs with Maven Central/Sonatype"
@@ -236,27 +261,7 @@
}
}
synchronizeWithMavenCentral.onlyIf{ !apacheGroupId }
-
-task publishZipsOnBintray(dependsOn: [jiraCheckPhase2, assumesRelVersion]) {
- group = "Post-passed phase"
- description = "Publish distribution zips to bintray"
- doLast {
- def bintray = HttpBuilder.configure {
- request.uri = 'https://api.bintray.com'
- request.headers['Authorization'] = 'Basic ' + "$bintrayUser:$bintrayKey".getBytes('iso-8859-1').encodeBase64()
- }
- fileTree("$distParentDir/distributions").files.each { File f ->
- println "Uploading $f.name"
- bintray.put {
- request.uri.path = "/content/groovy/maven/groovy/$relVersion/${f.name}"
- request.body = f.bytes
- request.contentType = 'application/octet-stream'
- }
- }
- println "Zips uploaded! You may need to release manually."
- // TODO automate release
- }
-}
+*/
task cleanSvnReleaseWorkspace(type: Delete, dependsOn: assumesRelVersion) {
delete releaseWorkspaceRoot
@@ -427,7 +432,7 @@
}
waitForWebsitePublication.onlyIf{ releaseBuild }
-task publishToSDKman(dependsOn: [synchronizeWithMavenCentral, publishZipsOnBintray, uploadToApacheReleaseServer, waitForWebsitePublication, maybeUpdateDocumentationSymlink, sdkReleaseVersion]) {
+task publishToSDKman(dependsOn: [/*synchronizeWithMavenCentral,*/ publishZipsOnArtifactory, uploadToApacheReleaseServer, waitForWebsitePublication, maybeUpdateDocumentationSymlink, sdkReleaseVersion]) {
group = "Post-passed phase"
description = "Publishes the release on SDKman"
}
