From 16fe1716c4d47b44c364bdcb0927445ac4988f81 Mon Sep 17 00:00:00 2001
From: marko-bekhta <marko.prykladna@gmail.com>
Date: Mon, 2 Dec 2024 13:16:27 +0100
Subject: [PATCH] HBX-2936 Install gradle plugin with build-helper-maven-plugin

as it is build by Gradle, and we need to add an extra jar to the artifacts we publish
---
 gradle/pom.xml | 37 +++++++++++++++++++++++++++++++++++--
 pom.xml        |  2 ++
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/gradle/pom.xml b/gradle/pom.xml
index a5a50e12c8..a020bf21bc 100644
--- a/gradle/pom.xml
+++ b/gradle/pom.xml
@@ -16,7 +16,7 @@
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-   
+
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
@@ -26,6 +26,7 @@
    </parent>
 
    <artifactId>hibernate-tools-gradle</artifactId>
+   <packaging>pom</packaging>
 
    <name>Hibernate Tools Gradle Plugin</name>
    <description>Gradle plugin to provide hibernate-tools reverse engineering and code/schema generation abilities.</description>
@@ -37,9 +38,19 @@
    </issueManagement>
 
    <properties>
+       <!-- This is a publicly distributed module that should be published: -->
+       <deploy.skip>false</deploy.skip>
+
        <gradle.executable>./gradlew</gradle.executable>
    </properties>
-   
+
+   <dependencies>
+       <dependency>
+           <groupId>org.hibernate.tool</groupId>
+           <artifactId>hibernate-tools-orm</artifactId>
+       </dependency>
+   </dependencies>
+
    <build>
       <plugins>
         <!-- execute Gradle command -->
@@ -64,6 +75,28 @@
                     </execution>
                 </executions>
 		 </plugin>
+         <!-- As the artifact is built by Gradle, we attach it with the helper plugin so that it gets published: -->
+         <plugin>
+             <groupId>org.codehaus.mojo</groupId>
+             <artifactId>build-helper-maven-plugin</artifactId>
+             <executions>
+                 <execution>
+                     <id>attach-artifacts</id>
+                     <phase>package</phase>
+                     <goals>
+                         <goal>attach-artifact</goal>
+                     </goals>
+                     <configuration>
+                         <artifacts>
+                             <artifact>
+                                 <file>${project.basedir}/plugin/build/libs/${project.artifactId}-${project.version}.jar</file>
+                                 <type>jar</type>
+                             </artifact>
+                         </artifacts>
+                     </configuration>
+                 </execution>
+             </executions>
+         </plugin>
       </plugins>
    </build>
 
diff --git a/pom.xml b/pom.xml
index 92031ddc9d..714969f742 100644
--- a/pom.xml
+++ b/pom.xml
@@ -337,6 +337,8 @@
                         <!-- Keep things like url, inceptionYear, authors...
                              everything that's required by the OSSRH Maven repository -->
                         <flattenMode>ossrh</flattenMode>
+                        <!-- To make sure that `hibernate-tools-gradle` module that has a pom packaging will also publish the flattened pom -->
+                        <updatePomFile>true</updatePomFile>
                     </configuration>
                     <executions>
                         <execution>