diff --git a/metrics/api/pom.xml b/metrics/api/pom.xml index 1275f7d5..e904781b 100644 --- a/metrics/api/pom.xml +++ b/metrics/api/pom.xml @@ -16,16 +16,17 @@ limitations under the License. --> - - 4.0.0 - - - org.commonjava.util - o11yphant-metrics - 1.9.2-SNAPSHOT - - - o11yphant-metrics-api - o11yphant :: Metrics :: Api + + 4.0.0 + + + org.commonjava.util + o11yphant-metrics + 1.9.2-SNAPSHOT + + + o11yphant-metrics-api + o11yphant :: Metrics :: Api \ No newline at end of file diff --git a/metrics/common/pom.xml b/metrics/common/pom.xml index 63ca8171..6b6eaf52 100644 --- a/metrics/common/pom.xml +++ b/metrics/common/pom.xml @@ -16,34 +16,35 @@ limitations under the License. --> - - 4.0.0 - - - org.commonjava.util - o11yphant-metrics - 1.9.2-SNAPSHOT - - - o11yphant-metrics-common - o11yphant :: Metrics :: Common - - - - org.commonjava.util - o11yphant-metrics-api - - - org.commonjava.cdi.util - weft - - - io.dropwizard.metrics - metrics-core - - - io.dropwizard.metrics - metrics-healthchecks - - + + 4.0.0 + + + org.commonjava.util + o11yphant-metrics + 1.9.2-SNAPSHOT + + + o11yphant-metrics-common + o11yphant :: Metrics :: Common + + + + org.commonjava.util + o11yphant-metrics-api + + + org.commonjava.cdi.util + weft + + + io.dropwizard.metrics + metrics-core + + + io.dropwizard.metrics + metrics-healthchecks + + \ No newline at end of file diff --git a/metrics/core/pom.xml b/metrics/core/pom.xml index 5e0b7b71..a9a859e1 100644 --- a/metrics/core/pom.xml +++ b/metrics/core/pom.xml @@ -16,63 +16,64 @@ limitations under the License. --> - - - o11yphant-metrics - org.commonjava.util - 1.9.2-SNAPSHOT - - 4.0.0 + + + o11yphant-metrics + org.commonjava.util + 1.9.2-SNAPSHOT + + 4.0.0 - o11yphant-metrics-core - o11yphant :: Metrics :: Core + o11yphant-metrics-core + o11yphant :: Metrics :: Core - - - org.commonjava.util - o11yphant-metrics-api - - - org.commonjava.util - o11yphant-metrics-common - + + + org.commonjava.util + o11yphant-metrics-api + + + org.commonjava.util + o11yphant-metrics-common + - - org.commonjava.cdi.util - weft - + + org.commonjava.cdi.util + weft + - - io.dropwizard.metrics - metrics-jvm - - - io.dropwizard.metrics - metrics-graphite - - - io.dropwizard.metrics - metrics-servlets - - - io.dropwizard.metrics - metrics-json - + + io.dropwizard.metrics + metrics-jvm + + + io.dropwizard.metrics + metrics-graphite + + + io.dropwizard.metrics + metrics-servlets + + + io.dropwizard.metrics + metrics-json + - - io.undertow - undertow-servlet - + + io.undertow + undertow-servlet + - - io.prometheus - simpleclient_servlet - - - io.prometheus - simpleclient_dropwizard - + + io.prometheus + simpleclient_servlet + + + io.prometheus + simpleclient_dropwizard + - + \ No newline at end of file diff --git a/metrics/pom.xml b/metrics/pom.xml index b934d67f..8b702c9e 100644 --- a/metrics/pom.xml +++ b/metrics/pom.xml @@ -16,7 +16,8 @@ limitations under the License. --> - + o11yphant org.commonjava.util diff --git a/pom.xml b/pom.xml index 07dbc5fb..d4f0e565 100644 --- a/pom.xml +++ b/pom.xml @@ -15,297 +15,271 @@ limitations under the License. --> - - 4.0.0 + + 4.0.0 - - org.commonjava - commonjava - 18 - + + org.commonjava + commonjava + 18 + - org.commonjava.util - o11yphant - 1.9.2-SNAPSHOT + org.commonjava.util + o11yphant + 1.9.2-SNAPSHOT - pom - - metrics - trace - + pom + + metrics + trace + - o11yphant :: Parent + o11yphant :: Parent - 2020-2023 + 2020-2023 - - scm:git:https://github.com/commonjava/o11yphant - scm:git:https://github.com/commonjava/o11yphant - https://github.com/Commonjava/o11yphant - HEAD - + + scm:git:https://github.com/commonjava/o11yphant + scm:git:https://github.com/commonjava/o11yphant + https://github.com/Commonjava/o11yphant + HEAD + - - Red Hat, Inc. - https://github.com/commonjava/o11yphant - 11 - 1 - 4.2.15 - 1.19.0 - 0.16.0 - 1.4 - 1.2.12 - 2.2.26.Final - 1.22 - 1.16 - 3.11.3 - 4.5.13 - 1.12 - + + Red Hat, Inc. + https://github.com/commonjava/o11yphant + 11 + 1 + 4.2.21 + 1.19.0 + 0.16.0 + 1.2.12 + 2.2.28.Final + 1.22 + 1.16 + 3.11.5 + 4.5.13 + 1.12 + - - - - org.commonjava.boms - web-commons-bom - 28 - pom - import - - - - io.opentelemetry - opentelemetry-bom - ${otelVersion} - pom - import - + + + + org.commonjava.boms + web-commons-bom + 28 + pom + import + - - org.commonjava.util - o11yphant-trace-api - 1.9.2-SNAPSHOT - - - org.commonjava.util - o11yphant-trace-core - 1.9.2-SNAPSHOT - - - org.commonjava.util - o11yphant-trace-otel - 1.9.2-SNAPSHOT - - - - org.commonjava.util - o11yphant-trace-helper-servlet - 1.9.2-SNAPSHOT - - - org.commonjava.util - o11yphant-trace-helper-httpclient - 1.9.2-SNAPSHOT - - - org.commonjava.util - o11yphant-trace-helper-jhttpc - 1.9.2-SNAPSHOT - + + io.opentelemetry + opentelemetry-bom + ${otelVersion} + pom + import + - - org.commonjava.util - o11yphant-metrics - 1.9.2-SNAPSHOT - - - org.commonjava.util - o11yphant-metrics-api - 1.9.2-SNAPSHOT - - - org.commonjava.util - o11yphant-metrics-common - 1.9.2-SNAPSHOT - - - org.commonjava.util - o11yphant-metrics-core - 1.9.2-SNAPSHOT - + + org.commonjava.util + o11yphant-trace-api + 1.9.2-SNAPSHOT + + + org.commonjava.util + o11yphant-trace-core + 1.9.2-SNAPSHOT + + + org.commonjava.util + o11yphant-trace-otel + 1.9.2-SNAPSHOT + + + org.commonjava.util + o11yphant-trace-helper-servlet + 1.9.2-SNAPSHOT + + + org.commonjava.util + o11yphant-trace-helper-httpclient + 1.9.2-SNAPSHOT + + + org.commonjava.util + o11yphant-trace-helper-jhttpc + 1.9.2-SNAPSHOT + - - io.dropwizard.metrics - metrics-core - ${metricsVersion} - - - io.dropwizard.metrics - metrics-jvm - ${metricsVersion} - - - io.dropwizard.metrics - metrics-healthchecks - ${metricsVersion} - - - io.dropwizard.metrics - metrics-graphite - ${metricsVersion} - - - io.dropwizard.metrics - metrics-servlets - ${metricsVersion} - - - io.dropwizard.metrics - metrics-json - ${metricsVersion} - - - io.undertow - undertow-servlet - ${undertowVersion} - + + org.commonjava.util + o11yphant-metrics + 1.9.2-SNAPSHOT + + + org.commonjava.util + o11yphant-metrics-api + 1.9.2-SNAPSHOT + + + org.commonjava.util + o11yphant-metrics-common + 1.9.2-SNAPSHOT + + + org.commonjava.util + o11yphant-metrics-core + 1.9.2-SNAPSHOT + - - io.prometheus - simpleclient_servlet - ${prometheusVersion} - - - io.prometheus - simpleclient_dropwizard - ${prometheusVersion} - - - - org.commonjava.util - http-testserver - ${httpTestserverVersion} - test - - - ch.qos.logback - logback-classic - ${logbackVersion} - - - ch.qos.logback - logback-core - ${logbackVersion} - + + io.dropwizard.metrics + metrics-core + ${metricsVersion} + + + io.dropwizard.metrics + metrics-jvm + ${metricsVersion} + + + io.dropwizard.metrics + metrics-healthchecks + ${metricsVersion} + + + io.dropwizard.metrics + metrics-graphite + ${metricsVersion} + + + io.dropwizard.metrics + metrics-servlets + ${metricsVersion} + + + io.dropwizard.metrics + metrics-json + ${metricsVersion} + + + io.undertow + undertow-servlet + ${undertowVersion} + - - org.commonjava.cdi.util - weft - ${weftVersion} - + + io.prometheus + simpleclient_servlet + ${prometheusVersion} + + + io.prometheus + simpleclient_dropwizard + ${prometheusVersion} + + + ch.qos.logback + logback-classic + ${logbackVersion} + + + ch.qos.logback + logback-core + ${logbackVersion} + - - org.commonjava.util - jhttpc - ${jhttpcVersion} - + + org.commonjava.cdi.util + weft + ${weftVersion} + - - io.agroal - agroal-api - ${agroalVersion} - + + org.commonjava.util + jhttpc + ${jhttpcVersion} + - - com.datastax.cassandra - cassandra-driver-core - ${datastaxVersion} - + + io.agroal + agroal-api + ${agroalVersion} + - - org.apache.httpcomponents - httpclient - ${httpclientVersion} - + + com.datastax.cassandra + cassandra-driver-core + ${datastaxVersion} + - - io.grpc - grpc-netty - 1.35.0 - - - com.google.guava - guava - 23.6-jre - + + org.apache.httpcomponents + httpclient + ${httpclientVersion} + - - javax.annotation - javax.annotation-api - 1.3.2 - provided - - - javax.enterprise - cdi-api - 1.2 - provided - + + com.google.code.findbugs + jsr305 + 3.0.2 + - - + + javax.annotation + javax.annotation-api + 1.3.2 + provided + + + javax.enterprise + cdi-api + 1.2 + provided + - - - ch.qos.logback - logback-classic - - - javax.annotation - javax.annotation-api - - - javax.enterprise - cdi-api - - - org.slf4j - slf4j-api - - - commons-io - commons-io - - - commons-lang - commons-lang - - - org.apache.commons - commons-lang3 - 3.12.0 - - - commons-codec - commons-codec - - - junit - junit - test - + + + + ch.qos.logback + logback-classic + + + javax.annotation + javax.annotation-api + + + javax.enterprise + cdi-api + + + org.slf4j + slf4j-api + + + commons-io + commons-io + + + commons-lang + commons-lang + + + org.apache.commons + commons-lang3 + 3.12.0 + + + commons-codec + commons-codec + + + junit + junit + test + + diff --git a/trace/api/pom.xml b/trace/api/pom.xml index 21f841f9..4435bbab 100644 --- a/trace/api/pom.xml +++ b/trace/api/pom.xml @@ -16,30 +16,31 @@ limitations under the License. --> - - 4.0.0 - - - org.commonjava.util - o11yphant-trace - 1.9.2-SNAPSHOT - - - o11yphant-trace-api - o11yphant :: Tracers :: API - - - - org.commonjava.util - o11yphant-metrics-api - - - org.commonjava.cdi.util - weft - - - org.apache.httpcomponents - httpclient - - + + 4.0.0 + + + org.commonjava.util + o11yphant-trace + 1.9.2-SNAPSHOT + + + o11yphant-trace-api + o11yphant :: Tracers :: API + + + + org.commonjava.util + o11yphant-metrics-api + + + org.commonjava.cdi.util + weft + + + org.apache.httpcomponents + httpclient + + \ No newline at end of file diff --git a/trace/core/pom.xml b/trace/core/pom.xml index ab7cf3fc..9d7b2057 100644 --- a/trace/core/pom.xml +++ b/trace/core/pom.xml @@ -16,39 +16,40 @@ limitations under the License. --> - - 4.0.0 - - - org.commonjava.util - o11yphant-trace - 1.9.2-SNAPSHOT - - - o11yphant-trace-core - o11yphant :: Tracers :: Core - - - - org.commonjava.util - o11yphant-trace-api - - - org.commonjava.util - o11yphant-metrics-core - - - org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec - - - io.agroal - agroal-api - - - com.datastax.cassandra - cassandra-driver-core - - + + 4.0.0 + + + org.commonjava.util + o11yphant-trace + 1.9.2-SNAPSHOT + + + o11yphant-trace-core + o11yphant :: Tracers :: Core + + + + org.commonjava.util + o11yphant-trace-api + + + org.commonjava.util + o11yphant-metrics-core + + + org.jboss.spec.javax.servlet + jboss-servlet-api_3.0_spec + + + io.agroal + agroal-api + + + com.datastax.cassandra + cassandra-driver-core + + \ No newline at end of file diff --git a/trace/helper-httpclient/pom.xml b/trace/helper-httpclient/pom.xml index e655962a..2717253a 100644 --- a/trace/helper-httpclient/pom.xml +++ b/trace/helper-httpclient/pom.xml @@ -16,31 +16,32 @@ limitations under the License. --> - - 4.0.0 - - - org.commonjava.util - o11yphant-trace - 1.9.2-SNAPSHOT - - - o11yphant-trace-helper-httpclient - o11yphant :: Tracers :: Apache HTTPClient Helper - - - - org.commonjava.util - o11yphant-trace-api - - - org.commonjava.util - o11yphant-metrics-core - - - org.apache.httpcomponents - httpclient - - + + 4.0.0 + + + org.commonjava.util + o11yphant-trace + 1.9.2-SNAPSHOT + + + o11yphant-trace-helper-httpclient + o11yphant :: Tracers :: Apache HTTPClient Helper + + + + org.commonjava.util + o11yphant-trace-api + + + org.commonjava.util + o11yphant-metrics-core + + + org.apache.httpcomponents + httpclient + + \ No newline at end of file diff --git a/trace/helper-jhttpc/pom.xml b/trace/helper-jhttpc/pom.xml index f243c521..2f4230d9 100644 --- a/trace/helper-jhttpc/pom.xml +++ b/trace/helper-jhttpc/pom.xml @@ -16,39 +16,40 @@ limitations under the License. --> - - 4.0.0 - - - org.commonjava.util - o11yphant-trace - 1.9.2-SNAPSHOT - - - o11yphant-trace-helper-jhttpc - o11yphant :: Tracers :: jHTTPc Helper - - - - org.commonjava.util - o11yphant-trace-api - - - org.commonjava.util - o11yphant-trace-helper-httpclient - - - org.commonjava.util - o11yphant-metrics-core - - - org.commonjava.util - jhttpc - - - org.apache.httpcomponents - httpclient - - + + 4.0.0 + + + org.commonjava.util + o11yphant-trace + 1.9.2-SNAPSHOT + + + o11yphant-trace-helper-jhttpc + o11yphant :: Tracers :: jHTTPc Helper + + + + org.commonjava.util + o11yphant-trace-api + + + org.commonjava.util + o11yphant-trace-helper-httpclient + + + org.commonjava.util + o11yphant-metrics-core + + + org.commonjava.util + jhttpc + + + org.apache.httpcomponents + httpclient + + \ No newline at end of file diff --git a/trace/helper-servlet/pom.xml b/trace/helper-servlet/pom.xml index 29e529bf..88d883bc 100644 --- a/trace/helper-servlet/pom.xml +++ b/trace/helper-servlet/pom.xml @@ -16,27 +16,28 @@ limitations under the License. --> - - 4.0.0 - - - org.commonjava.util - o11yphant-trace - 1.9.2-SNAPSHOT - - - o11yphant-trace-helper-servlet - o11yphant :: Tracers :: Servlet API Helper - - - - org.commonjava.util - o11yphant-trace-api - - - org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec - - + + 4.0.0 + + + org.commonjava.util + o11yphant-trace + 1.9.2-SNAPSHOT + + + o11yphant-trace-helper-servlet + o11yphant :: Tracers :: Servlet API Helper + + + + org.commonjava.util + o11yphant-trace-api + + + org.jboss.spec.javax.servlet + jboss-servlet-api_3.0_spec + + \ No newline at end of file diff --git a/trace/honeycomb/pom.xml b/trace/honeycomb/pom.xml index 0f8dac1f..e636a748 100644 --- a/trace/honeycomb/pom.xml +++ b/trace/honeycomb/pom.xml @@ -16,35 +16,36 @@ limitations under the License. --> - - 4.0.0 - - - org.commonjava.util - o11yphant-trace - 1.9-SNAPSHOT - - - o11yphant-trace-honeycomb - o11yphant :: Tracers :: Honeycomb - - - - org.commonjava.util - o11yphant-metrics-api - - - org.commonjava.util - o11yphant-metrics-core - - - org.commonjava.util - o11yphant-trace-api - - - io.honeycomb.beeline - beeline-core - - + + 4.0.0 + + + org.commonjava.util + o11yphant-trace + 1.9-SNAPSHOT + + + o11yphant-trace-honeycomb + o11yphant :: Tracers :: Honeycomb + + + + org.commonjava.util + o11yphant-metrics-api + + + org.commonjava.util + o11yphant-metrics-core + + + org.commonjava.util + o11yphant-trace-api + + + io.honeycomb.beeline + beeline-core + + \ No newline at end of file diff --git a/trace/otel/pom.xml b/trace/otel/pom.xml index c96ae976..56106bdb 100644 --- a/trace/otel/pom.xml +++ b/trace/otel/pom.xml @@ -16,61 +16,58 @@ limitations under the License. --> - - 4.0.0 + + 4.0.0 - - org.commonjava.util - o11yphant-trace - 1.9.2-SNAPSHOT - + + org.commonjava.util + o11yphant-trace + 1.9.2-SNAPSHOT + - o11yphant-trace-otel - o11yphant :: Tracers :: Opentelemetry + o11yphant-trace-otel + o11yphant :: Tracers :: Opentelemetry - - - io.opentelemetry - opentelemetry-api - - - io.opentelemetry - opentelemetry-sdk - - - io.opentelemetry - opentelemetry-exporter-otlp - - - io.opentelemetry - opentelemetry-exporter-logging - - - org.commonjava.util - o11yphant-trace-api - - - org.slf4j - jul-to-slf4j - - - io.grpc - grpc-netty - - - com.google.guava - guava - - + + + io.opentelemetry + opentelemetry-api + + + io.opentelemetry + opentelemetry-sdk + + + io.opentelemetry + opentelemetry-exporter-otlp + + + io.opentelemetry + opentelemetry-exporter-logging + + + org.commonjava.util + o11yphant-trace-api + + + org.slf4j + jul-to-slf4j + + + com.google.code.findbugs + jsr305 + + - - - - src/main/resources - true - - - - + + + + src/main/resources + true + + + + \ No newline at end of file diff --git a/trace/pom.xml b/trace/pom.xml index d133448a..8f5100c4 100644 --- a/trace/pom.xml +++ b/trace/pom.xml @@ -16,7 +16,8 @@ limitations under the License. --> - + o11yphant org.commonjava.util @@ -32,7 +33,7 @@ api core otel - + helper-jhttpc helper-servlet helper-httpclient