DRAFT: Merge tools into orm #11123

koentsje · 2025-10-15T14:28:29Z

[Please describe here what your change is about]

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license
and can be relicensed under the terms of the LGPL v2.1 license in the future at the maintainers' discretion.
For more information on licensing, please check here.

https://hibernate.atlassian.net/browse/HHH-19879

hibernate-github-bot · 2025-10-15T14:28:38Z

Thanks for your pull request!

This pull request appears to follow the contribution rules.

› This message was automatically generated.

github-advanced-security

CodeQL found more than 20 potential problems in the proposed changes. Check the Files changed tab for more details.

yrodiere

I added a few comments below to track things we discussed and that we shouldn't forget.

Also created a Jira issue: https://hibernate.atlassian.net/browse/HHH-19879

yrodiere · 2025-10-21T09:20:07Z

tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/tool/gradle/Plugin.java

+import org.hibernate.tool.gradle.task.GenerateJavaTask;
+import org.hibernate.tool.gradle.task.RunSqlTask;
+
+public class Plugin implements org.gradle.api.Plugin<Project> {


This should probably be the same plugin as enhancement, so that we can use a syntax like this one:

hibernate { enhancement { ... } reveng { ... } }

yrodiere · 2025-10-21T09:21:34Z

tooling/hibernate-reveng/hibernate-reveng.gradle

Honest question: would this make sense to use in an application/framework as a library, and if so do we want to keep this module under tooling/?

yrodiere · 2025-10-21T09:22:21Z

.../src/test/java/org/hibernate/tool/reveng/api/core/ReverseEngineeringStrategyFactoryTest.java

Todo: migrate (all?) other tests from Tools. We can target h2 only for a start.

Main challenge would be conveting hbm.xml to orm.xml (mapping.xml?) or annotations.

yrodiere · 2025-10-21T09:29:38Z

tooling/hibernate-maven-plugin/src/main/java/org/hibernate/tool/maven/TransformHbmMojo.java

+@Mojo(
+	name = "hbm2orm",
+	defaultPhase = GENERATE_RESOURCES,
+	requiresDependencyResolution = ResolutionScope.RUNTIME)
+public class TransformHbmMojo extends AbstractMojo {


This is great and I know people have been asking for it.

We need it documented, though :)

yrodiere · 2025-10-21T09:35:34Z

tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/hbm2ddl/SchemaExport.java

There is something wrong here. Seem you duplicated the package? The SchemaExport class already exists in this module.

yrodiere · 2025-10-21T09:36:14Z

tooling/hibernate-reveng/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExport.java

As discussed, the classes you duplicated here should instead be moved from hibernate-ant to this module.

tooling/hibernate-ant/src/main/java/org/hibernate/tool/ant/ConfigurationTask.java

tooling/hibernate-maven-plugin/src/main/java/org/hibernate/tool/maven/TransformHbmMojo.java

...nate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/reader/IndexProcessor.java

…merge the relevant ant/gradle/maven plugins - Add the Reverse Engineering module Signed-off-by: Koen Aers <koen.aers@gmail.com>

…erge the relevant ant/gradle/maven plugins - Add the reveng Ant tasks Signed-off-by: Koen Aers <koen.aers@gmail.com>

…erge the relevant ant/gradle/maven plugins - Add tests for the Ant tasks Signed-off-by: Koen Aers <koen.aers@gmail.com>

…erge the relevant ant/gradle/maven plugins - Add the Reveng Maven Mojos Signed-off-by: Koen Aers <koen.aers@gmail.com>

tooling/hibernate-maven-plugin/src/test/java/org/hibernate/tool/maven/GenerateJavaMojoTest.java

…erge the relevant ant/gradle/maven plugins - Add tests and integration tests for the Maven Mojos Signed-off-by: Koen Aers <koen.aers@gmail.com>

…erge the relevant ant/gradle/maven plugins - Add the reveng Gradle tasks Signed-off-by: Koen Aers <koen.aers@gmail.com>

tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/tool/gradle/Extension.java

+	public Boolean useGenerics = true;
+	public String templatePath = null;
+
+	public Extension(Project project) {}


github-advanced-security bot found potential problems Oct 15, 2025

View reviewed changes

koentsje force-pushed the merge-tools-into-orm branch 2 times, most recently from 9d4e4ec to 094c21a Compare October 20, 2025 14:10

yrodiere reviewed Oct 21, 2025

View reviewed changes

koentsje force-pushed the merge-tools-into-orm branch 25 times, most recently from 8239046 to 30152da Compare October 24, 2025 09:00

koentsje force-pushed the merge-tools-into-orm branch from a0eb131 to 0c719d0 Compare November 4, 2025 08:10

github-advanced-security bot found potential problems Nov 4, 2025

View reviewed changes

tooling/hibernate-ant/src/main/java/org/hibernate/tool/ant/ConfigurationTask.java Fixed Show fixed Hide fixed

koentsje force-pushed the merge-tools-into-orm branch 11 times, most recently from 8c982e8 to 1659453 Compare November 5, 2025 09:43

github-advanced-security bot found potential problems Nov 5, 2025

View reviewed changes

tooling/hibernate-maven-plugin/src/main/java/org/hibernate/tool/maven/TransformHbmMojo.java Fixed Show fixed Hide fixed

tooling/hibernate-maven-plugin/src/main/java/org/hibernate/tool/maven/TransformHbmMojo.java Fixed Show fixed Hide fixed

koentsje force-pushed the merge-tools-into-orm branch 2 times, most recently from 1659453 to 8621bad Compare November 6, 2025 10:42

github-advanced-security bot found potential problems Nov 6, 2025

View reviewed changes

...nate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/reader/IndexProcessor.java Fixed Show fixed Hide fixed

koentsje force-pushed the merge-tools-into-orm branch 2 times, most recently from b61a115 to 3061c13 Compare November 6, 2025 15:14

koentsje added 3 commits November 7, 2025 09:05

HHH-19879: Move Hibernate Tools' reveng module to Hibernate ORM and …

7ed6cac

…merge the relevant ant/gradle/maven plugins - Add the Reverse Engineering module Signed-off-by: Koen Aers <koen.aers@gmail.com>

HHH-19879: Move Hibernate Tools' reveng module to Hibernate ORM and m…

a025ca3

…erge the relevant ant/gradle/maven plugins - Add the reveng Ant tasks Signed-off-by: Koen Aers <koen.aers@gmail.com>

HHH-19879: Move Hibernate Tools' reveng module to Hibernate ORM and m…

91a38b1

…erge the relevant ant/gradle/maven plugins - Add tests for the Ant tasks Signed-off-by: Koen Aers <koen.aers@gmail.com>

koentsje force-pushed the merge-tools-into-orm branch from 35c5bb2 to ba52b06 Compare November 7, 2025 08:10

HHH-19879: Move Hibernate Tools' reveng module to Hibernate ORM and m…

682fc9a

…erge the relevant ant/gradle/maven plugins - Add the Reveng Maven Mojos Signed-off-by: Koen Aers <koen.aers@gmail.com>

koentsje force-pushed the merge-tools-into-orm branch from ba52b06 to 682fc9a Compare November 7, 2025 09:40

github-advanced-security bot found potential problems Nov 7, 2025

View reviewed changes

tooling/hibernate-maven-plugin/src/test/java/org/hibernate/tool/maven/GenerateJavaMojoTest.java Fixed Show fixed Hide fixed

HHH-19879: Move Hibernate Tools' reveng module to Hibernate ORM and m…

274cc2d

…erge the relevant ant/gradle/maven plugins - Add tests and integration tests for the Maven Mojos Signed-off-by: Koen Aers <koen.aers@gmail.com>

koentsje force-pushed the merge-tools-into-orm branch from 8b241aa to 274cc2d Compare November 7, 2025 12:17

HHH-19879: Move Hibernate Tools' reveng module to Hibernate ORM and m…

8572b4d

…erge the relevant ant/gradle/maven plugins - Add the reveng Gradle tasks Signed-off-by: Koen Aers <koen.aers@gmail.com>

github-advanced-security bot found potential problems Nov 7, 2025

View reviewed changes

tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/tool/gradle/Extension.java

public Boolean useGenerics = true;

public String templatePath = null;

public Extension(Project project) {}

Check notice

Code scanning / CodeQL

Useless parameter Note

The parameter 'project' is never used.

Uh oh!

DRAFT: Merge tools into orm #11123

Are you sure you want to change the base?

DRAFT: Merge tools into orm #11123

Conversation

koentsje commented Oct 15, 2025 • edited by hibernate-github-bot bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

hibernate-github-bot bot commented Oct 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-advanced-security bot left a comment

Choose a reason for hiding this comment

Uh oh!

yrodiere left a comment

Choose a reason for hiding this comment

Uh oh!

yrodiere Oct 21, 2025

Choose a reason for hiding this comment

Uh oh!

yrodiere Oct 21, 2025

Choose a reason for hiding this comment

Uh oh!

yrodiere Oct 21, 2025

Choose a reason for hiding this comment

Uh oh!

yrodiere Oct 21, 2025

Choose a reason for hiding this comment

Uh oh!

yrodiere Oct 21, 2025

Choose a reason for hiding this comment

Uh oh!

yrodiere Oct 21, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Check notice

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

koentsje commented Oct 15, 2025 •

edited by hibernate-github-bot bot

Loading

hibernate-github-bot bot commented Oct 15, 2025 •

edited

Loading