Skip to content

Commit 5867a8f

Browse files
der-ambibeikov
authored andcommitted
HHH-15557 fix problem when orm plugin is applied before Java plugin
1 parent 95d5246 commit 5867a8f

File tree

1 file changed

+18
-15
lines changed

1 file changed

+18
-15
lines changed

tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/HibernateOrmPlugin.java

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import org.gradle.api.Project;
1515
import org.gradle.api.Task;
1616
import org.gradle.api.file.DirectoryProperty;
17-
import org.gradle.api.plugins.JvmEcosystemPlugin;
1817
import org.gradle.api.tasks.SourceSet;
1918

2019
import org.hibernate.orm.tooling.gradle.enhance.EnhancementHelper;
@@ -25,24 +24,28 @@
2524
public class HibernateOrmPlugin implements Plugin<Project> {
2625
@Override
2726
public void apply(Project project) {
28-
// for SourceSet support and other JVM goodies
29-
project.getPlugins().apply( JvmEcosystemPlugin.class );
27+
project.getPluginManager().withPlugin( "java", plugin -> {
3028

31-
project.getLogger().debug( "Adding Hibernate extensions to the build [{}]", project.getPath() );
32-
final HibernateOrmSpec ormDsl = project.getExtensions().create( HibernateOrmSpec.DSL_NAME, HibernateOrmSpec.class, project );
29+
project.getLogger().debug( "Adding Hibernate extensions to the build [{}]", project.getPath() );
30+
final HibernateOrmSpec ormDsl = project.getExtensions().create(
31+
HibernateOrmSpec.DSL_NAME,
32+
HibernateOrmSpec.class,
33+
project
34+
);
3335

34-
prepareEnhancement( ormDsl, project );
35-
prepareHbmTransformation( ormDsl, project );
36+
prepareEnhancement( ormDsl, project );
37+
prepareHbmTransformation( ormDsl, project );
3638

3739

38-
//noinspection ConstantConditions
39-
project.getDependencies().add(
40-
"implementation",
41-
ormDsl.getUseSameVersion().map( (use) -> use
42-
? "org.hibernate.orm:hibernate-core:" + HibernateVersion.version
43-
: null
44-
)
45-
);
40+
//noinspection ConstantConditions
41+
project.getDependencies().add(
42+
"implementation",
43+
ormDsl.getUseSameVersion().map( (use) -> use
44+
? "org.hibernate.orm:hibernate-core:" + HibernateVersion.version
45+
: null
46+
)
47+
);
48+
} );
4649
}
4750

4851
private void prepareEnhancement(HibernateOrmSpec ormDsl, Project project) {

0 commit comments

Comments
 (0)