You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2012/01/30 17:01:47 UTC
svn commit: r1237745 - /tapestry/tapestry5/trunk/build.gradle
Author: hlship
Date: Mon Jan 30 16:01:47 2012
New Revision: 1237745
URL: http://svn.apache.org/viewvc?rev=1237745&view=rev
Log:
Update the build to generate and upload PGP signatures along with the MD5 checksums for the sources and javadoc artifacts
Modified:
tapestry/tapestry5/trunk/build.gradle
Modified: tapestry/tapestry5/trunk/build.gradle
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/build.gradle?rev=1237745&r1=1237744&r2=1237745&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/build.gradle (original)
+++ tapestry/tapestry5/trunk/build.gradle Mon Jan 30 16:01:47 2012
@@ -2,6 +2,7 @@ description = "Apache Tapestry 5 Project
apply plugin: "base"
apply plugin: "sonar"
+
apply from: "ssh.gradle"
apply from: "md5.gradle"
@@ -35,7 +36,8 @@ doSign = !project.hasProperty("noSign")
deployUsernameProperty = isSnapshot() ? "snapshotDeployUserName" : "apacheDeployUserName"
deployPasswordProperty = isSnapshot() ? "snapshotDeployPassword" : "apacheDeployPassword"
-canDeploy = [deployUsernameProperty, deployPasswordProperty].every { project.hasProperty(it) }
+canDeploy = doSign && [deployUsernameProperty, deployPasswordProperty].every { project.hasProperty(it) }
+
deployUsername = { getProperty(deployUsernameProperty) }
deployPassword = { getProperty(deployPasswordProperty) }
@@ -55,6 +57,8 @@ allprojects {
apply plugin: "eclipse"
apply plugin: "idea"
+ apply plugin: "signing"
+
repositories {
mavenCentral()
@@ -168,7 +172,6 @@ subprojects {
}
if (rootProject.doSign) {
- apply plugin: "signing"
// sign (create PGP signature for) archives (standard JARs)
// and meta (sources JARs)
signing { sign configurations.archives, configurations.meta }
@@ -208,6 +211,7 @@ subprojects.each { project.evaluationDep
// Cribbed from https://github.com/hibernate/hibernate-core/blob/master/release/release.gradle#L19
+
task aggregateJavadoc(type: Javadoc) {
dependsOn configurations.javadoc
@@ -309,25 +313,51 @@ task zippedJavadoc(type: Zip) {
into "apidocs"
}
-task generateMD5Checksums(type: GenMD5) {
- group "Release artifact"
- description "Creates MD5 checksums for zippedJavadoc and zippedSources"
- source zippedJavadoc, zippedSources
- outputDir "$buildDir/md5"
-}
-if(canDeploy) {
+
+if (canDeploy) {
+
+ configurations {
+ archives
+ uploads.extendsFrom archives, signatures
+ }
+
+
+ task generateMD5Checksums(type: GenMD5) {
+ group "Release artifact"
+ description "Creates MD5 checksums for archives of source and JavaDoc"
+ source configurations.archives
+ outputDir "$buildDir/md5"
+ }
+
+ artifacts {
+ archives zippedJavadoc, zippedSources
+ }
+
+ configurations {
+ upload.extendsFrom archives, signatures
+ }
+
+ signing {
+ sign configurations.archives
+ }
+
task uploadSourcesAndJavadocs(type: Scp) {
group "Release artifact"
- description "Uploads source and JavaDoc Zips and MD5 checksums to people.apache.org"
+ description "Uploads source and JavaDoc Zips and MD5 checksums and PGP signatures to people.apache.org"
+
+ source files(generateMD5Checksums, configurations.upload.allArtifacts.files)
- source files(generateMD5Checksums, generateMD5Checksums.inputs.files)
host "people.apache.org"
userName deployUsername()
password deployPassword()
// The destination folder needs to already exist.
destination "public_html/tapestry-releases"
verbose true
+
+ doFirst {
+ logger.info "Uploads files: ${source.files}"
+ }
}
task generateRelease {
Re: svn commit: r1237745 - /tapestry/tapestry5/trunk/build.gradle
Posted by Ulrich Stärk <ul...@spielviel.de>.
Looks good, thanks!
Uli
Am 30.01.2012 um 22:18 schrieb Howard Lewis Ship <hl...@gmail.com>:
> Latest couple of commits should fix it.
>
> On Mon, Jan 30, 2012 at 12:00 PM, Howard Lewis Ship <hl...@gmail.com> wrote:
>> Apparently, I didn't understand snapshot deployment, I was only
>> thinking in terms of manual execution of generateRelease; I'll figure
>> out how to split doSign and canDeploy again.
>>
>> On Mon, Jan 30, 2012 at 10:23 AM, Ulrich Stärk <ul...@spielviel.de> wrote:
>>> On 30.01.2012 17:01, hlship@apache.org wrote:
>>>> Author: hlship
>>>> Date: Mon Jan 30 16:01:47 2012
>>>> New Revision: 1237745
>>>>
>>>> URL: http://svn.apache.org/viewvc?rev=1237745&view=rev
>>>> Log:
>>>> Update the build to generate and upload PGP signatures along with the MD5 checksums for the sources and javadoc artifacts
>>>>
>>>> Modified:
>>>> tapestry/tapestry5/trunk/build.gradle
>>>>
>>>> Modified: tapestry/tapestry5/trunk/build.gradle
>>>> URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/build.gradle?rev=1237745&r1=1237744&r2=1237745&view=diff
>>>> ==============================================================================
>>>> --- tapestry/tapestry5/trunk/build.gradle (original)
>>>> +++ tapestry/tapestry5/trunk/build.gradle Mon Jan 30 16:01:47 2012
>>>> @@ -2,6 +2,7 @@ description = "Apache Tapestry 5 Project
>>>>
>>>> apply plugin: "base"
>>>> apply plugin: "sonar"
>>>> +
>>>> apply from: "ssh.gradle"
>>>> apply from: "md5.gradle"
>>>>
>>>> @@ -35,7 +36,8 @@ doSign = !project.hasProperty("noSign")
>>>> deployUsernameProperty = isSnapshot() ? "snapshotDeployUserName" : "apacheDeployUserName"
>>>> deployPasswordProperty = isSnapshot() ? "snapshotDeployPassword" : "apacheDeployPassword"
>>>>
>>>> -canDeploy = [deployUsernameProperty, deployPasswordProperty].every { project.hasProperty(it) }
>>>> +canDeploy = doSign && [deployUsernameProperty, deployPasswordProperty].every { project.hasProperty(it) }
>>>> +
>>> This breaks snapshot deployment since snapshots don't get signed but snapshot deployment breaks if
>>> canDeploy == false.
>>>
>>> Please fix, I don't know what you had in mind when you changed canDeploy to also taking doSign into
>>> account.
>>>
>>> Uli
>>>
>>> ---------------------------------------------------------------------
>>> To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
>>> For additional commands, e-mail: dev-help@tapestry.apache.org
>>>
>>
>>
>>
>> --
>> 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
>
>
>
> --
> 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: dev-unsubscribe@tapestry.apache.org
> For additional commands, e-mail: dev-help@tapestry.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
For additional commands, e-mail: dev-help@tapestry.apache.org
Re: svn commit: r1237745 - /tapestry/tapestry5/trunk/build.gradle
Posted by Howard Lewis Ship <hl...@gmail.com>.
Latest couple of commits should fix it.
On Mon, Jan 30, 2012 at 12:00 PM, Howard Lewis Ship <hl...@gmail.com> wrote:
> Apparently, I didn't understand snapshot deployment, I was only
> thinking in terms of manual execution of generateRelease; I'll figure
> out how to split doSign and canDeploy again.
>
> On Mon, Jan 30, 2012 at 10:23 AM, Ulrich Stärk <ul...@spielviel.de> wrote:
>> On 30.01.2012 17:01, hlship@apache.org wrote:
>>> Author: hlship
>>> Date: Mon Jan 30 16:01:47 2012
>>> New Revision: 1237745
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1237745&view=rev
>>> Log:
>>> Update the build to generate and upload PGP signatures along with the MD5 checksums for the sources and javadoc artifacts
>>>
>>> Modified:
>>> tapestry/tapestry5/trunk/build.gradle
>>>
>>> Modified: tapestry/tapestry5/trunk/build.gradle
>>> URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/build.gradle?rev=1237745&r1=1237744&r2=1237745&view=diff
>>> ==============================================================================
>>> --- tapestry/tapestry5/trunk/build.gradle (original)
>>> +++ tapestry/tapestry5/trunk/build.gradle Mon Jan 30 16:01:47 2012
>>> @@ -2,6 +2,7 @@ description = "Apache Tapestry 5 Project
>>>
>>> apply plugin: "base"
>>> apply plugin: "sonar"
>>> +
>>> apply from: "ssh.gradle"
>>> apply from: "md5.gradle"
>>>
>>> @@ -35,7 +36,8 @@ doSign = !project.hasProperty("noSign")
>>> deployUsernameProperty = isSnapshot() ? "snapshotDeployUserName" : "apacheDeployUserName"
>>> deployPasswordProperty = isSnapshot() ? "snapshotDeployPassword" : "apacheDeployPassword"
>>>
>>> -canDeploy = [deployUsernameProperty, deployPasswordProperty].every { project.hasProperty(it) }
>>> +canDeploy = doSign && [deployUsernameProperty, deployPasswordProperty].every { project.hasProperty(it) }
>>> +
>> This breaks snapshot deployment since snapshots don't get signed but snapshot deployment breaks if
>> canDeploy == false.
>>
>> Please fix, I don't know what you had in mind when you changed canDeploy to also taking doSign into
>> account.
>>
>> Uli
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
>> For additional commands, e-mail: dev-help@tapestry.apache.org
>>
>
>
>
> --
> 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
--
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: dev-unsubscribe@tapestry.apache.org
For additional commands, e-mail: dev-help@tapestry.apache.org
Re: svn commit: r1237745 - /tapestry/tapestry5/trunk/build.gradle
Posted by Howard Lewis Ship <hl...@gmail.com>.
Apparently, I didn't understand snapshot deployment, I was only
thinking in terms of manual execution of generateRelease; I'll figure
out how to split doSign and canDeploy again.
On Mon, Jan 30, 2012 at 10:23 AM, Ulrich Stärk <ul...@spielviel.de> wrote:
> On 30.01.2012 17:01, hlship@apache.org wrote:
>> Author: hlship
>> Date: Mon Jan 30 16:01:47 2012
>> New Revision: 1237745
>>
>> URL: http://svn.apache.org/viewvc?rev=1237745&view=rev
>> Log:
>> Update the build to generate and upload PGP signatures along with the MD5 checksums for the sources and javadoc artifacts
>>
>> Modified:
>> tapestry/tapestry5/trunk/build.gradle
>>
>> Modified: tapestry/tapestry5/trunk/build.gradle
>> URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/build.gradle?rev=1237745&r1=1237744&r2=1237745&view=diff
>> ==============================================================================
>> --- tapestry/tapestry5/trunk/build.gradle (original)
>> +++ tapestry/tapestry5/trunk/build.gradle Mon Jan 30 16:01:47 2012
>> @@ -2,6 +2,7 @@ description = "Apache Tapestry 5 Project
>>
>> apply plugin: "base"
>> apply plugin: "sonar"
>> +
>> apply from: "ssh.gradle"
>> apply from: "md5.gradle"
>>
>> @@ -35,7 +36,8 @@ doSign = !project.hasProperty("noSign")
>> deployUsernameProperty = isSnapshot() ? "snapshotDeployUserName" : "apacheDeployUserName"
>> deployPasswordProperty = isSnapshot() ? "snapshotDeployPassword" : "apacheDeployPassword"
>>
>> -canDeploy = [deployUsernameProperty, deployPasswordProperty].every { project.hasProperty(it) }
>> +canDeploy = doSign && [deployUsernameProperty, deployPasswordProperty].every { project.hasProperty(it) }
>> +
> This breaks snapshot deployment since snapshots don't get signed but snapshot deployment breaks if
> canDeploy == false.
>
> Please fix, I don't know what you had in mind when you changed canDeploy to also taking doSign into
> account.
>
> Uli
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
> For additional commands, e-mail: dev-help@tapestry.apache.org
>
--
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: dev-unsubscribe@tapestry.apache.org
For additional commands, e-mail: dev-help@tapestry.apache.org
Re: svn commit: r1237745 - /tapestry/tapestry5/trunk/build.gradle
Posted by Ulrich Stärk <ul...@spielviel.de>.
On 30.01.2012 17:01, hlship@apache.org wrote:
> Author: hlship
> Date: Mon Jan 30 16:01:47 2012
> New Revision: 1237745
>
> URL: http://svn.apache.org/viewvc?rev=1237745&view=rev
> Log:
> Update the build to generate and upload PGP signatures along with the MD5 checksums for the sources and javadoc artifacts
>
> Modified:
> tapestry/tapestry5/trunk/build.gradle
>
> Modified: tapestry/tapestry5/trunk/build.gradle
> URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/build.gradle?rev=1237745&r1=1237744&r2=1237745&view=diff
> ==============================================================================
> --- tapestry/tapestry5/trunk/build.gradle (original)
> +++ tapestry/tapestry5/trunk/build.gradle Mon Jan 30 16:01:47 2012
> @@ -2,6 +2,7 @@ description = "Apache Tapestry 5 Project
>
> apply plugin: "base"
> apply plugin: "sonar"
> +
> apply from: "ssh.gradle"
> apply from: "md5.gradle"
>
> @@ -35,7 +36,8 @@ doSign = !project.hasProperty("noSign")
> deployUsernameProperty = isSnapshot() ? "snapshotDeployUserName" : "apacheDeployUserName"
> deployPasswordProperty = isSnapshot() ? "snapshotDeployPassword" : "apacheDeployPassword"
>
> -canDeploy = [deployUsernameProperty, deployPasswordProperty].every { project.hasProperty(it) }
> +canDeploy = doSign && [deployUsernameProperty, deployPasswordProperty].every { project.hasProperty(it) }
> +
This breaks snapshot deployment since snapshots don't get signed but snapshot deployment breaks if
canDeploy == false.
Please fix, I don't know what you had in mind when you changed canDeploy to also taking doSign into
account.
Uli
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
For additional commands, e-mail: dev-help@tapestry.apache.org