HHH-18644 - New and improved hibernate-maven-plugin

  - Use the existing publish tasks in 'MavenEmbedderPlugin'
    * Replace 'generatePomFileForHibernateMavenPluginPublication' by 'generatePomFileForPublishedArtifactsPublication'
    * Replace 'generatePomFileForHibernateCorePublication' with ':hibernate-core:generatePomFileForPublishedArtifactsPublication'
    * Adapt the artifact locations to the changes above
  - Perform some cleanup in 'hibernate-maven-plugin.gradle'
    * Change 'hibernateMavenPlugin' into the already existing 'publishedArtifacts' so that the correct pom.xml file is also published appropriately
    * Remove the 'hibernateCore' publication (since we are now using 'publishedArtifacts' in the MavenEmbedderPlugin)
    * Remove the 'mavenLocal' repository as this is now also handled in the MavenEmbedderPlugin

Signed-off-by: Koen Aers <[email protected]>

Author: koentsje

local-build-plugins/src/main/java/org/hibernate/build/maven/embedder/MavenEmbedderPlugin.java

@@ -3,6 +3,7 @@
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.file.Directory;
+import org.gradle.api.file.DirectoryProperty;
 import org.gradle.api.file.RegularFile;
 import org.gradle.api.provider.Provider;
 import org.gradle.api.services.BuildServiceRegistry;
@@ -45,28 +46,29 @@ public void apply(Project project) {
 				}
 		);
 
-		final Provider<RegularFile> mavenPluginPom = project.getLayout().getBuildDirectory().file( "publications/hibernateMavenPlugin/pom-default.xml" );
+		final Provider<RegularFile> mavenPluginPom = project.getLayout().getBuildDirectory().file( "publications/publishedArtifacts/pom-default.xml" );
 
 		final TaskProvider<Copy> copyPomTask = project.getTasks().register( "copyPluginPom", Copy.class, (task) -> {
 			task.setGroup( "maven embedder" );
 			task.usesService( embedderServiceProvider );
 			task.from( mavenPluginPom.get().getAsFile() );
 			task.setDestinationDir( workingDirectory.get().getAsFile());
 			task.rename( "pom-default.xml", "pom.xml" );
-			task.dependsOn( "generatePomFileForHibernateMavenPluginPublication" );
+			task.dependsOn( "generatePomFileForPublishedArtifactsPublication" );
 		} );
 
-		final Project coreProject = project.getRootProject().project( "hibernate-core" );
-		final Provider<Directory> hibernateCoreLibsFolder  = coreProject.getLayout().getBuildDirectory().dir("libs");
-		final Provider<RegularFile> hibernateCorePom = project.getLayout().getBuildDirectory().file( "publications/hibernateCore/pom-default.xml" );
+		final Project hibernateCoreProject = project.getRootProject().project( "hibernate-core" );
+		final DirectoryProperty hibernateCoreBuildDirectory = hibernateCoreProject.getLayout().getBuildDirectory();
+		final Provider<Directory> hibernateCoreLibsFolder  = hibernateCoreBuildDirectory.dir("libs");
+		final Provider<RegularFile> hibernateCorePom = hibernateCoreBuildDirectory.file( "publications/publishedArtifacts/pom-default.xml" );
 		final TaskProvider<MavenInstallArtifactTask> installHibernateCoreTask = project.getTasks().register( "installHibernateCore", MavenInstallArtifactTask.class, (task) -> {
 			task.setGroup( "maven embedder" );
 			task.getMavenEmbedderService().set( embedderServiceProvider );
 			task.usesService( embedderServiceProvider );
 			task.artifactId = "hibernate-core";
 			task.getArtifactFolder().set( hibernateCoreLibsFolder );
 			task.pomFilePath = hibernateCorePom.get().getAsFile().getAbsolutePath();
-			task.dependsOn("generatePomFileForHibernateCorePublication", ":hibernate-core:jar");
+			task.dependsOn(":hibernate-core:generatePomFileForPublishedArtifactsPublication", ":hibernate-core:jar");
 		} );
 
 		final Project scanJandexProject = project.getRootProject().project( "hibernate-scan-jandex" );

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

@@ -23,7 +23,7 @@ dependencies {
 
 publishing {
     publications {
-        hibernateMavenPlugin(MavenPublication) {
+        publishedArtifacts(MavenPublication) {
             from components.java
             pom.withXml {
                 asNode()
@@ -76,14 +76,6 @@ publishing {
                         }
             }
         }
-        hibernateCore(MavenPublication) {
-            artifactId 'hibernate-core'
-            from project(":hibernate-core").components.java
-        }
-    }
-    repositories {
-        mavenLocal {
-            url = file(layout.buildDirectory.dir('maven-embedder/maven-local'))
-        }
     }
+
 }