Merge pull request clusterbench#484 from rhusar/483

Add a BOM clusterbench#483
rhusar · Aug 14, 2024 · d2d0ee7 · d2d0ee7
2 parents 2d3a9ab + be9acca
commit d2d0ee7
Show file tree

Hide file tree

Showing 6 changed files with 90 additions and 14 deletions.
diff --git a/bom/pom.xml b/bom/pom.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright The ClusterBench 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>46</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.jboss.test</groupId>
+    <artifactId>clusterbench-bom</artifactId>
+    <version>10.0.0.Final-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <name>ClusterBench: BOM</name>
+
+    <dependencyManagement>
+        <dependencies>
+            <!-- Common -->
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>clusterbench-common</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <!-- EAR -->
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>clusterbench-ee10-ear</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <!-- EJB -->
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>clusterbench-ee10-ejb</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>clusterbench-ee10-ejb</artifactId>
+                <version>${project.version}</version>
+                <type>ejb</type>
+            </dependency>
+            <!-- WEB -->
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>clusterbench-ee10-web</artifactId>
+                <version>${project.version}</version>
+                <type>war</type>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>clusterbench-ee10-web</artifactId>
+                <version>${project.version}</version>
+                <classifier>classes</classifier>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>clusterbench-ee10-web</artifactId>
+                <version>${project.version}</version>
+                <classifier>default</classifier>
+                <type>war</type>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>clusterbench-ee10-web</artifactId>
+                <version>${project.version}</version>
+                <classifier>passivating</classifier>
+                <type>war</type>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>clusterbench-ee10-web</artifactId>
+                <version>${project.version}</version>
+                <classifier>granular</classifier>
+                <type>war</type>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+</project>
diff --git a/clusterbench-ee10-ear/pom.xml b/clusterbench-ee10-ear/pom.xml
@@ -74,27 +74,23 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>clusterbench-ee10-ejb</artifactId>
-            <version>${project.version}</version>
             <type>ejb</type>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>clusterbench-ee10-web</artifactId>
-            <version>${project.version}</version>
             <classifier>default</classifier>
             <type>war</type>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>clusterbench-ee10-web</artifactId>
-            <version>${project.version}</version>
             <classifier>passivating</classifier>
             <type>war</type>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>clusterbench-ee10-web</artifactId>
-            <version>${project.version}</version>
             <classifier>granular</classifier>
             <type>war</type>
         </dependency>

diff --git a/clusterbench-ee10-ejb/pom.xml b/clusterbench-ee10-ejb/pom.xml
@@ -26,7 +26,6 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>clusterbench-common</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <!-- Jakarta dependencies -->
         <dependency>

diff --git a/clusterbench-ee10-web/pom.xml b/clusterbench-ee10-web/pom.xml
@@ -28,15 +28,12 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>clusterbench-ee10-ejb</artifactId>
-            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>clusterbench-common</artifactId>
-            <version>${project.version}</version>
             <scope>compile</scope>
-            <type>jar</type>
         </dependency>
         <!-- Jakarta dependencies -->
         <dependency>

diff --git a/integration-tests/tomcat-10.1/pom.xml b/integration-tests/tomcat-10.1/pom.xml
@@ -24,7 +24,6 @@
         <dependency>
             <groupId>org.jboss.test</groupId>
             <artifactId>clusterbench-ee10-web</artifactId>
-            <version>${project.version}</version>
             <classifier>classes</classifier>
             <scope>test</scope>
         </dependency>
@@ -99,7 +98,6 @@
                                 <artifactItem>
                                     <groupId>org.jboss.test</groupId>
                                     <artifactId>clusterbench-ee10-web</artifactId>
-                                    <version>${project.version}</version>
                                     <type>war</type>
                                     <overWrite>true</overWrite>
                                     <classifier>tomcat</classifier>

diff --git a/pom.xml b/pom.xml
@@ -8,12 +8,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.jboss</groupId>
-        <artifactId>jboss-parent</artifactId>
-        <version>46</version>
+        <groupId>org.jboss.test</groupId>
+        <artifactId>clusterbench-bom</artifactId>
+        <version>10.0.0.Final-SNAPSHOT</version>
+        <relativePath>bom</relativePath>
     </parent>
 
-    <groupId>org.jboss.test</groupId>
     <artifactId>clusterbench</artifactId>
     <version>10.0.0.Final-SNAPSHOT</version>
     <packaging>pom</packaging>
@@ -33,6 +33,7 @@
     </scm>
 
     <modules>
+        <module>bom</module>
         <module>clusterbench-common</module>
         <module>clusterbench-ee10-ejb</module>
         <module>clusterbench-ee10-web</module>