You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2013/09/17 17:30:21 UTC
svn commit: r1524094 - in /httpcomponents/project-release-tools/trunk:
build.gradle buildSrc/src/main/groovy/Svn.groovy gradle.properties.template
Author: olegk
Date: Tue Sep 17 15:30:21 2013
New Revision: 1524094
URL: http://svn.apache.org/r1524094
Log:
Yet another rewrite release tasks making better use of Gradle incremental build capabilities
Modified:
httpcomponents/project-release-tools/trunk/build.gradle
httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/Svn.groovy
httpcomponents/project-release-tools/trunk/gradle.properties.template
Modified: httpcomponents/project-release-tools/trunk/build.gradle
URL: http://svn.apache.org/viewvc/httpcomponents/project-release-tools/trunk/build.gradle?rev=1524094&r1=1524093&r2=1524094&view=diff
==============================================================================
--- httpcomponents/project-release-tools/trunk/build.gradle (original)
+++ httpcomponents/project-release-tools/trunk/build.gradle Tue Sep 17 15:30:21 2013
@@ -35,30 +35,6 @@ if (!console) {
throw new IllegalStateException("Console not available")
}
-File devRepoFile = new File(project.buildDir, 'dev-repo.txt')
-URI devRepo = devRepoFile.exists() ? new URI(devRepoFile.text.trim()) : null
-
-File releaseVerFile = new File(project.buildDir, 'release-ver.txt')
-String releaseVer = releaseVerFile.exists() ? releaseVerFile.text.trim() : null
-
-File releaseTagFile = new File(project.buildDir, 'release-tag.txt')
-URI releaseTag = releaseTagFile.exists() ? new URI(releaseTagFile.text.trim()) : null
-
-File rcQualifierFile = new File(project.buildDir, 'rc-qualifier.txt')
-String rcQualifier = rcQualifierFile.exists() ? rcQualifierFile.text.trim() : null
-
-File rcTagFile = new File(project.buildDir, 'rc-tag.txt')
-URI rcTag = rcTagFile.exists() ? new URI(rcTagFile.text.trim()) : null
-
-File rcReadyFile = new File(project.buildDir, 'rc-ready.txt')
-String rcReady = rcReadyFile.exists() ? new URI(rcReadyFile.text.trim()) : null
-
-File rcPromotedFile = new File(project.buildDir, 'rc-promoted.txt')
-String rcPromoted = rcPromotedFile.exists() ? new URI(rcPromotedFile.text.trim()) : null
-
-File nextVerFile = new File(project.buildDir, 'next-ver.txt')
-String nextVer = nextVerFile.exists() ? nextVerFile.text.trim() : null
-
/////////////////////////// Repositories //////////////////////////////////////
// Only local Maven repo
@@ -68,153 +44,198 @@ repositories {
/////////////////////////// Release tasks /////////////////////////////////////
-task startReleaseProcess() {
- group = 'Release management'
- description = "Selects source repository and starts release process."
+if (!HC_DEV) {
+ throw InvalidUserDataException("HC_DEV not set")
+}
+
+task checkoutSnapshot(type: SvnGet) {
+ group = 'Repository'
+ description = "Checks out development snapshot from '${HC_DEV}'."
+ repo = new URI(HC_DEV)
+}
+
+task updateSnapshot(type: SvnUpdate, dependsOn: checkoutSnapshot) {
+ group = 'Repository'
+ description = "Updates development snapshot from '${checkoutSnapshot.repo}'."
+ repo = checkoutSnapshot.repo
+}
+
+task revertSnapshot(type: SvnRevert, dependsOn: checkoutSnapshot) {
+ group = 'Repository'
+ description = "Reverts changes to the development snapshot."
+ repo = checkoutSnapshot.repo
+}
+
+File releaseVerFile = new File(project.buildDir, 'release-ver.txt')
+File releaseTagFile = new File(project.buildDir, 'release-tag.txt')
+File rcQualifierFile = new File(project.buildDir, 'rc-qualifier.txt')
+File rcTagFile = new File(project.buildDir, 'rc-tag.txt')
+File rcRevisionFile = new File(project.buildDir, 'rc-revision.txt')
+File releaseRevisionFile = new File(project.buildDir, 'release-revision.txt')
+File nextVerFile = new File(project.buildDir, 'next-ver.txt')
+File nextVerRevisionFile = new File(project.buildDir, 'next-ver-revision.txt')
+
+
+task prepareRelease(dependsOn: checkoutSnapshot) {
+ group = 'Release'
+ description = "Prepares release based on development snapshot from ${checkoutSnapshot.repo}."
+ outputs.files files(releaseVerFile, releaseTagFile)
doLast {
- if (project.buildDir.exists()) {
- [devRepoFile, releaseVerFile, releaseTagFile, rcQualifierFile, rcTagFile,
- rcReadyFile, rcPromotedFile, nextVerFile]
- .each { File file ->
- if (file && file.exists()) {
- file.delete()
- }
- }
+ File pomFile = new File(checkoutSnapshot.localDir, 'pom.xml')
+ def pomModel = new XmlSlurper().parse(pomFile)
+ String ver = pomModel.version
+ if (ver.endsWith('-SNAPSHOT')) {
+ ver = ver - '-SNAPSHOT'
}
- console.println("Please enter development repository URL:")
+ releaseVer = ver
+
+ console.println("Please enter release version: [defaults to ${releaseVer}]")
String s = console.readLine()
- if (!s) {
- throw new InvalidUserDataException("Development repository URL is empty")
+ if (s) {
+ releaseVer = s
}
- devRepo = new URI(s)
- devRepoFile.text = devRepo.toASCIIString()
- }
-}
-if (devRepo) {
+ releaseTag = Release.rewriteAsReleaseTag(checkoutSnapshot.repo, releaseVer)
+ Release.rewritePom(checkoutSnapshot.localDir, releaseVer, releaseTag)
- task checkoutSnapshot(type: SvnGet) {
- group = 'Repository'
- description = "Checks out project snapshot from '${devRepo}'."
- repo = devRepo
- }
+ releaseVerFile.text = releaseVer
+ releaseTagFile.text = releaseTag.toASCIIString()
- task updateSnapshot(type: SvnUpdate, dependsOn: checkoutSnapshot) {
- group = 'Repository'
- description = "Updates project snapshot from '${devRepo}'."
- repo = checkoutSnapshot.repo
+ println "Release tag: ${releaseTag}"
}
+}
- task prepareRelease(dependsOn: checkoutSnapshot) {
- group = 'Release candidate'
- description = "Prepares release."
- doLast {
- Svn.revert(checkoutSnapshot.localDir)
+task restartRelease(dependsOn: checkoutSnapshot) {
+ group = 'Release'
+ description = "Starts new release based on development snapshot from ${checkoutSnapshot.repo}."
+ doLast {
+ Svn.revert(checkoutSnapshot.localDir)
+ [releaseVerFile, releaseTagFile, rcQualifierFile, rcTagFile,rcRevisionFile,
+ releaseRevisionFile, nextVerFile, nextVerRevisionFile].each { File file ->
+ GFileUtils.deleteQuietly(file)
+ }
+ }
+}
- if (!releaseVer) {
- File pomFile = new File(checkoutSnapshot.localDir, 'pom.xml')
- def pomModel = new XmlSlurper().parse(pomFile)
- String ver = pomModel.version
- if (ver.endsWith('-SNAPSHOT')) {
- ver = ver - '-SNAPSHOT'
- }
- releaseVer = ver
- }
+task prepareRC(dependsOn: prepareRelease) {
+ group = 'Release'
+ description = "Prepares release candidate (RC) tag."
+ inputs.files files(releaseVerFile, releaseTagFile)
+ outputs.files files(rcQualifierFile, rcTagFile)
+ doLast {
+ URI releaseTag = new URI(releaseTagFile.text.trim())
+ String rcQualifier = rcQualifierFile.exists() ? rcQualifierFile.text.trim() : 'RC1'
+ console.println("Please enter release candidate qualifier: [defaults to ${rcQualifier}]")
+ String s = console.readLine()
+ if (s) {
+ rcQualifier = s
+ }
- console.println("Please enter release version: [defaults to ${releaseVer}]")
- String s = console.readLine()
- if (s) {
- releaseVer = s
- }
+ URI rcTag = new URI(releaseTag.scheme, releaseTag.userInfo, releaseTag.host, releaseTag.port,
+ releaseTag.path + '-' + rcQualifier, null, null)
- releaseTag = Release.rewriteAsReleaseTag(devRepo, releaseVer)
- Release.rewritePom(checkoutSnapshot.localDir, releaseVer, releaseTag)
+ rcQualifierFile.text = rcQualifier
+ rcTagFile.text = rcTag.toASCIIString()
- [rcQualifierFile, rcTagFile, rcReadyFile, rcPromotedFile, nextVerFile]
- .each { File file ->
- if (file && file.exists()) {
- file.delete()
- }
- }
+ println "RC tag: ${rcTag}"
+ }
+}
- releaseVerFile.text = releaseVer
- releaseTagFile.text = releaseTag.toASCIIString()
+task cancelRC(dependsOn: [prepareRelease, updateSnapshot]) {
+ group = 'Release'
+ description = "Cancels current RC."
+ doLast {
+ GFileUtils.deleteQuietly(rcRevisionFile)
- println "Release tag: ${releaseTag}"
+ String rcQualifier = rcQualifierFile.exists() ? rcQualifierFile.text.trim() : null
+ if (rcQualifier) {
+ def m = rcQualifier =~ 'RC(\\d)'
+ if (m.find()) {
+ int n = Integer.parseInt(m.group(1))
+ rcQualifier = 'RC' + (++n)
+ }
}
+ if (!rcQualifier) {
+ rcQualifier = 'RC1'
+ }
+ rcQualifierFile.text = rcQualifier
}
+}
- task prepareRCTag(dependsOn: prepareRelease) {
- group = 'Release candidate'
- description = "Prepares release candidate (RC) tag."
- doLast {
- if (rcQualifier) {
- def m = rcQualifier =~ 'RC(\\d)'
- if (m.find()) {
- int n = Integer.parseInt(m.group(1))
- rcQualifier = 'RC' + (++n)
- }
- }
- if (!rcQualifier) {
- rcQualifier = 'RC1'
- }
+task previewRC(type: SvnStatus, dependsOn: prepareRC) {
+ group = 'Release'
+ description = "Displays local changes for release candidate (RC) tag."
+ repo = checkoutSnapshot.repo
+ doFirst {
+ URI rcTag = new URI(rcTagFile.text.trim())
+ println "Local changes for ${rcTag}"
+ println "${checkoutSnapshot.localDir}"
+ }
+}
- console.println("Please enter release candidate qualifier: [defaults to ${rcQualifier}]")
- String s = console.readLine()
- if (s) {
- rcQualifier = s
- }
- rcQualifierFile.text = rcQualifier
+task commitRCTag(dependsOn: prepareRC) {
+ group = 'Release'
+ description = "Commits release candidate (RC) tag."
+ inputs.files files(releaseVerFile, rcTagFile, rcQualifierFile)
+ outputs.files file(rcRevisionFile)
+ doLast {
+ String releaseVer = releaseVerFile.text.trim()
+ String rcQualifier = rcQualifierFile.text.trim()
+ URI rcTag = new URI(rcTagFile.text.trim())
- rcTag = new URI(releaseTag.scheme, releaseTag.userInfo, releaseTag.host, releaseTag.port,
- releaseTag.path + '-' + rcQualifier, null, null)
+ File pomFile = new File(checkoutSnapshot.localDir, 'pom.xml')
+ def pomModel = new XmlSlurper().parse(pomFile)
+ String artifactId = pomModel.artifactId
+ String name = getProductName(artifactId)
- [rcReadyFile, rcPromotedFile, nextVerFile]
- .each { File file ->
- if (file && file.exists()) {
- file.delete()
- }
- }
+ println "Creating tag for ${name} ${releaseVer} ${rcQualifier} from local content"
- Svn.status(checkoutSnapshot.localDir)
- println "Local changeset for release ${releaseVer} " +
- "can be found at ${checkoutSnapshot.localDir}"
+ long revision = Svn.copyLocal(checkoutSnapshot.localDir, rcTag, "${name} ${releaseVer} ${rcQualifier} tag")
+ println ""
- rcTagFile.text = rcTag.toASCIIString()
- }
+ rcRevisionFile.text = revision
}
-
}
-if (rcTag) {
+if (!HC_DIST_STAGING) {
+ throw InvalidUserDataException("HC_DIST_STAGING not set")
+}
- task commitRCTag() {
- group = 'Release candidate'
- description = "Commits release candidate (RC) tag."
- doLast {
- File pomFile = new File(checkoutSnapshot.localDir, 'pom.xml')
- def pomModel = new XmlSlurper().parse(pomFile)
- String artifactId = pomModel.artifactId
- String name = getProductName(artifactId)
+task checkoutDistStage(type: SvnGet) {
+ group = 'Repository'
+ description = "Checks out dist staging from '${HC_DIST_STAGING}'."
+ repo = new URI(HC_DIST_STAGING)
+}
- println "Creating ${name} ${ver} ${rcQualifier} tag"
+task updateDistStage(type: SvnUpdate, dependsOn: checkoutDistStage) {
+ group = 'Repository'
+ description = "Checks out dist staging from '${checkoutDistStage.repo}'."
+ repo = checkoutDistStage.repo
+}
- Svn.copyLocal(checkoutSnapshot.localDir, rcTag, "${name} ${releaseVer} ${rcQualifier} tag")
+task revertDistStage(type: SvnRevert, dependsOn: checkoutDistStage) {
+ group = 'Repository'
+ description = "Reverts changes to the development snapshot."
+ repo = checkoutDistStage.repo
+}
- println ""
- }
- }
+if (rcTagFile.exists() && rcRevisionFile.exists()) {
task checkoutRC(type: SvnGet) {
group = 'Repository'
- description = "Checks out RC from '${rcTag}'."
- repo = rcTag
+ description = "Checks out RC."
+ repo = new URI(rcTagFile.text.trim())
}
task buildRC(dependsOn: checkoutRC) {
- group = 'Release candidate'
+ group = 'Release'
description = "Compiles and builds artifacts based on RC."
+ inputs.files fileTree(dir: checkoutRC.localDir, excludes:['**/target/**','**/.svn/**'])
+ outputs.files fileTree(dir: checkoutRC.localDir, includes:['**/target/*.jar'])
doLast {
+ String releaseVer = releaseVerFile.text.trim()
+ String rcQualifier = rcQualifierFile.text.trim()
+
File pomFile = new File(checkoutRC.localDir, 'pom.xml')
def pomModel = new XmlSlurper().parse(pomFile)
String artifactId = pomModel.artifactId
@@ -222,167 +243,158 @@ if (rcTag) {
println "Building ${name} ${releaseVer} based on ${rcQualifier}"
mvn.exec(checkoutRC.localDir, 'clean', 'install')
- rcReadyFile.text = 'true'
}
}
-}
-
-if (rcReady) {
-
File dir = checkoutRC.localDir
- Pom pom = Mvn.parsePom(dir)
+ if (dir.exists()) {
- Configuration binCfg = project.configurations.create('rc')
- // Declare dependencies (excluding OSGi bundle)
- pom.modules.each { String submodule ->
- if (!submodule.endsWith('-osgi')) {
- project.dependencies.add(
- binCfg.name,
- ['group': pom.groupId, 'name': submodule, 'version': pom.version])
- }
- }
-
- if (!HC_DIST_STAGING) {
- throw InvalidUserDataException("HC_DIST_STAGING not set")
- }
-
- task checkoutDistStage(type: SvnGet) {
- group = 'Repository'
- description = "Checks out dist staging from '${HC_DIST_STAGING}'."
- repo = new URI(HC_DIST_STAGING)
- }
-
- task updateDistStage(type: SvnUpdate, dependsOn: checkoutDistStage) {
- group = 'Repository'
- description = "Checks out dist staging from '${HC_DIST_STAGING}'."
- repo = checkoutDistStage.repo
- }
+ Pom pom = Mvn.parsePom(dir)
- configurations {
- dist
- }
-
- task distWinBin(type: Zip) {
- with docs(dir, pom, Line.CRLF), atrifacts(configurations.rc)
- classifier = 'bin'
- }
-
- task distUxBin(type: Tar) {
- with docs(dir, pom, Line.LF), atrifacts(configurations.rc)
- classifier = 'bin'
- }
+ Configuration binCfg = project.configurations.create('rc')
+ // Declare dependencies (excluding OSGi bundle)
+ pom.modules.each { String submodule ->
+ if (!submodule.endsWith('-osgi')) {
+ project.dependencies.add(
+ binCfg.name,
+ ['group': pom.groupId, 'name': submodule, 'version': pom.version])
+ }
+ }
- task distWinOSGiBin(type: Zip) {
- with docs(dir, pom, Line.CRLF), osgiBundle(dir, pom)
- classifier = 'osgi-bin'
- }
+ configurations {
+ dist
+ }
- task distUxOSGiBin(type: Tar) {
- with docs(dir, pom, Line.LF), osgiBundle(dir, pom)
- classifier = 'osgi-bin'
- }
+ task distWinBin(type: Zip) {
+ with docs(dir, pom, Line.CRLF), atrifacts(configurations.rc)
+ classifier = 'bin'
+ }
- task distWinSrc(type: Zip) {
- with sources(dir, pom, Line.CRLF)
- into "${pom.artifactId}-${pom.version}"
- classifier = 'src'
- }
+ task distUxBin(type: Tar) {
+ with docs(dir, pom, Line.LF), atrifacts(configurations.rc)
+ classifier = 'bin'
+ }
- task distUxSrc(type: Tar) {
- with sources(dir, pom, Line.LF)
- into "${pom.artifactId}-${pom.version}"
- classifier = 'src'
- }
+ task distWinOSGiBin(type: Zip) {
+ with docs(dir, pom, Line.CRLF), osgiBundle(dir, pom)
+ classifier = 'osgi-bin'
+ }
- String rcName = getProductName(pom.artifactId).toLowerCase(Locale.US)
- String rcFullName = "${rcName}-${pom.version}-${rcQualifier}"
- String releaseNotes = "RELEASE_NOTES-${pom.major}.${pom.minor}.x.txt"
+ task distUxOSGiBin(type: Tar) {
+ with docs(dir, pom, Line.LF), osgiBundle(dir, pom)
+ classifier = 'osgi-bin'
+ }
- tasks.withType(AbstractArchiveTask) { AbstractArchiveTask archive ->
- archive.dependsOn checkoutDistStage
- archive.baseName = pom.artifactId
- archive.version = pom.version
- archive.destinationDir = file("${checkoutDistStage.localDir}/${rcFullName}")
- }
+ task distWinSrc(type: Zip) {
+ with sources(dir, pom, Line.CRLF)
+ into "${pom.artifactId}-${pom.version}"
+ classifier = 'src'
+ }
- tasks.withType(Tar) { Tar tar ->
- tar.extension = "tar.gz"
- tar.compression = Compression.GZIP
- }
+ task distUxSrc(type: Tar) {
+ with sources(dir, pom, Line.LF)
+ into "${pom.artifactId}-${pom.version}"
+ classifier = 'src'
+ }
- tasks.withType(Tar) { Tar tar ->
- tar.extension = "tar.gz"
- tar.compression = Compression.GZIP
- }
+ String rcQualifier = rcQualifierFile.text.trim()
+ String rcName = getProductName(pom.artifactId).toLowerCase(Locale.US)
+ String rcFullName = "${rcName}-${pom.version}-${rcQualifier}"
+ String releaseNotes = "RELEASE_NOTES-${pom.major}.${pom.minor}.x.txt"
- task sign(type: Sign, dependsOn: checkoutDistStage) {
- sign configurations.dist
- }
+ tasks.withType(AbstractArchiveTask) { AbstractArchiveTask archive ->
+ archive.dependsOn checkoutDistStage
+ archive.baseName = pom.artifactId
+ archive.version = pom.version
+ archive.destinationDir = file("${checkoutDistStage.localDir}/${rcFullName}")
+ }
- task digest(type: Digest, dependsOn: checkoutDistStage) {
- digest configurations.dist
- }
+ tasks.withType(Tar) { Tar tar ->
+ tar.extension = "tar.gz"
+ tar.compression = Compression.GZIP
+ }
- task docs(type: Copy, dependsOn: checkoutDistStage) {
- from "${checkoutRC.localDir}/RELEASE_NOTES.txt"
- into "${checkoutDistStage.localDir}/${rcFullName}"
- rename { releaseNotes }
- }
+ tasks.withType(Tar) { Tar tar ->
+ tar.extension = "tar.gz"
+ tar.compression = Compression.GZIP
+ }
- artifacts {
- tasks.withType(AbstractArchiveTask) { AbstractArchiveTask archive ->
- dist archive
+ task sign(type: Sign, dependsOn: checkoutDistStage) {
+ sign configurations.dist
}
- sign.signatures.each { PublishArtifact artifact ->
- archives artifact
+
+ task digest(type: Digest, dependsOn: checkoutDistStage) {
+ digest configurations.dist
}
- digest.hashes.each { PublishArtifact artifact ->
- archives artifact
+
+ task docs(type: Copy, dependsOn: checkoutDistStage) {
+ from "${checkoutRC.localDir}/RELEASE_NOTES.txt"
+ into "${checkoutDistStage.localDir}/${rcFullName}"
+ rename { releaseNotes }
}
- archives(new File(docs.destinationDir, releaseNotes)) {
- classifier = 'doc'
+
+ artifacts {
+ tasks.withType(AbstractArchiveTask) { AbstractArchiveTask archive ->
+ dist archive
+ }
+ sign.signatures.each { PublishArtifact artifact ->
+ archives artifact
+ }
+ digest.hashes.each { PublishArtifact artifact ->
+ archives artifact
+ }
+ archives(new File(docs.destinationDir, releaseNotes)) {
+ classifier = 'doc'
+ }
}
- }
- assemble.dependsOn = [sign, digest, docs]
+ assemble.dependsOn = [sign, digest, docs]
- task svnmucc() {
- group = 'Release candidate'
- description = "Generates svnmucc command file."
- doLast {
- println 'svnmucc file'
- println '----------------8<-------------[ cut here ]------------------'
- println "rm"
- println "release/httpcomponents/${rcName}/${releaseNotes}"
- println ""
- Configuration cfg = configurations.archives
- cfg.artifacts.each { PublishArtifact artifact ->
- println "mv"
- println "dev/httpcomponents/${rcFullName}/${artifact.file.name}"
- switch(artifact.classifier) {
- case ~/^(osgi-)?bin/:
- println "release/httpcomponents/${rcName}/binary/${artifact.file.name}"
- break
- case "src":
- println "release/httpcomponents/${rcName}/source/${artifact.file.name}"
- break
- default:
- println "release/httpcomponents/${rcName}/${artifact.file.name}"
- break
- }
+ task svnmucc() {
+ group = 'Release'
+ description = "Generates svnmucc command file."
+ doLast {
+ println 'svnmucc file'
+ println '----------------8<-------------[ cut here ]------------------'
+ println "rm"
+ println "release/httpcomponents/${rcName}/${releaseNotes}"
println ""
+ Configuration cfg = configurations.archives
+ cfg.artifacts.each { PublishArtifact artifact ->
+ println "mv"
+ println "dev/httpcomponents/${rcFullName}/${artifact.file.name}"
+ switch(artifact.classifier) {
+ case ~/^(osgi-)?bin/:
+ println "release/httpcomponents/${rcName}/binary/${artifact.file.name}"
+ break
+ case "src":
+ println "release/httpcomponents/${rcName}/source/${artifact.file.name}"
+ break
+ default:
+ println "release/httpcomponents/${rcName}/${artifact.file.name}"
+ break
+ }
+ println ""
+ }
+ println "rm"
+ println "dev/httpcomponents/${rcFullName}"
+ println '----------------8<-------------[ cut here ]------------------'
}
- println "rm"
- println "dev/httpcomponents/${rcFullName}"
- println '----------------8<-------------[ cut here ]------------------'
}
+
}
- task promoteRC() {
- group = 'Release candidate'
+ task promoteRC(dependsOn: checkoutRC) {
+ group = 'Release'
description = "Promotes RC to official release."
+ inputs.files files(releaseVerFile, rcQualifierFile, releaseTagFile, rcTagFile)
+ outputs.files file(releaseRevisionFile)
doLast {
+ String releaseVer = releaseVerFile.text.trim()
+ String rcQualifier = rcQualifierFile.text.trim()
+ URI releaseTag = new URI(releaseTagFile.text.trim())
+ URI rcTag = new URI(rcTagFile.text.trim())
+
File pomFile = new File(checkoutRC.localDir, 'pom.xml')
def pomModel = new XmlSlurper().parse(pomFile)
String artifactId = pomModel.artifactId
@@ -391,22 +403,24 @@ if (rcReady) {
println "Promoting ${name} ${releaseVer} ${rcQualifier } to official release"
println "Copying ${rcTag} to ${releaseTag}"
- Svn.copyRemote(rcTag, releaseTag, "${name} ${releaseVer} release tag")
+ long revision = Svn.copyRemote(rcTag, releaseTag, "${name} ${releaseVer} release tag")
- rcPromotedFile.text = 'true'
+ releaseRevisionFile.text = revision
}
}
}
+if (releaseTagFile.exists() && releaseRevisionFile.exists()) {
-if (rcPromoted) {
-
- task prepareNextVersion() {
- group = 'Release management'
+ task prepareNextVersion(dependsOn: checkoutSnapshot) {
+ group = 'Release'
description = "Prepares next development version."
+ inputs.files file(releaseVerFile)
+ outputs.files file(nextVerFile)
doLast {
- nextVer = Release.upgradeVersion(releaseVer)
+ String releaseVer = releaseVerFile.text.trim()
+ String nextVer = Release.upgradeVersion(releaseVer)
console.println("Please enter new development version: [defaults to ${nextVer}]")
String s = console.readLine()
if (s) {
@@ -416,39 +430,47 @@ if (rcPromoted) {
nextVer = nextVer + '-SNAPSHOT'
}
- Release.rewritePom(checkoutSnapshot.localDir, nextVer, devRepo)
-
- Svn.status(checkoutSnapshot.localDir)
- println "Local changeset for next development version ${nextVer} " +
- "can be found at ${checkoutSnapshot.localDir}"
+ Release.rewritePom(checkoutSnapshot.localDir, nextVer, checkoutSnapshot.repo)
nextVerFile.text = nextVer
}
}
-}
-
-if (nextVer) {
+ task previewNextVersion(type: SvnStatus, dependsOn: prepareNextVersion) {
+ group = 'Release'
+ description = "Displays local changes for next development version."
+ repo = checkoutSnapshot.repo
+ doFirst {
+ String nextVer = nextVerFile.text.trim()
+ println "Next development version: ${nextVer}"
+ println "${checkoutSnapshot.localDir}"
+ }
+ }
- task commitNextVersion() {
- group = 'Release management'
+ task commitNextVersion(dependsOn: prepareNextVersion) {
+ group = 'Release'
description = "Commits next development version."
+ inputs.files file(nextVerFile)
+ inputs.files file(nextVerRevisionFile)
doLast {
+ String nextVer = nextVerFile.text.trim()
File pomFile = new File(checkoutSnapshot.localDir, 'pom.xml')
def pomModel = new XmlSlurper().parse(pomFile)
String artifactId = pomModel.artifactId
String name = getProductName(artifactId)
- println "Upgrading ${name} version to ${nextVer}"
-
- Svn.commit(checkoutSnapshot.localDir, "Upgraded ${name} version to ${nextVer}")
+ println "Committing changes to upgrade ${name} to version ${nextVer}"
+ long revision = Svn.commit(checkoutSnapshot.localDir, "Upgraded ${name} version to ${nextVer}")
println ""
+
+ nextVerRevisionFile.text = revision
}
}
}
+
/////////////////////////// Helper utilities //////////////////////////////////
String getProductName(String artifactId) {
@@ -640,7 +662,7 @@ task checkoutSiteStage(type: SvnGet) {
task updateSiteStage(type: SvnUpdate, dependsOn: checkoutSiteStage) {
group = 'Repository'
- description = "Update website content stage from ${HC_SITE_STAGING}."
+ description = "Update website content stage from ${checkoutSiteStage.repo}."
repo = checkoutSiteStage.repo
}
Modified: httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/Svn.groovy
URL: http://svn.apache.org/viewvc/httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/Svn.groovy?rev=1524094&r1=1524093&r2=1524094&view=diff
==============================================================================
--- httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/Svn.groovy (original)
+++ httpcomponents/project-release-tools/trunk/buildSrc/src/main/groovy/Svn.groovy Tue Sep 17 15:30:21 2013
@@ -29,6 +29,7 @@ import org.tmatesoft.svn.cli.SVNConsoleA
import org.tmatesoft.svn.cli.svn.SVNCommandEnvironment
import org.tmatesoft.svn.cli.svn.SVNNotifyPrinter
import org.tmatesoft.svn.cli.svn.SVNStatusPrinter
+import org.tmatesoft.svn.core.SVNCommitInfo
import org.tmatesoft.svn.core.SVNDepth
import org.tmatesoft.svn.core.SVNException
import org.tmatesoft.svn.core.SVNURL
@@ -152,7 +153,7 @@ class Svn {
}
}
- static void commit(File dir, String message) {
+ static long commit(File dir, String message) {
SVNCommandEnvironment env = getSVNCommandEnvironment()
SvnOperationFactory opfactory = createOperationFactory(env)
try {
@@ -160,13 +161,14 @@ class Svn {
commitOp.setSingleTarget(SvnTarget.fromFile(dir))
commitOp.setDepth(SVNDepth.INFINITY)
commitOp.setCommitMessage(message)
- commitOp.run()
+ SVNCommitInfo result = commitOp.run()
+ result.newRevision
} finally {
opfactory.dispose()
}
}
- static void copyLocal(File dir, URI dst, String message) {
+ static long copyLocal(File dir, URI dst, String message) {
SVNCommandEnvironment env = getSVNCommandEnvironment()
SvnOperationFactory opfactory = createOperationFactory(env)
try {
@@ -177,13 +179,14 @@ class Svn {
copyOp.setFailWhenDstExists(true)
copyOp.setDisableLocalModifications(false)
copyOp.setCommitMessage(message)
- copyOp.run()
+ SVNCommitInfo result = copyOp.run()
+ result.newRevision
} finally {
opfactory.dispose()
}
}
- static void copyRemote(URI src, URI dst, String message) {
+ static long copyRemote(URI src, URI dst, String message) {
SVNCommandEnvironment env = getSVNCommandEnvironment()
SvnOperationFactory opfactory = createOperationFactory(env)
try {
@@ -194,7 +197,8 @@ class Svn {
copyOp.setSingleTarget(SvnTarget.fromURL(SVNURL.parseURIEncoded(dst.toASCIIString())))
copyOp.setFailWhenDstExists(true)
copyOp.setCommitMessage(message)
- copyOp.run()
+ SVNCommitInfo result = copyOp.run()
+ result.newRevision
} finally {
opfactory.dispose()
}
Modified: httpcomponents/project-release-tools/trunk/gradle.properties.template
URL: http://svn.apache.org/viewvc/httpcomponents/project-release-tools/trunk/gradle.properties.template?rev=1524094&r1=1524093&r2=1524094&view=diff
==============================================================================
--- httpcomponents/project-release-tools/trunk/gradle.properties.template (original)
+++ httpcomponents/project-release-tools/trunk/gradle.properties.template Tue Sep 17 15:30:21 2013
@@ -1,8 +1,9 @@
MAVEN_HOME=/opt/maven
+HC_DEV = https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk
HC_DIST_STAGING=https://dist.apache.org/repos/dist/dev/httpcomponents/
-HC_SITE_STAGING=http://svn.apache.org/repos/asf/httpcomponents/site/
-HC_PROJECT_SITE=http://svn.apache.org/repos/asf/httpcomponents/project-website/trunk/
+HC_SITE_STAGING=https://svn.apache.org/repos/asf/httpcomponents/site/
+HC_PROJECT_SITE=https://svn.apache.org/repos/asf/httpcomponents/project-website/trunk/
HC_PUBLISHED_RELEASES=