HHH-8733 - General build cleanup

build.gradle

@@ -82,14 +82,6 @@ def osgiDescription() {
 	return pomDescription()
 }
 
-def boolean needsLoggingGeneration() {
-	// by default
-	return true;
-}
-
-def SourceSet getMetaGenTargetSourceSet() {
-	return null;
-}
 
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -196,14 +188,7 @@ subprojects { subProject ->
 		]
 	}
 
-	if ( subProject.needsLoggingGeneration() ) {
-		addLoggingProcessor( sourceSets.main )
-	}
-
-	final SourceSet metaGenSourceSet = subProject.getMetaGenTargetSourceSet();
-	if ( metaGenSourceSet != null ) {
-		addMetaGenProcessor( metaGenSourceSet )
-	}
+	addLoggingProcessor( sourceSets.main )
 
 	jar {
 		manifest = osgiManifest {

hibernate-entitymanager/hibernate-entitymanager.gradle

@@ -35,22 +35,18 @@ dependencies {
     hibernateJpaModelGenTool( project( ':hibernate-jpamodelgen' ) )
 }
 
-def pomName() {
+public String pomName() {
     return 'Hibernate JPA Support'
 }
 
-def pomDescription() {
+public String pomDescription() {
     return 'Hibernate O/RM implementation of the JPA specification'
 }
 
-def osgiDescription() {
+public String osgiDescription() {
 	return pomDescription()
 }
 
-def getMetaGenTargetSourceSet() {
-	return sourceSets.test;
-}
-
 jar {
     manifest {
         // A cdi-api OSGi bundle does not currently exist.  For now, explicitly
@@ -74,6 +70,8 @@ jar {
     }
 }
 
+addMetaGenProcessor( sourceSets.test )
+
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Process 'bundle resources' for the packaging tests

hibernate-envers/hibernate-envers.gradle

@@ -33,10 +33,6 @@ def osgiDescription() {
 	return pomDescription()
 }
 
-def getMetaGenTargetSourceSet() {
-	return sourceSets.main;
-}
-
 sourceSets {
     test {
         ext {
@@ -52,6 +48,7 @@ sourceSets {
     }
 }
 
+addMetaGenProcessor( sourceSets.main )
 
 jar {
     manifest {

hibernate-osgi/hibernate-osgi.gradle

@@ -73,10 +73,6 @@ def osgiDescription() {
 	return pomDescription()
 }
 
-def boolean needsLoggingGeneration() {
-	return false;
-}
-
 jar {
 	manifest {
 		instruction 'Bundle-Activator', 'org.hibernate.osgi.HibernateBundleActivator'

hibernate-testing/hibernate-testing.gradle

@@ -26,7 +26,3 @@ def pomDescription() {
 def osgiDescription() {
 	return pomDescription()
 }
-
-def boolean needsLoggingGeneration() {
-	return false;
-}

source-generation.gradle

@@ -165,9 +165,9 @@ class SourceGenerationPluginConvention {
 
 
 		// create a FileTree representation of the APT output dir and add it to the JavaCompile task (so they get compiled)
-		final ConfigurableFileTree outputDirFileTree = project.fileTree( outputDir );
-		outputDirFileTree.builtBy( aptTask );
-		javaCompileTask.getSource().plus( outputDirFileTree );
+//		final ConfigurableFileTree outputDirFileTree = project.fileTree( outputDir );
+//		outputDirFileTree.builtBy( aptTask );
+//		javaCompileTask.getSource().plus( outputDirFileTree );
 
 		// Add the APT output dir to the source set
 		sourceSet.getJava().srcDir( outputDir );

tooling/hibernate-gradle-plugin/hibernate-gradle-plugin.gradle

@@ -9,7 +9,3 @@ dependencies {
    compile gradleApi()
    compile localGroovy()
 }
-
-def boolean needsLoggingGeneration() {
-	return false;
-}

tooling/hibernate-maven-plugin/hibernate-maven-plugin.gradle

@@ -12,7 +12,3 @@ dependencies {
     compile( libraries.jpa )
     compile( libraries.javassist )
 }
-
-def boolean needsLoggingGeneration() {
-	return false;
-}

tooling/metamodel-generator/hibernate-jpamodelgen.gradle

@@ -68,7 +68,3 @@ runSourceGenerators.dependsOn jaxb
 
 checkstyleMain.exclude '**/jaxb/**'
 
-
-def boolean needsLoggingGeneration() {
-	return false;
-}