You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2017/01/06 00:27:27 UTC
groovy git commit: push signing of artifacts into the main build
instead of the groovy-release repo (tweaks)
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_4_X e3288bde7 -> a95ce9a7b
push signing of artifacts into the main build instead of the groovy-release repo (tweaks)
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/a95ce9a7
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/a95ce9a7
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/a95ce9a7
Branch: refs/heads/GROOVY_2_4_X
Commit: a95ce9a7b3e95b1a3ba81462791b8b09ace565d2
Parents: e3288bd
Author: paulk <pa...@asert.com.au>
Authored: Fri Jan 6 10:27:11 2017 +1000
Committer: paulk <pa...@asert.com.au>
Committed: Fri Jan 6 10:27:11 2017 +1000
----------------------------------------------------------------------
build.gradle | 1 +
gradle/signing.gradle | 1 +
gradle/upload.gradle | 95 ++++++++++++++++++++++++----------------------
3 files changed, 51 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/a95ce9a7/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index ca8506b..645c929 100644
--- a/build.gradle
+++ b/build.gradle
@@ -55,6 +55,7 @@ indyBanner()
//apply plugin: 'antlr'
ext.isReleaseVersion = !groovyVersion.toLowerCase().endsWith("snapshot")
+ext.shouldSign = isReleaseVersion
allprojects {
apply plugin: 'java'
http://git-wip-us.apache.org/repos/asf/groovy/blob/a95ce9a7/gradle/signing.gradle
----------------------------------------------------------------------
diff --git a/gradle/signing.gradle b/gradle/signing.gradle
index 89c3a01..2885163 100644
--- a/gradle/signing.gradle
+++ b/gradle/signing.gradle
@@ -32,6 +32,7 @@ allprojects {
gradle.taskGraph.whenReady { taskGraph ->
if (taskGraph.allTasks.any { it instanceof Sign } || project.hasProperty('forceSign')) {
// Use Java 6's console or Swing to read input (not suitable for CI)
+ project.ext.shouldSign = true
if (!project.hasProperty('signing.keyId') ||
!project.hasProperty('signing.secretKeyRingFile') ||
!project.hasProperty('signing.password')) {
http://git-wip-us.apache.org/repos/asf/groovy/blob/a95ce9a7/gradle/upload.gradle
----------------------------------------------------------------------
diff --git a/gradle/upload.gradle b/gradle/upload.gradle
index f653d31..41f1f09 100644
--- a/gradle/upload.gradle
+++ b/gradle/upload.gradle
@@ -30,7 +30,6 @@ def removeJarjaredDependencies = { p ->
})
}
-
allprojects {
apply plugin: 'maven'
apply from: "${rootProject.projectDir}/gradle/pomconfigurer.gradle"
@@ -59,16 +58,13 @@ allprojects {
}
}
- configurations {
- deployerJars
- }
-
uploadArchives {
repositories {
mavenDeployer {
- configuration = configurations.deployerJars
pom pomConfigureClosure
- beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
+ if (shouldSign) {
+ beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
+ }
}
}
}
@@ -77,7 +73,9 @@ allprojects {
repositories {
mavenInstaller {
pom pomConfigureClosure
- beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
+ if (shouldSign) {
+ beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
+ }
}
}
}
@@ -111,17 +109,19 @@ allprojects {
install {
doFirst {
- signArchiveTask(jar)
- signArchiveTask(sourceJar)
- signArchiveTask(javadocJar)
- signArchiveTask(groovydocJar)
- def indyJar = rootProject.ext.deriveFile(jar.archivePath, 'indy')
- if (indyJar.exists()) {
- signWithClassifier('indy', indyJar)
- }
- def grooidJar = rootProject.ext.deriveFile(jar.archivePath, 'grooid')
- if (grooidJar.exists()) {
- signWithClassifier('grooid', grooidJar)
+ if (shouldSign) {
+ signArchiveTask(jar)
+ signArchiveTask(sourceJar)
+ signArchiveTask(javadocJar)
+ signArchiveTask(groovydocJar)
+ def indyJar = rootProject.ext.deriveFile(jar.archivePath, 'indy')
+ if (indyJar.exists()) {
+ signWithClassifier('indy', indyJar)
+ }
+ def grooidJar = rootProject.ext.deriveFile(jar.archivePath, 'grooid')
+ if (grooidJar.exists()) {
+ signWithClassifier('grooid', grooidJar)
+ }
}
}
}
@@ -167,33 +167,35 @@ allprojects {
install {
doFirst {
- signArchiveTask(jarAll)
- signArchiveTask(sourceAllJar)
- signArchiveTask(javadocAllJar)
- signArchiveTask(groovydocAllJar)
- signArchiveTask(distBin)
-
- // next three are done as a side effect since it was the easiest approach
- signing.sign(distSrc.archivePath)
- signing.sign(distDoc.archivePath)
- signing.sign(dist.archivePath)
-
- tasks.withType(Jar).matching { it.name.startsWith('backport') }.each { t ->
- signing.sign(t.classifier, t.archivePath)
- project.artifacts.add('archives', new File(t.destinationDir, t.archiveName + '.asc')) {
- name = t.baseName
- classifier = t.classifier
- type = t.extension + '.asc'
+ if (shouldSign) {
+ signArchiveTask(jarAll)
+ signArchiveTask(sourceAllJar)
+ signArchiveTask(javadocAllJar)
+ signArchiveTask(groovydocAllJar)
+ signArchiveTask(distBin)
+
+ // next three are done as a side effect since it was the easiest approach
+ signing.sign(distSrc.archivePath)
+ signing.sign(distDoc.archivePath)
+ signing.sign(dist.archivePath)
+
+ tasks.withType(Jar).matching { it.name.startsWith('backport') }.each { t ->
+ signing.sign(t.classifier, t.archivePath)
+ project.artifacts.add('archives', new File(t.destinationDir, t.archiveName + '.asc')) {
+ name = t.baseName
+ classifier = t.classifier
+ type = t.extension + '.asc'
+ }
}
- }
- def indyJar = deriveFile(jarAll.archivePath, 'indy')
- if (indyJar.exists()) {
- signWithClassifier('indy', indyJar)
- }
- def grooidJar = deriveFile(jarAll.archivePath, 'grooid')
- if (grooidJar.exists()) {
- signWithClassifier('grooid', grooidJar)
+ def indyJar = deriveFile(jarAll.archivePath, 'indy')
+ if (indyJar.exists()) {
+ signWithClassifier('indy', indyJar)
+ }
+ def grooidJar = deriveFile(jarAll.archivePath, 'grooid')
+ if (grooidJar.exists()) {
+ signWithClassifier('grooid', grooidJar)
+ }
}
}
}
@@ -256,7 +258,9 @@ ext.pomAll = {
p.dependencies.clear()
}
- beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
+ if (shouldSign) {
+ beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
+ }
}
install {
@@ -274,4 +278,3 @@ uploadArchives {
mavenDeployer pomAll
}
}
-