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

  - Use the artifact to be installed as an @InputFile in MavenInstallArtifactTask
  - Calculate the artifact name in MavenEmbedderPlugin

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

Author: koentsje

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

@@ -65,8 +65,9 @@ public void apply(Project project) {
 			task.setGroup( "maven embedder" );
 			task.getMavenEmbedderService().set( embedderServiceProvider );
 			task.usesService( embedderServiceProvider );
+			final String artifactName = "hibernate-core-" + project.getVersion() + ".jar";
 			task.artifactId = "hibernate-core";
-			task.getArtifactFolder().set( hibernateCoreLibsFolder );
+			task.getArtifact().set( new File( hibernateCoreLibsFolder.get().getAsFile(), artifactName ));
 			task.pomFilePath = hibernateCorePom.get().getAsFile().getAbsolutePath();
 			task.dependsOn(":hibernate-core:generatePomFileForPublishedArtifactsPublication", ":hibernate-core:jar");
 		} );
@@ -77,8 +78,9 @@ public void apply(Project project) {
 			task.setGroup( "maven embedder" );
 			task.getMavenEmbedderService().set( embedderServiceProvider );
 			task.usesService( embedderServiceProvider );
+			final String artifactName = "hibernate-scan-jandex-" + project.getVersion() + ".jar";
 			task.artifactId = "hibernate-scan-jandex";
-			task.getArtifactFolder().set( hibernateScanJandexLibsFolder );
+			task.getArtifact().set( new File(hibernateScanJandexLibsFolder.get().getAsFile(), artifactName ));
 			task.dependsOn( ":hibernate-scan-jandex:jar" );
 		} );
 
@@ -130,8 +132,9 @@ public void apply(Project project) {
 			task.setGroup( "maven embedder" );
 			task.getMavenEmbedderService().set( embedderServiceProvider );
 			task.usesService( embedderServiceProvider );
+			final String artifactName = "hibernate-maven-plugin-" + project.getVersion() + ".jar";
 			task.artifactId = "hibernate-maven-plugin";
-			task.getArtifactFolder().set( project.getLayout().getBuildDirectory().dir("libs" ));
+			task.getArtifact().set( new File(project.getLayout().getBuildDirectory().dir("libs" ).get().getAsFile(), artifactName));
 			task.pomFilePath = mavenPluginPom.get().getAsFile().getAbsolutePath();
 			task.dependsOn("jar", generatePluginDescriptorTask);
 		} );

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

@@ -2,9 +2,11 @@
 
 import org.gradle.api.DefaultTask;
 import org.gradle.api.file.DirectoryProperty;
+import org.gradle.api.file.RegularFileProperty;
 import org.gradle.api.provider.Property;
 import org.gradle.api.services.ServiceReference;
 import org.gradle.api.tasks.InputDirectory;
+import org.gradle.api.tasks.InputFile;
 import org.gradle.api.tasks.TaskAction;
 
 import java.io.File;
@@ -18,8 +20,8 @@ public abstract class MavenInstallArtifactTask extends DefaultTask {
 	String artifactId;
 	String pomFilePath;
 
-	@InputDirectory
-	abstract DirectoryProperty getArtifactFolder();
+	@InputFile
+	abstract RegularFileProperty getArtifact();
 
 	@TaskAction
 	public void installArtifact() {
@@ -42,9 +44,7 @@ private String[] constructTaskAndArgs() {
 	}
 
 	private String getPathToArtifact() {
-		File artifactFolder = getArtifactFolder().getAsFile().get();
-		File artifactFile = new File(artifactFolder, getArtifactName());
-		return artifactFile.getAbsolutePath();
+		return getArtifact().get().getAsFile().getAbsolutePath();
 	}
 
 	private String getPathToLocalRepository() {
@@ -61,10 +61,6 @@ private String getProjectVersion() {
 		return getMavenEmbedderService().get().getParameters().getProjectVersion().get();
 	}
 
-	private String getArtifactName() {
-		return artifactId + "-" + getProjectVersion() + ".jar";
-	}
-
 	private String getGroupId() {
 		return getProject().getGroup().toString();
 	}