Great! I'd done it tonight, you beat me to it, thanks. Uli
On 08.08.2011 21:04, Howard Lewis Ship wrote: > I've modified this so that we keep the true version number in > build.gradle, but it can be overridden at the command line by Jenkins. > I've updated the Jenkins build to match. > > On Sun, Aug 7, 2011 at 7:13 PM, Howard Lewis Ship <[email protected]> wrote: >> Is there a way we can run the Jenkins build to override the defined >> version number to be 5.3-SNAPSHOT (maybe a command line option)? That >> would be preferable to swapping the version number around even more >> than we do today. >> >> Otherwise, this is great stuff ... some people prefer to track >> nightlies, rather than the alphas I've been creating every couple of >> days :-). >> >> >> On Sun, Aug 7, 2011 at 1:09 PM, Ulrich Stärk <[email protected]> wrote: >>> Yay, it's working! >>> >>> https://repository.apache.org/content/repositories/snapshots/org/apache/tapestry/tapestry-core/5.3-SNAPSHOT/ >>> >>> What it does is pulling in the snapshotDeployUserName and >>> snapshotDeployPassword properties from a >>> ~/.gradle/gradle.properties file set up by the jenkins admins on the build >>> machines. These are used >>> for deploying to the snapshot repository. >>> >>> For this to work, the version number must be x-SNAPHSHOT. As to not have >>> SNAPSHOT versions for every >>> pre-final release, I suggest to keep it at 5.3-SNAPSHOT until we do a 5.3 >>> final release. Whenever we >>> publish preview packages, the version number has to be changed to the >>> preview version for the >>> release, next up 5.3-alpha-10, and needs to be changed back once the >>> preview package is published. >>> >>> Uli >>> >>> On 07.08.2011 21:46, [email protected] wrote: >>>> Author: uli >>>> Date: Sun Aug 7 19:45:59 2011 >>>> New Revision: 1154753 >>>> >>>> URL: http://svn.apache.org/viewvc?rev=1154753&view=rev >>>> Log: >>>> try again with snapshot deployment >>>> >>>> Modified: >>>> tapestry/tapestry5/trunk/build.gradle >>>> >>>> Modified: tapestry/tapestry5/trunk/build.gradle >>>> URL: >>>> http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/build.gradle?rev=1154753&r1=1154752&r2=1154753&view=diff >>>> ============================================================================== >>>> --- tapestry/tapestry5/trunk/build.gradle (original) >>>> +++ tapestry/tapestry5/trunk/build.gradle Sun Aug 7 19:45:59 2011 >>>> @@ -6,7 +6,10 @@ testngVersion = '5.14.9' >>>> easymockVersion = '3.0' >>>> servletAPIVersion = '2.4' >>>> >>>> -version = '5.3-alpha-10' >>>> +version = '5.3-SNAPSHOT' >>>> + >>>> +stagingUrl = >>>> "https://repository.apache.org/service/local/staging/deploy/maven2/"; >>>> +snapshotUrl = >>>> "https://repository.apache.org/content/repositories/snapshots"; >>>> >>>> doSign = !project.hasProperty('noSign') && >>>> project.hasProperty("signing.keyId") >>>> >>>> @@ -119,10 +122,9 @@ subprojects { >>>> >>>> // apacheDeployUserName and apacheDeployPassword should be specified in >>>> ~/.gradle/gradle.properties >>>> >>>> - deployUsernameProperty = "apacheDeployUserName" >>>> - deployPasswordProperty = "apacheDeployPassword" >>>> + deployUsernameProperty = isSnapshot() ? "snapshotDeployUserName" : >>>> "apacheDeployUserName" >>>> + deployPasswordProperty = isSnapshot() ? "snapshotDeployPassword" : >>>> "apacheDeployPassword" >>>> canDeploy = [deployUsernameProperty, deployPasswordProperty].every { >>>> project.hasProperty(it) } >>>> - >>>> >>>> uploadPublished { >>>> >>>> @@ -146,9 +148,13 @@ subprojects { >>>> } >>>> } >>>> >>>> - repository(url: >>>> "https://repository.apache.org/service/local/staging/deploy/maven2/";) { >>>> - authentication(userName: apacheDeployUserName, password: >>>> apacheDeployPassword) >>>> - } >>>> + repository(url: stagingUrl) { >>>> + authentication(userName: >>>> project.getProperty(deployUsernameProperty), password: >>>> project.getProperty(deployPasswordProperty)) >>>> + } >>>> + >>>> + snapshotRepository(url: snapshotUrl) { >>>> + authentication(userName: >>>> project.getProperty(deployUsernameProperty), password: >>>> project.getProperty(deployPasswordProperty)) >>>> + } >>>> } >>>> } >>>> } >>>> @@ -216,7 +222,7 @@ task clean(type: Delete) { >>>> delete buildDirName >>>> } >>>> >>>> -task continuousIntegration(dependsOn: [subprojects.build, >>>> 'aggregateJavadoc'], >>>> +task continuousIntegration(dependsOn: [subprojects.build, >>>> 'aggregateJavadoc', subprojects.uploadPublished], >>>> description: "Task executed on Jenkins CI server after SVN commits") >>>> >>>> task generateRelease(dependsOn: ['continuousIntegration', >>>> subprojects.uploadPublished, 'zippedSources', 'zippedJavadoc'], >>>> @@ -257,3 +263,7 @@ task zippedJavadoc(type: Zip, dependsOn: >>>> from javadocBuildDir.dir >>>> into "apidocs" >>>> } >>>> + >>>> +boolean isSnapshot() { >>>> + project.version.contains('SNAPSHOT') >>>> +} >>>> >>>> >>> --------------------------------------------------------------------- >>> To unsubscribe, e-mail: [email protected] >>> For additional commands, e-mail: [email protected] >>> >>> >> >> >> -- >> Howard M. Lewis Ship >> >> Creator of Apache Tapestry >> >> The source for Tapestry training, mentoring and support. Contact me to >> learn how I can get you up and productive in Tapestry fast! >> >> (971) 678-5210 >> http://howardlewisship.com >> > > --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
