Skip to content

Update versions. #110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sswguo merged 2 commits into from
Oct 21, 2025
Merged

Update versions. #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2141b75
Update versions.
rnc Oct 20, 2025
72a0f48
Update cassandra and avoid vulnerable versions
rnc Oct 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/maven-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
}]
Expand Down
2 changes: 1 addition & 1 deletion metrics/api/src/main/java/org/commonjava/o11yphant/metrics/util/NameUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
55 changes: 24 additions & 31 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.commonjava</groupId>
<artifactId>commonjava</artifactId>
<version>18</version>
<version>21</version>
</parent>

<groupId>org.commonjava.util</groupId>
Expand Down Expand Up @@ -53,22 +53,27 @@
<javaVersion>11</javaVersion>
<test-forkCount>1</test-forkCount>
<metricsVersion>4.2.21</metricsVersion>
<otelVersion>1.19.0</otelVersion>
<otelVersion>1.32.0</otelVersion>
<prometheusVersion>0.16.0</prometheusVersion>
<logbackVersion>1.2.12</logbackVersion>
<undertowVersion>2.2.28.Final</undertowVersion>
<undertowVersion>2.2.38.Final</undertowVersion>
<agroalVersion>1.16</agroalVersion>
<datastaxVersion>3.11.5</datastaxVersion>
<httpclientVersion>4.5.13</httpclientVersion>
<jhttpcVersion>1.12</jhttpcVersion>
<cassandraVersion>3.12.1</cassandraVersion>
<jhttpcVersion>1.16</jhttpcVersion>
</properties>

<dependencyManagement>
<dependencies>
<!-- Managing vulnerable versions of netty from cassandra to avoid CVE -->
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
<version>4.1.118.Final</version>
</dependency>

<dependency>
<groupId>org.commonjava.boms</groupId>
<artifactId>web-commons-bom</artifactId>
<version>29</version>
<version>31</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -185,17 +190,6 @@
<version>${prometheusVersion}</version>
</dependency>

<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>${logbackVersion}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>${logbackVersion}</version>
</dependency>

<dependency>
<groupId>org.commonjava.util</groupId>
<artifactId>jhttpc</artifactId>
Expand All @@ -209,15 +203,19 @@
</dependency>

<dependency>
<groupId>com.datastax.cassandra</groupId>
<artifactId>cassandra-driver-core</artifactId>
<version>${datastaxVersion}</version>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
</dependency>

<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>${httpclientVersion}</version>
<groupId>org.apache.cassandra</groupId>
<artifactId>cassandra-driver-core</artifactId>
<version>${cassandraVersion}</version>
<exclusions>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down Expand Up @@ -263,14 +261,9 @@
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.12.0</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
Expand Down
10 changes: 9 additions & 1 deletion trace/core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,14 @@
<name>o11yphant :: Tracers :: Core</name>

<dependencies>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
</dependency>
<dependency>
<groupId>org.commonjava.util</groupId>
<artifactId>o11yphant-trace-api</artifactId>
Expand All @@ -47,7 +55,7 @@
<artifactId>agroal-api</artifactId>
</dependency>
<dependency>
<groupId>com.datastax.cassandra</groupId>
<groupId>org.apache.cassandra</groupId>
<artifactId>cassandra-driver-core</artifactId>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion trace/core/src/main/java/org/commonjava/o11yphant/trace/impl/EnvSpanFieldsInjector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down