HHH-9717 - Build script improvements - fixed generated POM

This commit is contained in:
Steve Ebersole 2015-04-10 15:30:13 -05:00
parent 018b5e11ed
commit f116ada16d
2 changed files with 2 additions and 4 deletions

View File

@ -1,5 +1,3 @@
import org.gradle.internal.jvm.Jvm
apply plugin: 'eclipse' apply plugin: 'eclipse'
apply plugin: 'idea' apply plugin: 'idea'
apply from: "./libraries.gradle" apply from: "./libraries.gradle"
@ -310,7 +308,7 @@ subprojects { subProject ->
model { model {
tasks.generatePomFileForMavenJavaPublication { tasks.generatePomFileForMavenJavaPublication {
destination = file( "$project.buildDir/generated-pom.xml" ) destination = file( "$subProject.buildDir/generated-pom.xml" )
} }
} }

View File

@ -208,7 +208,7 @@ class HibernateBuildPlugin implements Plugin<Project> {
if ( applyExtensionValues ) { if ( applyExtensionValues ) {
asNode().appendNode( 'name', publishingExtension.name ) asNode().appendNode( 'name', publishingExtension.name )
asNode().appendNode( 'description', publishingExtension.description ) asNode().appendNode( 'description', publishingExtension.description )
Node licenseNode = asNode().appendNode( "license" ) Node licenseNode = asNode().appendNode( "licenses" ).appendNode( "license" )
if ( publishingExtension.license == MavenPublishingExtension.License.APACHE2 ) { if ( publishingExtension.license == MavenPublishingExtension.License.APACHE2 ) {
licenseNode.appendNode( 'name', 'Apache License, Version 2.0' ) licenseNode.appendNode( 'name', 'Apache License, Version 2.0' )
licenseNode.appendNode( 'url', 'http://www.apache.org/licenses/LICENSE-2.0.txt' ) licenseNode.appendNode( 'url', 'http://www.apache.org/licenses/LICENSE-2.0.txt' )