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

  - Move the copy logic from MavenEmbedderPlugin to hibernate-maven-plugin.gradle

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

Author: koentsje

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

@@ -48,15 +48,6 @@ public void apply(Project project) {
 
 		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( "generatePomFileForPublishedArtifactsPublication" );
-		} );
-
 		final Project hibernateCoreProject = project.getRootProject().project( "hibernate-core" );
 		final DirectoryProperty hibernateCoreBuildDirectory = hibernateCoreProject.getLayout().getBuildDirectory();
 		final Provider<Directory> hibernateCoreLibsFolder  = hibernateCoreBuildDirectory.dir("libs");
@@ -84,21 +75,6 @@ public void apply(Project project) {
 			task.dependsOn( ":hibernate-scan-jandex:jar" );
 		} );
 
-		final TaskProvider<Copy> copySourcesTask = project.getTasks().register( "copySources", Copy.class, (task) -> {
-			task.setGroup( "maven embedder" );
-			task.usesService( embedderServiceProvider );
-			task.from( new File(project.getProjectDir(), "src").toPath() );
-			task.setDestinationDir( new File(workingDirectory.get().getAsFile(), "src"));
-			task.dependsOn( copyPomTask );
-		} );
-
-		final TaskProvider<Copy> copyClassesTask = project.getTasks().register( "copyClasses", Copy.class, (task) -> {
-			task.setGroup( "maven embedder" );
-			task.from(new File(project.getProjectDir(), "target/classes/java/main").toPath());
-			task.setDestinationDir( new File(workingDirectory.get().getAsFile(), "target/classes"));
-			task.dependsOn( "compileJava" );
-		} );
-
 		// Via the plugin's POM, we tell Maven to generate the descriptors into
 		// `target/generated/sources/plugin-descriptors/META-INF/maven`.
 		// `META-INF/maven` is the relative path we need inside the jar, so we
@@ -125,7 +101,7 @@ public void apply(Project project) {
 
 			// the hibernate-core jar needs to be present in the local repository
 			// we need compilation to happen before we generate the descriptors
-			task.dependsOn( copySourcesTask, copyClassesTask);
+			task.dependsOn( "prepareWorkspace", "installHibernateCore", "installHibernateScanJandex");
 		} );
 
 		final TaskProvider<MavenInstallArtifactTask> installHibernateMavenPluginTask = project.getTasks().register( "installHibernateMavenPlugin", MavenInstallArtifactTask.class, (task) -> {
@@ -149,8 +125,6 @@ public void apply(Project project) {
 
 		} );
 
-		// compilation can only happen when hibernate core is available in the local repo
-		project.getTasks().named("compileJava", (compileTask -> compileTask.dependsOn( installHibernateCoreTask, installHibernateScanJandexTask )));
 		// we need the descriptor generation to happen before we jar
 		project.getTasks().named( "jar", (jarTask) -> jarTask.dependsOn( generatePluginDescriptorTask ) );
 		project.getTasks().named( "check" , (checkTask) -> checkTask.dependsOn( integrationTestTask, generatePluginDescriptorTask ) );

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

@@ -79,3 +79,39 @@ publishing {
     }
 
 }
+
+// Following tasks need to be performed:
+// 1. Compile the Java classes
+// 2. Copy the source tree to the working directory
+// 3. Copy the compiled Java classes to the working directory
+// 4. Install the 'hibernate-core' dependency in the local Maven repo
+// 5. Install the 'hibernate-scan-jandex' dependency in the local Maven repo
+// 6. Generate the pom.xml file for the Maven plugin
+// 7. Generate the Maven plugin descriptor
+// 8. Create the jar for the Maven plugin
+// 9. Install the Maven plugin descriptor in the local Maven repo
+// 10. Run the integration tests
+
+// Prepare the working directory
+tasks.register('prepareWorkspace', Copy) {
+    into('target/maven-embedder/workspace')
+    // copy the plugin pom
+    with( copySpec {
+        from('target/publications/publishedArtifacts/pom-default.xml')
+        rename('pom-default.xml', 'pom.xml')
+        dependsOn('generatePomFileForPublishedArtifactsPublication')
+    })
+    // copy the compiled java classes
+    into('target/classes') {
+        with( copySpec {
+            from('target/classes/java/main')
+            dependsOn('compileJava')
+        })
+    }
+    // copy the integration tests
+    into('src/it') {
+        with( copySpec {
+            from('src/it')
+        })
+    }
+}