Skip to content

Commit 9c6c091

Browse files
committed
Prepare version 4.14.0
1 parent 2ce43c6 commit 9c6c091

File tree

5 files changed

+45
-29
lines changed

5 files changed

+45
-29
lines changed

Diff for: CHANGELOG.md

+6-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this project adheres to
55
[Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7-
## [4.14.0] - Unreleased
7+
## [4.14.0] - 2024-12-xx
88
### Added
99
- Add support for IPv6 addresses in JDBC URL (see PR [#62](https://github.com/ing-bank/cassandra-jdbc-wrapper/pull/62)).
1010
- Add implementation for the method `CassandraPreparedStatement.setArray(int, Array)`.
@@ -14,6 +14,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
1414
- Add specific `jdbc:cassandra:aws` protocol to ease connection to Amazon Keyspaces.
1515
- Add support for Amazon Signature V4 authentication provider.
1616
- Add support to retrieve connection password from Amazon Secrets manager.
17+
### Changed
18+
- Update Apache Commons IO to version 2.18.0.
19+
- Update Apache Commons Lang to version 3.17.0.
20+
- Update Jackson dependencies to version 2.18.2.
21+
- Update Semver4j to version 5.4.1.
1722
### Fixed
1823
- Do not try to register codecs again (if already done previously) on a pre-existing session to avoid warnings in logs.
1924
- Fix some logging in `SessionHolder` to not leak connection credentials.

Diff for: NOTICE.txt

+13-3
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,30 @@ This product includes software developed as part of the Apache Cassandra Java Dr
99
( https://github.com/apache/cassandra-java-driver ).
1010

1111
Apache Commons Collections
12-
Copyright 2001-2023 The Apache Software Foundation
12+
Copyright 2001-2024 The Apache Software Foundation
1313
This product includes software developed as part of the Apache Commons Collections project
1414
( https://github.com/apache/commons-collections ).
1515

1616
Apache Commons IO
17-
Copyright 2002-2023 The Apache Software Foundation
17+
Copyright 2002-2024 The Apache Software Foundation
1818
This product includes software developed as part of the Apache Commons IO project
1919
( https://github.com/apache/commons-io ).
2020

2121
Apache Commons Lang
22-
Copyright 2001-2023 The Apache Software Foundation
22+
Copyright 2001-2024 The Apache Software Foundation
2323
This product includes software developed as part of the Apache Commons Lang project
2424
( https://github.com/apache/commons-lang ).
2525

26+
AWS SDK for Java 2.0
27+
Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
28+
This product includes software developed as part of the AWS SDK for Java 2.0 project
29+
( https://github.com/aws/aws-sdk-java-v2 ).
30+
31+
AWS SigV4 Auth Cassandra Java driver plugin
32+
Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
33+
This product includes software developed as part of the AWS SigV4 Auth Cassandra Java driver plugin project
34+
( https://github.com/aws/aws-sigv4-auth-cassandra-java-driver-plugin ).
35+
2636
Caffeine
2737
Copyright 2018 Ben Manes
2838
This product includes software developed as part of the Caffeine project

Diff for: README.md

+7-4
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ This is a JDBC wrapper of the Java Driver for Apache Cassandra®, which offers a
1010
CQL3.
1111

1212
This JDBC wrapper is based on a fork of the project
13-
[adejanovski/cassandra-jdbc-wrapper](https://github.com/adejanovski/cassandra-jdbc-wrapper/). We would especially like
14-
to thank its author.
13+
[adejanovski/cassandra-jdbc-wrapper](https://github.com/adejanovski/cassandra-jdbc-wrapper/), which is no longer
14+
maintained. We would especially like to thank its author.
1515

1616
## Features
1717

@@ -66,8 +66,11 @@ might disable them using the Maven profile `disableDseTests`:
6666
./mvnw clean package -PdisableDseTests
6767
```
6868

69-
The test suite also includes integration tests with AstraDB (`DbaasAstraIntegrationTest`). These tests require an
70-
AstraDB token configured in the environment variable `ASTRA_DB_APPLICATION_TOKEN`, otherwise they are skipped.
69+
The test suite also includes integration tests with:
70+
- AstraDB (`DbaasAstraIntegrationTest`). These tests require an AstraDB token configured in the environment
71+
variable `ASTRA_DB_APPLICATION_TOKEN`, otherwise they are skipped.
72+
- Amazon Keyspaces (`AmazonKeyspacesIntegrationTest`). These tests require an instance of Amazon Keyspaces and to define
73+
several environment variables in a `.env` file (see test class for further information), otherwise they are skipped.
7174

7275
### Integration in Maven projects
7376

Diff for: pom.xml

+19-19
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>com.ing.data</groupId>
77
<artifactId>cassandra-jdbc-wrapper</artifactId>
8-
<version>4.13.1</version>
8+
<version>4.14.0</version>
99
<packaging>jar</packaging>
1010

1111
<name>Cassandra JDBC Wrapper</name>
@@ -119,38 +119,38 @@
119119
<java.version>1.8</java.version>
120120

121121
<!-- Versions for dependencies -->
122-
<approvaltests.version>24.3.0</approvaltests.version>
123-
<aws-secretsmanager.version>2.29.1</aws-secretsmanager.version>
122+
<aws-secretsmanager.version>2.29.39</aws-secretsmanager.version>
124123
<aws-sigv4-auth-cassandra.version>4.0.9</aws-sigv4-auth-cassandra.version>
125124
<checkstyle.version>9.3</checkstyle.version>
126125
<caffeine.version>2.9.3</caffeine.version>
127126
<cassandra-driver-krb5.version>3.0.0</cassandra-driver-krb5.version>
128127
<commons-collections.version>4.4</commons-collections.version>
129-
<commons-io.version>2.16.1</commons-io.version>
130-
<commons-lang3.version>3.15.0</commons-lang3.version>
128+
<commons-io.version>2.18.0</commons-io.version>
129+
<commons-lang3.version>3.17.0</commons-lang3.version>
131130
<java.driver.version>4.18.1</java.driver.version>
132-
<jackson.version>2.17.2</jackson.version>
131+
<jackson.version>2.18.2</jackson.version>
133132
<javax-jsr305.version>3.0.2</javax-jsr305.version>
134-
<semver4j.version>5.3.0</semver4j.version>
133+
<semver4j.version>5.4.1</semver4j.version>
135134
<!-- Versions for test dependencies -->
135+
<approvaltests.version>24.12.0</approvaltests.version>
136136
<dotenv.version>2.3.2</dotenv.version>
137137
<hamcrest.version>2.2</hamcrest.version>
138-
<junit5.version>5.10.3</junit5.version>
139-
<junit-platform.version>1.10.3</junit-platform.version>
140-
<lombok.version>1.18.34</lombok.version>
138+
<junit5.version>5.11.4</junit5.version>
139+
<junit-platform.version>1.11.4</junit-platform.version>
140+
<lombok.version>1.18.36</lombok.version>
141141
<mockito.version>3.12.4</mockito.version>
142142
<slf4j.version>1.7.36</slf4j.version>
143-
<testcontainers.version>1.20.2</testcontainers.version>
144-
<astra-sdk.version>1.2.8</astra-sdk.version>
143+
<testcontainers.version>1.20.4</testcontainers.version>
144+
<astra-sdk.version>1.2.9</astra-sdk.version>
145145
<!-- Versions for plugins -->
146-
<maven-checkstyle-plugin.version>3.3.1</maven-checkstyle-plugin.version>
147-
<maven-clean-plugin.version>3.3.2</maven-clean-plugin.version>
146+
<maven-checkstyle-plugin.version>3.6.0</maven-checkstyle-plugin.version>
147+
<maven-clean-plugin.version>3.4.0</maven-clean-plugin.version>
148148
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
149-
<maven-enforcer-plugin.version>3.4.1</maven-enforcer-plugin.version>
150-
<maven-gpg-plugin.version>3.2.4</maven-gpg-plugin.version>
151-
<maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version>
149+
<maven-enforcer-plugin.version>3.5.0</maven-enforcer-plugin.version>
150+
<maven-gpg-plugin.version>3.2.7</maven-gpg-plugin.version>
151+
<maven-javadoc-plugin.version>3.11.2</maven-javadoc-plugin.version>
152152
<maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
153-
<maven-shade-plugin.version>3.5.3</maven-shade-plugin.version>
153+
<maven-shade-plugin.version>3.6.0</maven-shade-plugin.version>
154154
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
155155
<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
156156
</properties>
@@ -247,7 +247,7 @@
247247
</exclusions>
248248
</dependency>
249249

250-
<!-- AWS Secret manager -->
250+
<!-- AWS Secrets manager -->
251251
<dependency>
252252
<groupId>software.amazon.awssdk</groupId>
253253
<artifactId>secretsmanager</artifactId>

Diff for: src/test/java/com/ing/data/cassandra/jdbc/AmazonKeyspacesIntegrationTest.java

-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import io.github.cdimascio.dotenv.Dotenv;
1919
import org.junit.jupiter.api.Assertions;
2020
import org.junit.jupiter.api.BeforeAll;
21-
import org.junit.jupiter.api.Disabled;
2221
import org.junit.jupiter.api.Order;
2322
import org.junit.jupiter.api.Test;
2423
import org.junit.jupiter.api.TestMethodOrder;
@@ -72,7 +71,6 @@
7271
* specify the name of the secret to retrieve in the Secrets manager: <b>AWS_SECRET_NAME</b>.
7372
* </p>
7473
*/
75-
@Disabled
7674
@TestMethodOrder(org.junit.jupiter.api.MethodOrderer.OrderAnnotation.class)
7775
@Testcontainers
7876
class AmazonKeyspacesIntegrationTest {

0 commit comments

Comments
 (0)