From 91108cb46a48ff292a7ccd5f58475b914532cb56 Mon Sep 17 00:00:00 2001
From: Radoslav Husar <radosoft@gmail.com>
Date: Tue, 17 Dec 2024 17:09:08 +0100
Subject: [PATCH 1/2] MODCLUSTER-821 Create a BOM file

---
 bom/pom.xml | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 pom.xml     | 47 +++++++++----------------------------------
 2 files changed, 66 insertions(+), 38 deletions(-)
 create mode 100644 bom/pom.xml

diff --git a/bom/pom.xml b/bom/pom.xml
new file mode 100644
index 00000000..97321181
--- /dev/null
+++ b/bom/pom.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright The mod_cluster Project Authors
+  ~ SPDX-License-Identifier: Apache-2.0
+  -->
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.jboss</groupId>
+        <artifactId>jboss-parent</artifactId>
+        <version>47</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.jboss.mod_cluster</groupId>
+    <artifactId>mod_cluster-bom</artifactId>
+    <version>2.1.0.Final-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <name>mod_cluster: BOM</name>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>mod_cluster-container-spi</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>mod_cluster-container-tomcat-9.0</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>mod_cluster-container-tomcat-10.1</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>mod_cluster-container-tomcat-11.0</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>mod_cluster-core</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>mod_cluster-load-spi</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+</project>
diff --git a/pom.xml b/pom.xml
index eb460b7c..82398d6d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,20 +4,20 @@
   ~ SPDX-License-Identifier: Apache-2.0
   -->
 <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/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
     <parent>
-        <groupId>org.jboss</groupId>
-        <artifactId>jboss-parent</artifactId>
-        <version>47</version>
+        <groupId>org.jboss.mod_cluster</groupId>
+        <artifactId>mod_cluster-bom</artifactId>
+        <version>2.1.0.Final-SNAPSHOT</version>
+        <relativePath>bom</relativePath>
     </parent>
 
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.jboss.mod_cluster</groupId>
     <artifactId>mod_cluster-parent</artifactId>
-    <version>2.1.0.Final-SNAPSHOT</version>
+    <name>mod_cluster (parent)</name>
     <packaging>pom</packaging>
 
-    <name>mod_cluster (parent)</name>
-    <description>An httpd-based load balancer</description>
+    <description>mod_cluster is an intelligent native Apache httpd-based and pure-Java Undertow-based load-balancer</description>
     <url>https://www.modcluster.io</url>
 
     <licenses>
@@ -36,6 +36,7 @@
     </scm>
 
     <modules>
+        <module>bom</module>
         <module>core</module>
         <module>container</module>
         <module>load-spi</module>
@@ -100,36 +101,6 @@
 
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>org.jboss.mod_cluster</groupId>
-                <artifactId>mod_cluster-container-spi</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jboss.mod_cluster</groupId>
-                <artifactId>mod_cluster-container-tomcat-9.0</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jboss.mod_cluster</groupId>
-                <artifactId>mod_cluster-container-tomcat-10.1</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jboss.mod_cluster</groupId>
-                <artifactId>mod_cluster-container-tomcat-11.0</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jboss.mod_cluster</groupId>
-                <artifactId>mod_cluster-core</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jboss.mod_cluster</groupId>
-                <artifactId>mod_cluster-load-spi</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.jboss.logging</groupId>
                 <artifactId>jboss-logging</artifactId>

From f8754302db173688c2db39c6a9096b56fe151007 Mon Sep 17 00:00:00 2001
From: Radoslav Husar <radosoft@gmail.com>
Date: Tue, 17 Dec 2024 17:10:11 +0100
Subject: [PATCH 2/2] Replace groupId with an expression where possible.

---
 code-coverage/pom.xml | 12 ++++++------
 core/pom.xml          |  4 ++--
 dist/pom.xml          |  2 +-
 load-spi/pom.xml      |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/code-coverage/pom.xml b/code-coverage/pom.xml
index e0591869..ad3a3ad8 100644
--- a/code-coverage/pom.xml
+++ b/code-coverage/pom.xml
@@ -17,27 +17,27 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.jboss.mod_cluster</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>mod_cluster-container-spi</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.jboss.mod_cluster</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>mod_cluster-container-tomcat-9.0</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.jboss.mod_cluster</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>mod_cluster-container-tomcat-10.1</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.jboss.mod_cluster</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>mod_cluster-container-tomcat-11.0</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.jboss.mod_cluster</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>mod_cluster-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.jboss.mod_cluster</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>mod_cluster-load-spi</artifactId>
         </dependency>
     </dependencies>
diff --git a/core/pom.xml b/core/pom.xml
index a63a7669..d3f0edde 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -14,11 +14,11 @@
     <name>mod_cluster: Core</name>
     <dependencies>
         <dependency>
-            <groupId>org.jboss.mod_cluster</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>mod_cluster-container-spi</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.jboss.mod_cluster</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>mod_cluster-load-spi</artifactId>
         </dependency>
         <dependency>
diff --git a/dist/pom.xml b/dist/pom.xml
index d8a8004c..f6681bee 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -18,7 +18,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.jboss.mod_cluster</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>mod_cluster-core</artifactId>
         </dependency>
     </dependencies>
diff --git a/load-spi/pom.xml b/load-spi/pom.xml
index 847d5e25..d1148f5d 100644
--- a/load-spi/pom.xml
+++ b/load-spi/pom.xml
@@ -17,7 +17,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.jboss.mod_cluster</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>mod_cluster-container-spi</artifactId>
         </dependency>
     </dependencies>