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 13:37:25 UTC

[2/2] groovy git commit: GROOVY-8482: Build refactor impacts on release process (additional tweaks)

GROOVY-8482: Build refactor impacts on release process (additional tweaks)

defer setting packaging for all pom until after it's configured


Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/b4e116f5
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/b4e116f5
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/b4e116f5

Branch: refs/heads/GROOVY_2_6_X
Commit: b4e116f5f9fcb96e981deba1728ec492fe341a81
Parents: 95cf03a
Author: paulk <pa...@asert.com.au>
Authored: Tue Feb 27 22:06:56 2018 +1000
Committer: paulk <pa...@asert.com.au>
Committed: Tue Feb 27 23:37:09 2018 +1000

----------------------------------------------------------------------
 gradle/upload.gradle | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/groovy/blob/b4e116f5/gradle/upload.gradle
----------------------------------------------------------------------
diff --git a/gradle/upload.gradle b/gradle/upload.gradle
index 15f198f..7413d8c 100644
--- a/gradle/upload.gradle
+++ b/gradle/upload.gradle
@@ -246,11 +246,12 @@ ext.pomAll = {
     // pom for "all" dependencies
     def allpom = pom('all', pomConfigureClosureWithoutTweaks)
     allpom.artifactId = 'groovy-all'
-    allpom.packaging = 'pom'
     allpom.whenConfigured { p ->
         // this is the only way to get a handle on `maven.Dependency`
         def dependencyClass = p.dependencies[0].getClass()
         p.dependencies.clear()
+        // defer setting packaging until here otherwise gets overwritten
+        p.packaging - 'pom'
         allprojects {
             if (it.name.startsWith('groovy')) {
                 def dep = dependencyClass.newInstance()