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 2018/02/27 02:14:14 UTC
[2/2] groovy git commit: GROOVY-8482: Build refactor impacts on
release process
GROOVY-8482: Build refactor impacts on release process
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/c8bfd26a
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/c8bfd26a
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/c8bfd26a
Branch: refs/heads/GROOVY_2_5_X
Commit: c8bfd26a51b2e63e5a62e2290d0a87b5629d2e4b
Parents: f4871ab
Author: paulk <pa...@asert.com.au>
Authored: Tue Feb 27 00:01:35 2018 +1000
Committer: paulk <pa...@asert.com.au>
Committed: Tue Feb 27 12:14:00 2018 +1000
----------------------------------------------------------------------
gradle/publish.gradle | 2 ++
gradle/upload.gradle | 16 ++++++++--------
2 files changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/c8bfd26a/gradle/publish.gradle
----------------------------------------------------------------------
diff --git a/gradle/publish.gradle b/gradle/publish.gradle
index e825e64..3f9c4c5 100644
--- a/gradle/publish.gradle
+++ b/gradle/publish.gradle
@@ -84,8 +84,10 @@ artifactoryPublish {
}
}
}
+ deployDetails.add(makeTransformedPomDetails(name: 'groovy-all'))
if (isReleaseVersion) {
+ deployDetails.add(makeTransformedPomSigDetails(name: 'groovy-all'))
allprojects {
if (project == rootProject || rootProject.ext.modules().contains(project)) {
configurations.archives.artifacts.findAll {
http://git-wip-us.apache.org/repos/asf/groovy/blob/c8bfd26a/gradle/upload.gradle
----------------------------------------------------------------------
diff --git a/gradle/upload.gradle b/gradle/upload.gradle
index 8d21a75..da2ce60 100644
--- a/gradle/upload.gradle
+++ b/gradle/upload.gradle
@@ -113,9 +113,9 @@ allprojects {
if (rootProject.indyCapable()) {
project.artifacts.add('archives', jarjarWithIndy.outputFile)
}
- def grooidJar = rootProject.ext.deriveFile(jar.archivePath, 'grooid')
- if (grooidJar.exists()) {
- project.artifacts.add('archives', grooidJar.outputFile)
+ def grooidJarFile = rootProject.ext.deriveFile(jarjar.outputFile, 'grooid')
+ if (grooidJarFile.exists()) {
+ project.artifacts.add('archives', grooidJarFile)
}
}
}
@@ -124,17 +124,17 @@ allprojects {
doFirst {
// gradle doesn't expect us to mutate configurations like we do here
// so signing the configuration won't work and we do it manually here
- signArchiveTask(jar)
+ signArchiveTask(jarjar.outputFile)
signArchiveTask(sourceJar)
signArchiveTask(javadocJar)
signArchiveTask(groovydocJar)
- def indyJar = rootProject.ext.deriveFile(jar.archivePath, 'indy')
+ def indyJar = rootProject.ext.deriveFile(jarjar.outputFile, 'indy')
if (indyJar.exists()) {
signWithClassifier('indy', indyJar)
}
- def grooidJar = rootProject.ext.deriveFile(jar.archivePath, 'grooid')
- if (grooidJar.exists()) {
- signWithClassifier('grooid', grooidJar)
+ def grooidJarFile = rootProject.ext.deriveFile(jarjar.outputFile, 'grooid')
+ if (grooidJarFile.exists()) {
+ signWithClassifier('grooid', grooidJarFile)
}
}
}