From 3e29db40bb6513fe1b979872f46d6cd87a58daf1 Mon Sep 17 00:00:00 2001 From: Graeme Rocher Date: Tue, 4 May 2010 16:32:07 +0200 Subject: [PATCH] fix for GRAILS-6199 "org.grails:grails:1.3.RC2 Missing from Repository" --- gradle/maven.gradle | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/gradle/maven.gradle b/gradle/maven.gradle index 63dbdbce140..6df70989b1e 100644 --- a/gradle/maven.gradle +++ b/gradle/maven.gradle @@ -29,19 +29,30 @@ task mavenInstall(dependsOn: [generatePoms, tasks.withType(Jar).all]) << { pom(file: "$generatePoms.pomsDir/$jar.baseName${jar.appendix ? '-' + jar.appendix : ""}.pom") } } + + // install the grails parent POM + artifact.install(file: "${libs.destinationDir}/grails-${version}.jar") { + pom(file: "$generatePoms.pomsDir/grails.pom") + } } task mavenDeploy(dependsOn: [generatePoms, tasks.withType(Jar).all]) << { + def antBuilderClasspath = services.get(org.gradle.api.internal.ClassPathRegistry).getClassPathFiles('ANT') + + services.get(org.gradle.api.internal.ClassPathRegistry).getClassPathFiles('LOCAL_GROOVY') + + configurations.deployerJars.files + def isolatedAnt = services.get(org.gradle.api.internal.project.IsolatedAntBuilder) + tasks.withType(Jar).matching({task -> task.mavenArtifact } as Spec).each {jar -> - // todo Once we have better classpath isolation and/or we have migrated to Maven 3 we don't need to execute the below with the IsolatedAntBuilder - def antBuilderClasspath = services.get(org.gradle.api.internal.ClassPathRegistry).getClassPathFiles('ANT') + - services.get(org.gradle.api.internal.ClassPathRegistry).getClassPathFiles('LOCAL_GROOVY') + - configurations.deployerJars.files - def isolatedAnt = services.get(org.gradle.api.internal.project.IsolatedAntBuilder) isolatedAnt.execute(antBuilderClasspath) { 'antlib:org.apache.maven.artifact.ant:deploy'(file: jar.archivePath) { pom(file: "$generatePoms.pomsDir/$jar.baseName${jar.appendix ? '-' + jar.appendix : ""}.pom") } } } + // deploy the grails parent POM + isolatedAnt.execute(antBuilderClasspath) { + 'antlib:org.apache.maven.artifact.ant:deploy'(file: "${libs.destinationDir}/grails-${version}.jar") { + pom(file:"$generatePoms.pomsDir/grails.pom") + } + } }