diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml index 6187f369..667dae68 100644 --- a/.github/workflows/maven-build.yml +++ b/.github/workflows/maven-build.yml @@ -41,7 +41,7 @@ jobs: with: servers: | [{ - "id": "sonatype-nexus-snapshots", + "id": "central-portal-snapshots", "username": "${{ secrets.SONATYPE_BOT_USERNAME }}", "password": "${{ secrets.SONATYPE_BOT_TOKEN }}" }] diff --git a/metrics/api/src/main/java/org/commonjava/o11yphant/metrics/util/NameUtils.java b/metrics/api/src/main/java/org/commonjava/o11yphant/metrics/util/NameUtils.java index 924a01dd..f10a3f6b 100644 --- a/metrics/api/src/main/java/org/commonjava/o11yphant/metrics/util/NameUtils.java +++ b/metrics/api/src/main/java/org/commonjava/o11yphant/metrics/util/NameUtils.java @@ -17,7 +17,7 @@ import org.commonjava.o11yphant.metrics.MetricsConstants; -import static org.apache.commons.lang.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.isBlank; public class NameUtils { diff --git a/pom.xml b/pom.xml index 22e38573..d1218f96 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.commonjava commonjava - 18 + 21 org.commonjava.util @@ -53,22 +53,27 @@ 11 1 4.2.21 - 1.19.0 + 1.32.0 0.16.0 - 1.2.12 - 2.2.28.Final + 2.2.38.Final 1.16 - 3.11.5 - 4.5.13 - 1.12 + 3.12.1 + 1.16 + + + io.netty + netty-handler + 4.1.118.Final + + org.commonjava.boms web-commons-bom - 29 + 31 pom import @@ -185,17 +190,6 @@ ${prometheusVersion} - - ch.qos.logback - logback-classic - ${logbackVersion} - - - ch.qos.logback - logback-core - ${logbackVersion} - - org.commonjava.util jhttpc @@ -209,15 +203,19 @@ - com.datastax.cassandra - cassandra-driver-core - ${datastaxVersion} + io.netty + netty-handler - - org.apache.httpcomponents - httpclient - ${httpclientVersion} + org.apache.cassandra + cassandra-driver-core + ${cassandraVersion} + + + io.netty + netty-handler + + @@ -263,14 +261,9 @@ commons-io commons-io - - commons-lang - commons-lang - org.apache.commons commons-lang3 - 3.12.0 commons-codec diff --git a/trace/core/pom.xml b/trace/core/pom.xml index 9d7b2057..0d7082c3 100644 --- a/trace/core/pom.xml +++ b/trace/core/pom.xml @@ -30,6 +30,14 @@ o11yphant :: Tracers :: Core + + com.google.guava + guava + + + io.netty + netty-handler + org.commonjava.util o11yphant-trace-api @@ -47,7 +55,7 @@ agroal-api - com.datastax.cassandra + org.apache.cassandra cassandra-driver-core diff --git a/trace/core/src/main/java/org/commonjava/o11yphant/trace/impl/EnvSpanFieldsInjector.java b/trace/core/src/main/java/org/commonjava/o11yphant/trace/impl/EnvSpanFieldsInjector.java index a5086f56..62b71241 100644 --- a/trace/core/src/main/java/org/commonjava/o11yphant/trace/impl/EnvSpanFieldsInjector.java +++ b/trace/core/src/main/java/org/commonjava/o11yphant/trace/impl/EnvSpanFieldsInjector.java @@ -15,7 +15,7 @@ */ package org.commonjava.o11yphant.trace.impl; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.o11yphant.trace.TracerConfiguration; import org.commonjava.o11yphant.trace.spi.SpanFieldsInjector; import org.commonjava.o11yphant.trace.spi.adapter.SpanAdapter;