Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-14657 Use the compile instead of runtime classpath 

The runtime classpath contains the dependencies as jars that are not yet built when the plugin needs them. So use the compile classpath plus the compiled classes of the current project.
This commit is contained in:
Markus Heiden 2021-06-08 01:01:06 +02:00 committed by Sanne Grinovero
parent f91fe03352
commit 423b13b50a
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tooling/hibernate-gradle-plugin/src/main/groovy/org/hibernate/orm/tooling/gradle/EnhancementHelper.java
View File

@ -37,7 +37,7 @@ import org.hibernate.cfg.Environment;
*/ */
public class EnhancementHelper { public class EnhancementHelper {
static void enhance(SourceSet sourceSet, EnhanceExtension options, Project project) { static void enhance(SourceSet sourceSet, EnhanceExtension options, Project project) {
final ClassLoader classLoader = toClassLoader( sourceSet.getRuntimeClasspath() ); final ClassLoader classLoader = toClassLoader( sourceSet.getCompileClasspath(), sourceSet.getOutput().getClassesDirs() );
final EnhancementContext enhancementContext = new DefaultEnhancementContext() { final EnhancementContext enhancementContext = new DefaultEnhancementContext() {
@Override @Override
@ -96,14 +96,16 @@ public class EnhancementHelper {
} }
} }
public static ClassLoader toClassLoader(FileCollection runtimeClasspath) { public static ClassLoader toClassLoader(FileCollection... classpaths) {
List<URL> urls = new ArrayList<>(); List<URL> urls = new ArrayList<>();
for ( File file : runtimeClasspath ) { for ( FileCollection classpath : classpaths ) {
try { for ( File file : classpath ) {
urls.add( file.toURI().toURL() ); try {
} urls.add( file.toURI().toURL() );
catch (MalformedURLException e) { }
throw new GradleException( "Unable to resolve classpath entry to URL : " + file.getAbsolutePath(), e ); catch (MalformedURLException e) {
throw new GradleException( "Unable to resolve classpath entry to URL : " + file.getAbsolutePath(), e );
}
} }
} }
return new URLClassLoader( urls.toArray( new URL[0] ), Enhancer.class.getClassLoader() ); return new URLClassLoader( urls.toArray( new URL[0] ), Enhancer.class.getClassLoader() );