From 48d139469b2710e5b2aa9db7f0e67d4adad4ee0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20St=C3=A4ber?= <fabian@fstab.de>
Date: Thu, 21 Mar 2024 20:56:57 +0100
Subject: [PATCH] Add BOM module (#931)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fabian Stäber <fabian@fstab.de>
---
 pom.xml                                       |  1 +
 .../pom.xml                                   | 73 ++++++++-----------
 2 files changed, 32 insertions(+), 42 deletions(-)
 rename {simpleclient-archive/simpleclient_bom => prometheus-metrics-bom}/pom.xml (62%)

diff --git a/pom.xml b/pom.xml
index 4ee0e39ae..dd1edea32 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,6 +52,7 @@
     </developers>
 
     <modules>
+        <module>prometheus-metrics-bom</module>
         <module>prometheus-metrics-core</module>
         <module>prometheus-metrics-config</module>
         <module>prometheus-metrics-model</module>
diff --git a/simpleclient-archive/simpleclient_bom/pom.xml b/prometheus-metrics-bom/pom.xml
similarity index 62%
rename from simpleclient-archive/simpleclient_bom/pom.xml
rename to prometheus-metrics-bom/pom.xml
index 417c679bd..f11653adc 100644
--- a/simpleclient-archive/simpleclient_bom/pom.xml
+++ b/prometheus-metrics-bom/pom.xml
@@ -5,17 +5,21 @@
     <parent>
         <groupId>io.prometheus</groupId>
         <artifactId>client_java</artifactId>
-        <version>1.0.0-beta-2-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>simpleclient_bom</artifactId>
+    <artifactId>prometheus-metrics-bom</artifactId>
     <packaging>pom</packaging>
 
-    <name>Prometheus Java Simpleclient BOM</name>
+    <name>Prometheus Metrics BOM</name>
     <description>
-        Bill of Materials for the Simpleclient.
+        Bill of Materials for the Prometheus Metrics library
     </description>
 
+    <properties>
+        <prometheus.metrics.shaded.dependencies.version>1.1.0</prometheus.metrics.shaded.dependencies.version>
+    </properties>
+
     <licenses>
         <license>
             <name>The Apache Software License, Version 2.0</name>
@@ -28,118 +32,103 @@
         <dependencies>
             <dependency>
                 <groupId>io.prometheus</groupId>
-                <artifactId>simpleclient</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.prometheus</groupId>
-                <artifactId>simpleclient_caffeine</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.prometheus</groupId>
-                <artifactId>simpleclient_common</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.prometheus</groupId>
-                <artifactId>simpleclient_dropwizard</artifactId>
+                <artifactId>prometheus-metrics-config</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.prometheus</groupId>
-                <artifactId>simpleclient_graphite_bridge</artifactId>
+                <artifactId>prometheus-metrics-core</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.prometheus</groupId>
-                <artifactId>simpleclient_guava</artifactId>
+                <artifactId>prometheus-metrics-exporter-common</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.prometheus</groupId>
-                <artifactId>simpleclient_hibernate</artifactId>
+                <artifactId>prometheus-metrics-exporter-httpserver</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.prometheus</groupId>
-                <artifactId>simpleclient_hotspot</artifactId>
+                <artifactId>prometheus-metrics-exporter-opentelemetry</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.prometheus</groupId>
-                <artifactId>simpleclient_httpserver</artifactId>
+                <artifactId>prometheus-metrics-exporter-servlet-jakarta</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.prometheus</groupId>
-                <artifactId>simpleclient_tracer_common</artifactId>
+                <artifactId>prometheus-metrics-exporter-servlet-javax</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.prometheus</groupId>
-                <artifactId>simpleclient_jetty</artifactId>
+                <artifactId>prometheus-metrics-exposition-formats</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.prometheus</groupId>
-                <artifactId>simpleclient_jetty_jdk8</artifactId>
+                <artifactId>prometheus-metrics-instrumentation-dropwizard5</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.prometheus</groupId>
-                <artifactId>simpleclient_log4j</artifactId>
+                <artifactId>prometheus-metrics-instrumentation-jvm</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.prometheus</groupId>
-                <artifactId>simpleclient_log4j2</artifactId>
+                <artifactId>prometheus-metrics-model</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.prometheus</groupId>
-                <artifactId>simpleclient_logback</artifactId>
+                <artifactId>prometheus-metrics-simpleclient-bridge</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.prometheus</groupId>
-                <artifactId>simpleclient_pushgateway</artifactId>
+                <artifactId>prometheus-metrics-tracer</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.prometheus</groupId>
-                <artifactId>simpleclient_servlet</artifactId>
+                <artifactId>prometheus-metrics-tracer-common</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.prometheus</groupId>
-                <artifactId>simpleclient_servlet_jakarta</artifactId>
+                <artifactId>prometheus-metrics-tracer-initializer</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.prometheus</groupId>
-                <artifactId>simpleclient_spring_boot</artifactId>
+                <artifactId>prometheus-metrics-tracer-otel</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.prometheus</groupId>
-                <artifactId>simpleclient_spring_web</artifactId>
+                <artifactId>prometheus-metrics-tracer-otel-agent</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.prometheus</groupId>
-                <artifactId>simpleclient_tracer_otel</artifactId>
-                <version>${project.version}</version>
+                <artifactId>prometheus-metrics-shaded-dependencies</artifactId>
+                <version>${prometheus.metrics.shaded.dependencies.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.prometheus</groupId>
-                <artifactId>simpleclient_tracer_otel_agent</artifactId>
-                <version>${project.version}</version>
+                <artifactId>prometheus-metrics-shaded-protobuf</artifactId>
+                <version>${prometheus.metrics.shaded.dependencies.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.prometheus</groupId>
-                <artifactId>simpleclient_vertx</artifactId>
-                <version>${project.version}</version>
+                <artifactId>prometheus-metrics-shaded-opentelemetry</artifactId>
+                <version>${prometheus.metrics.shaded.dependencies.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>