Skip to content

Fix Netty version conflict and switching to Apache Cassandra driver #2512

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
ruhan1 merged 1 commit into from
Dec 10, 2025
Merged

Fix Netty version conflict and switching to Apache Cassandra driver #2512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions addons/schedule/common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,8 @@
<artifactId>indy-schedule-model-java</artifactId>
</dependency>
<dependency>
<groupId>com.datastax.cassandra</groupId>
<groupId>org.apache.cassandra</groupId>
<artifactId>cassandra-driver-mapping</artifactId>
<version>${datastaxVersion}</version>
</dependency>
<dependency>
<groupId>org.cassandraunit</groupId>
Expand Down
4 changes: 2 additions & 2 deletions addons/schedule/model-java/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
<name>Indy :: Add-Ons :: Schedule :: Java Domain Model</name>

<dependencies>
<!--Datastax Java Driver-->
<!--Apache Cassandra Java Driver (matches path-mapped-storage)-->
<dependency>
<groupId>com.datastax.cassandra</groupId>
<groupId>org.apache.cassandra</groupId>
<artifactId>cassandra-driver-mapping</artifactId>
</dependency>
</dependencies>
Expand Down
21 changes: 15 additions & 6 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
<httpclientVersion>4.5.13</httpclientVersion>
<otelInstrumentationVersion>1.19.0-alpha</otelInstrumentationVersion>
<cassandraUnitVersion>3.7.1.0</cassandraUnitVersion>
<datastaxVersion>3.11.3</datastaxVersion>
<cassandraVersion>3.12.1</cassandraVersion>
<pathmappedStorageVersion>3.0</pathmappedStorageVersion>
<o11yphantVersion>1.9.2</o11yphantVersion>
<swaggerVersion>1.6.6</swaggerVersion>
Expand Down Expand Up @@ -1379,6 +1379,15 @@
<version>${logbackContribVersion}</version>
</dependency>

<!-- Managing vulnerable versions of netty from cassandra to avoid CVE -->
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-bom</artifactId>
<version>4.1.118.Final</version>
<type>pom</type>
<scope>import</scope>
</dependency>

<!-- o11yphant dependencies -->
<dependency>
<groupId>org.commonjava.util</groupId>
Expand Down Expand Up @@ -1475,16 +1484,16 @@
<version>${pathmappedStorageVersion}</version>
</dependency>

<!--Datastax Java Driver-->
<!--Apache Cassandra Java Driver (matches path-mapped-storage)-->
<dependency>
<groupId>com.datastax.cassandra</groupId>
<groupId>org.apache.cassandra</groupId>
<artifactId>cassandra-driver-core</artifactId>
<version>${datastaxVersion}</version>
<version>${cassandraVersion}</version>
</dependency>
<dependency>
<groupId>com.datastax.cassandra</groupId>
<groupId>org.apache.cassandra</groupId>
<artifactId>cassandra-driver-mapping</artifactId>
<version>${datastaxVersion}</version>
<version>${cassandraVersion}</version>
</dependency>

<dependency>
Expand Down
6 changes: 3 additions & 3 deletions subsys/cassandra/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@
<groupId>org.commonjava.indy</groupId>
<artifactId>indy-subsys-trace</artifactId>
</dependency>
<!--Datastax Java Driver-->
<!--Apache Cassandra Java Driver (matches path-mapped-storage)-->
<dependency>
<groupId>com.datastax.cassandra</groupId>
<groupId>org.apache.cassandra</groupId>
<artifactId>cassandra-driver-core</artifactId>
</dependency>
<dependency>
<groupId>com.datastax.cassandra</groupId>
<groupId>org.apache.cassandra</groupId>
<artifactId>cassandra-driver-mapping</artifactId>
</dependency>
</dependencies>
Expand Down