From f116ada16d01995850d7f5d71ec3a857cfadeb8e Mon Sep 17 00:00:00 2001
From: Steve Ebersole <steve@hibernate.org>
Date: Fri, 10 Apr 2015 15:30:13 -0500
Subject: [PATCH] HHH-9717 - Build script improvements - fixed generated POM

---
 build.gradle                                                  | 4 +---
 .../groovy/org/hibernate/build/HibernateBuildPlugin.groovy    | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 7f1485a22e..7bc3904c49 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,3 @@
-import org.gradle.internal.jvm.Jvm
-
 apply plugin: 'eclipse'
 apply plugin: 'idea'
 apply from: "./libraries.gradle"
@@ -310,7 +308,7 @@ subprojects { subProject ->
 
 	model {
 		tasks.generatePomFileForMavenJavaPublication {
-			destination = file( "$project.buildDir/generated-pom.xml" )
+			destination = file( "$subProject.buildDir/generated-pom.xml" )
 		}
 	}
 
diff --git a/buildSrc/src/main/groovy/org/hibernate/build/HibernateBuildPlugin.groovy b/buildSrc/src/main/groovy/org/hibernate/build/HibernateBuildPlugin.groovy
index 013d0c0b67..2f67964afd 100644
--- a/buildSrc/src/main/groovy/org/hibernate/build/HibernateBuildPlugin.groovy
+++ b/buildSrc/src/main/groovy/org/hibernate/build/HibernateBuildPlugin.groovy
@@ -208,7 +208,7 @@ class HibernateBuildPlugin implements Plugin<Project> {
 				if ( applyExtensionValues ) {
 					asNode().appendNode( 'name', publishingExtension.name )
 					asNode().appendNode( 'description', publishingExtension.description )
-					Node licenseNode = asNode().appendNode( "license" )
+					Node licenseNode = asNode().appendNode( "licenses" ).appendNode( "license" )
 					if ( publishingExtension.license == MavenPublishingExtension.License.APACHE2 ) {
 						licenseNode.appendNode( 'name', 'Apache License, Version 2.0' )
 						licenseNode.appendNode( 'url', 'http://www.apache.org/licenses/LICENSE-2.0.txt' )