HHH-10145 - [maven plugin] Include dependencies in loader classloader

(cherry picked from commit 080fcd9)

Author: barreiro

libraries.gradle

@@ -68,6 +68,8 @@ ext {
             java16_signature:   'org.codehaus.mojo.signature:java16:1.0@signature',
 
             //Maven plugin framework
+            maven_core: 'org.apache.maven:maven-core:3.0.5',
+            maven_artifact: 'org.apache.maven:maven-artifact:3.0.5',
             maven_plugin: 'org.apache.maven:maven-plugin-api:3.0.5',
             maven_plugin_tools: 'org.apache.maven.plugin-tools:maven-plugin-annotations:3.2',
 

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

@@ -22,12 +22,16 @@ processResources {
 }
 
 dependencies {
+    compile( libraries.maven_core ) { transitive = false }
+    compile( libraries.maven_artifact ) { transitive = false }
     compile( libraries.maven_plugin ) { transitive = false }
     compile( libraries.maven_plugin_tools ) { transitive = false }
     compile( project(':hibernate-core') ) { transitive = false }
     compile( libraries.jpa ) { transitive = false }
     compile( libraries.javassist ) { transitive = false }
     compile 'org.codehaus.plexus:plexus-utils:3.0.1'
+    runtime( libraries.maven_core )
+    runtime( libraries.maven_artifact )
     runtime( libraries.maven_plugin )
     runtime( libraries.maven_plugin_tools )
     runtime( project(':hibernate-core') )

tooling/hibernate-enhance-maven-plugin/src/main/java/org/hibernate/orm/tooling/maven/MavenEnhancePlugin.java

@@ -17,21 +17,23 @@
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
 import javassist.ClassPool;
 import javassist.CtClass;
 import javassist.CtField;
 
+import org.apache.maven.artifact.Artifact;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.Execute;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.annotations.ResolutionScope;
+import org.apache.maven.project.MavenProject;
 
 import org.hibernate.bytecode.enhance.spi.DefaultEnhancementContext;
 import org.hibernate.bytecode.enhance.spi.EnhancementContext;
@@ -43,7 +45,7 @@
  * @author Jeremy Whiting
  * @author Luis Barreiro
  */
-@Mojo(name = "enhance", defaultPhase = LifecyclePhase.COMPILE)
+@Mojo(name = "enhance", defaultPhase = LifecyclePhase.COMPILE, requiresDependencyResolution = ResolutionScope.COMPILE_PLUS_RUNTIME)
 @Execute(goal = "enhance", phase = LifecyclePhase.COMPILE)
 public class MavenEnhancePlugin extends AbstractMojo {
 
@@ -85,7 +87,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
 		File root = new File( this.dir );
 		walkDir( root );
 
-		final ClassLoader classLoader = toClassLoader( Arrays.asList( root ) );
+		final ClassLoader classLoader = toClassLoader( Collections.singletonList( root ) );
 
 		EnhancementContext enhancementContext = new DefaultEnhancementContext() {
 			@Override
@@ -147,7 +149,7 @@ private ClassLoader toClassLoader(List<File> runtimeClasspath) throws MojoExecut
 		for ( File file : runtimeClasspath ) {
 			try {
 				urls.add( file.toURI().toURL() );
-				getLog().debug( "Adding root " + file.getAbsolutePath() + " to classpath " );
+				getLog().debug( "Adding classpath entry for classes root " + file.getAbsolutePath() );
 			}
 			catch (MalformedURLException e) {
 				String msg = "Unable to resolve classpath entry to URL: " + file.getAbsolutePath();
@@ -158,6 +160,27 @@ private ClassLoader toClassLoader(List<File> runtimeClasspath) throws MojoExecut
 			}
 		}
 
+		// HHH-10145 Add dependencies to classpath as well - all but the ones used for testing purposes
+		MavenProject project = ( (MavenProject) getPluginContext().get( "project" ) );
+		if ( project != null ) {
+			for ( Artifact a : project.getDependencyArtifacts() ) {
+				if ( !Artifact.SCOPE_TEST.equals( a.getScope() ) ) {
+					try {
+						urls.add( a.getFile().toURI().toURL() );
+						getLog().debug( "Adding classpath entry for dependency " + a.getId() );
+					}
+					catch (MalformedURLException e) {
+						String msg = "Unable to resolve URL for dependency " + a.getId() + " at " + a.getFile()
+								.getAbsolutePath();
+						if ( failOnError ) {
+							throw new MojoExecutionException( msg, e );
+						}
+						getLog().warn( msg );
+					}
+				}
+			}
+		}
+
 		return new URLClassLoader( urls.toArray( new URL[urls.size()] ), Enhancer.class.getClassLoader() );
 	}