From a7472d29c84b78361d6030de2699d1699d05eaa0 Mon Sep 17 00:00:00 2001 From: Doug Hoard Date: Tue, 26 Nov 2024 00:08:22 -0500 Subject: [PATCH] Cleaned up pom.xml files (#1055) Signed-off-by: dhoard --- collector/pom.xml | 81 +++++---- .../integration_tests/pom.xml | 106 +++++------ .../jmx_example_application/pom.xml | 52 +----- jmx_prometheus_common/pom.xml | 68 ++++---- jmx_prometheus_javaagent/pom.xml | 164 ++++-------------- jmx_prometheus_standalone/pom.xml | 141 ++------------- pom.xml | 98 +++++------ 7 files changed, 226 insertions(+), 484 deletions(-) diff --git a/collector/pom.xml b/collector/pom.xml index 40b82e4c..081ee1cf 100644 --- a/collector/pom.xml +++ b/collector/pom.xml @@ -28,6 +28,46 @@ UTF-8 + + + io.prometheus + prometheus-metrics-core + ${prometheus.metrics.version} + + + io.prometheus + prometheus-metrics-model + ${prometheus.metrics.version} + + + io.prometheus + prometheus-metrics-exposition-formats + ${prometheus.metrics.version} + + + org.yaml + snakeyaml + 2.3 + + + junit + junit + 4.13.2 + test + + + org.assertj + assertj-core + 3.26.3 + test + + + io.prometheus + prometheus-metrics-instrumentation-jvm + test + + + @@ -71,45 +111,4 @@ - - - io.prometheus - prometheus-metrics-core - ${prometheus.metrics.version} - - - io.prometheus - prometheus-metrics-model - ${prometheus.metrics.version} - - - io.prometheus - prometheus-metrics-exposition-formats - ${prometheus.metrics.version} - - - org.yaml - snakeyaml - 2.3 - - - junit - junit - 4.13.2 - test - - - org.assertj - assertj-core - 3.26.3 - test - - - io.prometheus - prometheus-metrics-instrumentation-jvm - test - - - - diff --git a/integration_test_suite/integration_tests/pom.xml b/integration_test_suite/integration_tests/pom.xml index 90fa0190..e05f494f 100644 --- a/integration_test_suite/integration_tests/pom.xml +++ b/integration_test_suite/integration_tests/pom.xml @@ -32,6 +32,59 @@ 0.7.1 + + + org.verifyica + verifyica-api + ${verifyica.version} + + + org.verifyica + verifyica-engine + ${verifyica.version} + + + io.prometheus.jmx + jmx_prometheus_common + ${project.version} + + + io.prometheus + prometheus-metrics-model + ${prometheus.metrics.version} + + + io.prometheus + prometheus-metrics-exposition-formats + ${prometheus.metrics.version} + + + org.slf4j + slf4j-api + 2.1.0-alpha1 + + + ch.qos.logback + logback-classic + 1.5.12 + + + org.testcontainers + testcontainers + 1.20.4 + + + org.assertj + assertj-core + 3.26.3 + + + org.yaml + snakeyaml + 2.3 + + + @@ -113,57 +166,4 @@ - - - org.verifyica - verifyica-api - ${verifyica.version} - - - org.verifyica - verifyica-engine - ${verifyica.version} - - - io.prometheus.jmx - jmx_prometheus_common - ${project.version} - - - io.prometheus - prometheus-metrics-model - ${prometheus.metrics.version} - - - io.prometheus - prometheus-metrics-exposition-formats - ${prometheus.metrics.version} - - - org.slf4j - slf4j-api - 2.1.0-alpha1 - - - ch.qos.logback - logback-classic - 1.5.12 - - - org.testcontainers - testcontainers - 1.20.4 - - - org.assertj - assertj-core - 3.26.3 - - - org.yaml - snakeyaml - 2.3 - - - diff --git a/integration_test_suite/jmx_example_application/pom.xml b/integration_test_suite/jmx_example_application/pom.xml index 66e85323..cb944c41 100644 --- a/integration_test_suite/jmx_example_application/pom.xml +++ b/integration_test_suite/jmx_example_application/pom.xml @@ -29,6 +29,7 @@ UTF-8 UTF-8 + io.prometheus @@ -81,55 +82,7 @@ - io.prometheus:prometheus-metrics-core - - META-INF/MANIFEST.MF - - - - io.prometheus:prometheus-metrics-config - - META-INF/MANIFEST.MF - - - - io.prometheus:prometheus-metrics-exposition-formats - - META-INF/MANIFEST.MF - - - - io.prometheus:prometheus-metrics-model - - META-INF/MANIFEST.MF - - - - io.prometheus:prometheus-metrics-tracer-initializer - - META-INF/MANIFEST.MF - - - - io.prometheus:prometheus-metrics-tracer-common - - META-INF/MANIFEST.MF - - - - io.prometheus:prometheus-metrics-tracer-otel - - META-INF/MANIFEST.MF - - - - io.prometheus:prometheus-metrics-tracer-otel-agent - - META-INF/MANIFEST.MF - - - - io.prometheus:prometheus-metrics-shaded-protobuf + *:* META-INF/MANIFEST.MF @@ -167,4 +120,5 @@ + diff --git a/jmx_prometheus_common/pom.xml b/jmx_prometheus_common/pom.xml index 4fc6bbef..28ae94f2 100644 --- a/jmx_prometheus_common/pom.xml +++ b/jmx_prometheus_common/pom.xml @@ -28,40 +28,6 @@ UTF-8 - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.13.0 - - -Xbootclasspath/a:${env.JAVA_HOME}/lib/ - - - - com.diffplug.spotless - spotless-maven-plugin - - - - 1.24.0 - - true - - - - - - - apply - - compile - - - - - - io.prometheus @@ -99,4 +65,38 @@ + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.13.0 + + -Xbootclasspath/a:${env.JAVA_HOME}/lib/ + + + + com.diffplug.spotless + spotless-maven-plugin + + + + 1.24.0 + + true + + + + + + + apply + + compile + + + + + + diff --git a/jmx_prometheus_javaagent/pom.xml b/jmx_prometheus_javaagent/pom.xml index d4a4eec6..8b29ad43 100644 --- a/jmx_prometheus_javaagent/pom.xml +++ b/jmx_prometheus_javaagent/pom.xml @@ -28,6 +28,35 @@ UTF-8 + + + io.prometheus.jmx + collector + ${project.version} + + + io.prometheus.jmx + jmx_prometheus_common + ${project.version} + + + io.prometheus + prometheus-metrics-instrumentation-jvm + + + org.junit.jupiter + junit-jupiter + 5.11.3 + test + + + org.assertj + assertj-core + 3.26.0 + test + + + @@ -72,109 +101,7 @@ - io.prometheus:prometheus-metrics-config - - META-INF/MANIFEST.MF - - - - io.prometheus:prometheus-metrics-core - - META-INF/MANIFEST.MF - - - - io.prometheus:prometheus-metrics-exporter-common - - META-INF/MANIFEST.MF - - - - io.prometheus:prometheus-metrics-exporter-httpserver - - META-INF/MANIFEST.MF - - - - io.prometheus:prometheus-metrics-exposition-formats - - META-INF/MANIFEST.MF - - - - io.prometheus:prometheus-metrics-instrumentation-jvm - - META-INF/MANIFEST.MF - - - - io.prometheus:prometheus-metrics-model - - META-INF/MANIFEST.MF - - - - io.prometheus:prometheus-metrics-tracer-initializer - - META-INF/MANIFEST.MF - - - - io.prometheus:prometheus-metrics-tracer-common - - META-INF/MANIFEST.MF - - - - io.prometheus:prometheus-metrics-tracer-otel - - META-INF/MANIFEST.MF - - - - io.prometheus:prometheus-metrics-tracer-otel-agent - - META-INF/MANIFEST.MF - - - - io.prometheus:prometheus-metrics-shaded-protobuf - - META-INF/MANIFEST.MF - - - - io.prometheus.jmx:collector - - META-INF/MANIFEST.MF - - - - io.prometheus.jmx:jmx_prometheus_common - - META-INF/MANIFEST.MF - - - - io.prometheus:prometheus-metrics-exporter-opentelemetry - - META-INF/MANIFEST.MF - - - - io.prometheus:prometheus-metrics-shaded-opentelemetry - - META-INF/MANIFEST.MF - - - - org.yaml:snakeyaml - - META-INF/MANIFEST.MF - - - - io.prometheus:otel-agent-resources + *:* META-INF/MANIFEST.MF @@ -206,8 +133,6 @@ - - org.apache.maven.plugins maven-javadoc-plugin @@ -249,33 +174,4 @@ - - - io.prometheus.jmx - collector - ${project.version} - - - io.prometheus.jmx - jmx_prometheus_common - ${project.version} - - - io.prometheus - prometheus-metrics-instrumentation-jvm - - - org.junit.jupiter - junit-jupiter - 5.11.3 - test - - - org.assertj - assertj-core - 3.26.0 - test - - - diff --git a/jmx_prometheus_standalone/pom.xml b/jmx_prometheus_standalone/pom.xml index f6ef02de..3f9f0ec0 100644 --- a/jmx_prometheus_standalone/pom.xml +++ b/jmx_prometheus_standalone/pom.xml @@ -28,6 +28,23 @@ UTF-8 + + + io.prometheus.jmx + collector + ${project.version} + + + io.prometheus.jmx + jmx_prometheus_common + ${project.version} + + + io.prometheus + prometheus-metrics-instrumentation-jvm + + + @@ -72,109 +89,7 @@ - io.prometheus:prometheus-metrics-config - - META-INF/MANIFEST.MF - - - - io.prometheus:prometheus-metrics-core - - META-INF/MANIFEST.MF - - - - io.prometheus:prometheus-metrics-exporter-common - - META-INF/MANIFEST.MF - - - - io.prometheus:prometheus-metrics-exporter-httpserver - - META-INF/MANIFEST.MF - - - - io.prometheus:prometheus-metrics-exposition-formats - - META-INF/MANIFEST.MF - - - - io.prometheus:prometheus-metrics-instrumentation-jvm - - META-INF/MANIFEST.MF - - - - io.prometheus:prometheus-metrics-model - - META-INF/MANIFEST.MF - - - - io.prometheus:prometheus-metrics-tracer-initializer - - META-INF/MANIFEST.MF - - - - io.prometheus:prometheus-metrics-tracer-common - - META-INF/MANIFEST.MF - - - - io.prometheus:prometheus-metrics-tracer-otel - - META-INF/MANIFEST.MF - - - - io.prometheus:prometheus-metrics-tracer-otel-agent - - META-INF/MANIFEST.MF - - - - io.prometheus:prometheus-metrics-shaded-protobuf - - META-INF/MANIFEST.MF - - - - io.prometheus.jmx:collector - - META-INF/MANIFEST.MF - - - - io.prometheus.jmx:jmx_prometheus_common - - META-INF/MANIFEST.MF - - - - io.prometheus:prometheus-metrics-exporter-opentelemetry - - META-INF/MANIFEST.MF - - - - io.prometheus:prometheus-metrics-shaded-opentelemetry - - META-INF/MANIFEST.MF - - - - io.prometheus:otel-agent-resources - - META-INF/MANIFEST.MF - - - - org.yaml:snakeyaml + *:* META-INF/MANIFEST.MF @@ -196,8 +111,6 @@ - - org.apache.maven.plugins maven-javadoc-plugin @@ -215,7 +128,6 @@ - jdeb org.vafer @@ -283,21 +195,4 @@ - - - io.prometheus.jmx - collector - ${project.version} - - - io.prometheus.jmx - jmx_prometheus_common - ${project.version} - - - io.prometheus - prometheus-metrics-instrumentation-jvm - - - diff --git a/pom.xml b/pom.xml index cadf73f4..45c7e945 100644 --- a/pom.xml +++ b/pom.xml @@ -94,11 +94,56 @@ + + + release + + + + org.apache.maven.plugins + maven-gpg-plugin + + + sign-artifacts + verify + + sign + + + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + attach-javadocs + + jar + + + + + + + + + - - maven-install-plugin 2.4 @@ -131,7 +176,6 @@ maven-site-plugin 3.3 - maven-shade-plugin 3.6.0 @@ -193,6 +237,7 @@ + org.apache.maven.plugins @@ -290,7 +335,6 @@ - maven-project-info-reports-plugin 3.8.0 @@ -315,50 +359,4 @@ - - - release - - - - org.apache.maven.plugins - maven-gpg-plugin - - - sign-artifacts - verify - - sign - - - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - attach-javadocs - - jar - - - - - - - -