diff --git a/Jenkinsfile-datastax b/Jenkinsfile-datastax
index 602f33101ca..bbbcbf9c0a2 100644
--- a/Jenkinsfile-datastax
+++ b/Jenkinsfile-datastax
@@ -131,12 +131,6 @@ def executeTests() {
. ${JABBA_SHELL}
jabba use 1.8
- if [ "${JABBA_VERSION}" != "1.8" ]; then
- SKIP_JAVADOCS=true
- else
- SKIP_JAVADOCS=false
- fi
-
INTEGRATION_TESTS_FILTER_ARGUMENT=""
if [ ! -z "${INTEGRATION_TESTS_FILTER}" ]; then
INTEGRATION_TESTS_FILTER_ARGUMENT="-Dit.test=${INTEGRATION_TESTS_FILTER}"
@@ -148,7 +142,7 @@ def executeTests() {
-DtestJavaHome='''+testJavaHome+''' \
-DfailIfNoTests=false \
-Dmaven.test.failure.ignore=true \
- -Dmaven.javadoc.skip=${SKIP_JAVADOCS} \
+ -Dmaven.javadoc.skip=true \
-Dccm.version=${CCM_CASSANDRA_VERSION} \
-Dccm.distribution=${CCM_SERVER_TYPE:cassandra} \
-Dproxy.path=${HOME}/proxy \
@@ -329,8 +323,6 @@ pipeline {
choice(
name: 'ADHOC_BUILD_AND_EXECUTE_TESTS_JABBA_VERSION',
choices: [
- '1.8', // Oracle JDK version 1.8 (current default)
- 'openjdk@1.11', // OpenJDK version 11
'openjdk@1.17', // OpenJDK version 17
'openjdk@1.21' // OpenJDK version 21
],
@@ -342,14 +334,6 @@ pipeline {
Choice |
Description |
-
- | 1.8 |
- Oracle JDK version 1.8 (Used for compiling regardless of choice) |
-
-
- | openjdk@1.11 |
- OpenJDK version 11 |
-
| openjdk@1.17 |
OpenJDK version 17 |
@@ -394,9 +378,8 @@ pipeline {
// schedules only run against release branches (i.e. 3.x, 4.x, 4.5.x, etc.)
parameterizedCron(branchPatternCron().matcher(env.BRANCH_NAME).matches() ? """
# Every weekend (Saturday, Sunday) around 2:00 AM
- H 2 * * 0 %CI_SCHEDULE=WEEKENDS;CI_SCHEDULE_SERVER_VERSIONS=4.0 4.1 5.0 dse-4.8.16 dse-5.0.15 dse-5.1.35 dse-6.0.18 dse-6.7.17;CI_SCHEDULE_JABBA_VERSION=1.8
+ H 2 * * 0 %CI_SCHEDULE=WEEKENDS;CI_SCHEDULE_SERVER_VERSIONS=4.0 4.1 5.0 dse-4.8.16 dse-5.0.15 dse-5.1.35 dse-6.0.18 dse-6.7.17;CI_SCHEDULE_JABBA_VERSION=openjdk@1.17
# Every weeknight (Monday - Friday) around 12:00 PM noon
- H 12 * * 1-5 %CI_SCHEDULE=WEEKNIGHTS;CI_SCHEDULE_SERVER_VERSIONS=4.1 5.0 dse-6.8.30 dse-6.9.0 hcd-1.0.0;CI_SCHEDULE_JABBA_VERSION=openjdk@1.11
H 12 * * 1-5 %CI_SCHEDULE=WEEKNIGHTS;CI_SCHEDULE_SERVER_VERSIONS=4.1 5.0 dse-6.8.30 dse-6.9.0 hcd-1.0.0;CI_SCHEDULE_JABBA_VERSION=openjdk@1.17
""" : "")
}
@@ -439,9 +422,7 @@ pipeline {
}
axis {
name 'JABBA_VERSION'
- values '1.8', // jdk8
- 'openjdk@1.11', // jdk11
- 'openjdk@1.17', // jdk17
+ values 'openjdk@1.17', // jdk17
'openjdk@1.21' // jdk21
}
}
@@ -468,7 +449,7 @@ pipeline {
}
stage('Build-Driver') {
steps {
- buildDriver('1.8')
+ buildDriver('openjdk@1.17')
}
}
stage('Execute-Tests') {
@@ -583,7 +564,7 @@ pipeline {
}
stage('Build-Driver') {
steps {
- buildDriver('1.8')
+ buildDriver('openjdk@1.17')
}
}
stage('Execute-Tests') {
@@ -611,7 +592,7 @@ pipeline {
when {
allOf {
environment name: 'SERVER_VERSION', value: '4.0'
- environment name: 'JABBA_VERSION', value: '1.8'
+ environment name: 'JABBA_VERSION', value: 'openjdk@1.17'
}
}
steps {
diff --git a/bom/pom.xml b/bom/pom.xml
index 67e26c95bde..101ee007e06 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -23,7 +23,7 @@
org.apache.cassandra
java-driver-parent
- 4.19.4-SNAPSHOT
+ 5.0.0-SNAPSHOT
java-driver-bom
pom
@@ -33,47 +33,47 @@
org.apache.cassandra
java-driver-core
- 4.19.4-SNAPSHOT
+ 5.0.0-SNAPSHOT
org.apache.cassandra
java-driver-core-shaded
- 4.19.4-SNAPSHOT
+ 5.0.0-SNAPSHOT
org.apache.cassandra
java-driver-mapper-processor
- 4.19.4-SNAPSHOT
+ 5.0.0-SNAPSHOT
org.apache.cassandra
java-driver-mapper-runtime
- 4.19.4-SNAPSHOT
+ 5.0.0-SNAPSHOT
org.apache.cassandra
java-driver-query-builder
- 4.19.4-SNAPSHOT
+ 5.0.0-SNAPSHOT
org.apache.cassandra
java-driver-guava-shaded
- 4.19.4-SNAPSHOT
+ 5.0.0-SNAPSHOT
org.apache.cassandra
java-driver-test-infra
- 4.19.4-SNAPSHOT
+ 5.0.0-SNAPSHOT
org.apache.cassandra
java-driver-metrics-micrometer
- 4.19.4-SNAPSHOT
+ 5.0.0-SNAPSHOT
org.apache.cassandra
java-driver-metrics-microprofile
- 4.19.4-SNAPSHOT
+ 5.0.0-SNAPSHOT
com.datastax.oss
diff --git a/core-shaded/pom.xml b/core-shaded/pom.xml
index 7d173e2783b..ead63b9b797 100644
--- a/core-shaded/pom.xml
+++ b/core-shaded/pom.xml
@@ -23,7 +23,7 @@
org.apache.cassandra
java-driver-parent
- 4.19.4-SNAPSHOT
+ 5.0.0-SNAPSHOT
java-driver-core-shaded
Apache Cassandra Java Driver - core with shaded deps
diff --git a/core/pom.xml b/core/pom.xml
index 59306b175cd..70c3ff9bba2 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -23,7 +23,7 @@
org.apache.cassandra
java-driver-parent
- 4.19.4-SNAPSHOT
+ 5.0.0-SNAPSHOT
java-driver-core
bundle
diff --git a/distribution-source/pom.xml b/distribution-source/pom.xml
index 40ca39bf612..6552f127c61 100644
--- a/distribution-source/pom.xml
+++ b/distribution-source/pom.xml
@@ -23,7 +23,7 @@
org.apache.cassandra
java-driver-parent
- 4.19.4-SNAPSHOT
+ 5.0.0-SNAPSHOT
java-driver-distribution-source
pom
diff --git a/distribution-tests/pom.xml b/distribution-tests/pom.xml
index c6352b3dfd9..f8c5687796a 100644
--- a/distribution-tests/pom.xml
+++ b/distribution-tests/pom.xml
@@ -23,7 +23,7 @@
org.apache.cassandra
java-driver-parent
- 4.19.4-SNAPSHOT
+ 5.0.0-SNAPSHOT
java-driver-distribution-tests
Apache Cassandra Java Driver - distribution tests
diff --git a/distribution/pom.xml b/distribution/pom.xml
index db95669cd6b..1beffc5e736 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -23,7 +23,7 @@
org.apache.cassandra
java-driver-parent
- 4.19.4-SNAPSHOT
+ 5.0.0-SNAPSHOT
java-driver-distribution
diff --git a/examples/pom.xml b/examples/pom.xml
index e3ec891843e..41ffc669ff7 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -23,7 +23,7 @@
java-driver-parent
org.apache.cassandra
- 4.19.4-SNAPSHOT
+ 5.0.0-SNAPSHOT
java-driver-examples
Apache Cassandra Java Driver - examples.
diff --git a/guava-shaded/pom.xml b/guava-shaded/pom.xml
index 7fbadd0cea1..66f58898f61 100644
--- a/guava-shaded/pom.xml
+++ b/guava-shaded/pom.xml
@@ -23,7 +23,7 @@
org.apache.cassandra
java-driver-parent
- 4.19.4-SNAPSHOT
+ 5.0.0-SNAPSHOT
java-driver-guava-shaded
Apache Cassandra Java Driver - guava shaded dep
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 42432eda417..d06d261b1ab 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -23,7 +23,7 @@
org.apache.cassandra
java-driver-parent
- 4.19.4-SNAPSHOT
+ 5.0.0-SNAPSHOT
java-driver-integration-tests
jar
@@ -326,6 +326,17 @@
true
+
+ maven-compiler-plugin
+
+
+
+ org.apache.cassandra
+ java-driver-mapper-processor
+
+
+
+
org.sonatype.plugins
nexus-staging-maven-plugin
diff --git a/mapper-processor/pom.xml b/mapper-processor/pom.xml
index 5513498f946..f587e2cd81d 100644
--- a/mapper-processor/pom.xml
+++ b/mapper-processor/pom.xml
@@ -23,7 +23,7 @@
org.apache.cassandra
java-driver-parent
- 4.19.4-SNAPSHOT
+ 5.0.0-SNAPSHOT
java-driver-mapper-processor
Apache Cassandra Java Driver - object mapper processor
diff --git a/mapper-runtime/pom.xml b/mapper-runtime/pom.xml
index 33a1625ecbf..2f49053f4fb 100644
--- a/mapper-runtime/pom.xml
+++ b/mapper-runtime/pom.xml
@@ -23,7 +23,7 @@
org.apache.cassandra
java-driver-parent
- 4.19.4-SNAPSHOT
+ 5.0.0-SNAPSHOT
java-driver-mapper-runtime
bundle
diff --git a/metrics/micrometer/pom.xml b/metrics/micrometer/pom.xml
index 8efa9ed755b..f93dd70a227 100644
--- a/metrics/micrometer/pom.xml
+++ b/metrics/micrometer/pom.xml
@@ -23,7 +23,7 @@
org.apache.cassandra
java-driver-parent
- 4.19.4-SNAPSHOT
+ 5.0.0-SNAPSHOT
../../
java-driver-metrics-micrometer
diff --git a/metrics/microprofile/pom.xml b/metrics/microprofile/pom.xml
index 931d17f1a88..cf9987d7125 100644
--- a/metrics/microprofile/pom.xml
+++ b/metrics/microprofile/pom.xml
@@ -23,7 +23,7 @@
org.apache.cassandra
java-driver-parent
- 4.19.4-SNAPSHOT
+ 5.0.0-SNAPSHOT
../../
java-driver-metrics-microprofile
diff --git a/osgi-tests/pom.xml b/osgi-tests/pom.xml
index 037fc3f6055..fa9c1b2ec13 100644
--- a/osgi-tests/pom.xml
+++ b/osgi-tests/pom.xml
@@ -23,7 +23,7 @@
org.apache.cassandra
java-driver-parent
- 4.19.4-SNAPSHOT
+ 5.0.0-SNAPSHOT
java-driver-osgi-tests
jar
diff --git a/pom.xml b/pom.xml
index 947132f9a43..39df107c06f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
org.apache.cassandra
java-driver-parent
- 4.19.4-SNAPSHOT
+ 5.0.0-SNAPSHOT
pom
Apache Cassandra Java Driver
https://github.com/datastax/java-driver
@@ -51,6 +51,7 @@
bom
+ 17
UTF-8
UTF-8
1.4.1
@@ -459,7 +460,7 @@
maven-compiler-plugin
- 3.8.1
+ 3.15.0
com.coveo
@@ -486,7 +487,7 @@
maven-shade-plugin
- 3.2.3
+ 3.6.2
maven-assembly-plugin
@@ -615,33 +616,22 @@
maven-compiler-plugin
- javac-with-errorprone
- true
- 1.8
- 1.8
-
- -Xep:FutureReturnValueIgnored:OFF
- -Xep:PreferJavaTimeOverload:OFF
- -Xep:AnnotateFormatMethod:OFF
- -Xep:WildcardImport:WARN
- -XepExcludedPaths:.*/target/(?:generated-sources|generated-test-sources)/.*
+ UTF-8
+
+ -XDcompilePolicy=simple -Xplugin:ErrorProne \ -Xep:FutureReturnValueIgnored:OFF \ -Xep:PreferJavaTimeOverload:OFF \ -Xep:AnnotateFormatMethod:OFF \ -Xep:WildcardImport:WARN \ -XepExcludedPaths:.*/target/(?:generated-sources|generated-test-sources)/.* \
+
+
+ com.google.errorprone
+ error_prone_core
+
+ 2.42.0
+
+
true
- true
+ false
false
-
-
- org.codehaus.plexus
- plexus-compiler-javac-errorprone
- 2.8.6
-
-
- com.google.errorprone
- error_prone_core
- 2.3.4
-
-
com.coveo
@@ -834,12 +824,13 @@ limitations under the License.]]>
com.datastax.oss
api-plumber-doclet
- 1.0.0
+ 2.0.0
-preventleak
com.datastax.oss.driver.internal
+ -preventleak
com.datastax.dse.driver.internal
-preventleak
diff --git a/query-builder/pom.xml b/query-builder/pom.xml
index 511b8f9a005..ca9e0d37efe 100644
--- a/query-builder/pom.xml
+++ b/query-builder/pom.xml
@@ -23,7 +23,7 @@
org.apache.cassandra
java-driver-parent
- 4.19.4-SNAPSHOT
+ 5.0.0-SNAPSHOT
java-driver-query-builder
bundle
diff --git a/test-infra/pom.xml b/test-infra/pom.xml
index 5105e9bc08d..393d8692359 100644
--- a/test-infra/pom.xml
+++ b/test-infra/pom.xml
@@ -23,7 +23,7 @@
org.apache.cassandra
java-driver-parent
- 4.19.4-SNAPSHOT
+ 5.0.0-SNAPSHOT
java-driver-test-infra
bundle