This is an automated email from the ASF dual-hosted git repository.
ycai pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra-analytics.git
The following commit(s) were added to refs/heads/trunk by this push:
new 8ed7809 CASSANALYTICS-17: Remove JDK8 support (#104)
8ed7809 is described below
commit 8ed78099bf45b16b484763db0192cfd70158bddd
Author: Yifan Cai <[email protected]>
AuthorDate: Tue Mar 18 12:53:32 2025 -0700
CASSANALYTICS-17: Remove JDK8 support (#104)
Patch by Yifan Cai; Reviewed by Francisco Guerrero for CASSANALYTICS-17
---
.circleci/config.yml | 139 -----------------------------
CHANGES.txt | 1 +
profiles/scala-2.11-spark-2-jdk-1.8.gradle | 31 -------
profiles/scala-2.12-spark-2-jdk-1.8.gradle | 31 -------
scripts/build-sidecar.sh | 6 +-
5 files changed, 2 insertions(+), 206 deletions(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index a749b86..8d31a63 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -114,24 +114,6 @@ commands:
no_output_timeout: 30m
jobs:
- build-deps-jdk8:
- docker:
- - image: cimg/openjdk:8.0
- resource_class: large
- steps:
- - install_common
- - checkout
- - run:
- name: Build dependencies for jdk8 builds
- command: |
- ./scripts/build-dependencies.sh
- JDK_VERSION=1.8 SPARK_VERSION=2 SCALA_VERSION=2.12 ./gradlew
codeCheckTasks
- - persist_to_workspace:
- root: dependencies
- paths:
- - "*.jar"
- - "org/**/*"
-
build-deps-jdk11:
docker:
- image: cimg/openjdk:11.0
@@ -150,114 +132,6 @@ jobs:
- "*.jar"
- "org/**/*"
- spark2-2_11-jdk8:
- docker:
- - image: cimg/openjdk:8.0
- resource_class: large
- steps:
- - install_common
- - checkout
- - attach_workspace:
- at: dependencies
- - run_build:
- spark: "2"
- scala: "2.11"
- jdk: "1.8"
-
- - store_artifacts:
- path: build/test-reports
- destination: test-reports
-
- - store_artifacts:
- path: build/reports
- destination: reports
-
- - store_test_results:
- path: build/test-reports
-
- int-spark2-2_11-jdk8:
- parallelism: 8
- docker:
- - image: cimg/openjdk:8.0
- resource_class: large
- steps:
- - setup_remote_docker
- - install_common
- - checkout
- - attach_workspace:
- at: dependencies
- - run_integration:
- spark: "2"
- scala: "2.11"
- jdk: "1.8"
-
- - store_artifacts:
- path: build/test-reports
- destination: test-reports
-
- - store_artifacts:
- path: build/reports
- destination: reports
-
- - store_test_results:
- path: build/test-reports
-
- spark2-2_12-jdk8:
- docker:
- - image: cimg/openjdk:8.0
- resource_class: large
- steps:
- - install_common
- - checkout
- - attach_workspace:
- at: dependencies
- - run_build:
- spark: "2"
- scala: "2.12"
- jdk: "1.8"
-
- - store_artifacts:
- path: build/test-reports
- destination: test-reports
-
- - store_artifacts:
- path: build/reports
- destination: reports
-
- - store_test_results:
- path: build/test-reports
-
- int-spark2-2_12-jdk8:
- parallelism: 8
- docker:
- - image: cimg/openjdk:8.0
- resource_class: large
- steps:
- - setup_remote_docker
- - install_common
- - checkout
- - attach_workspace:
- at: dependencies
- - run_integration:
- spark: "2"
- scala: "2.12"
- jdk: "1.8"
-
- - store_artifacts:
- path: build/test-reports
- destination: test-reports
-
- - store_artifacts:
- path: build/reports
- destination: reports
-
- - store_artifacts:
- path: cassandra-analytics-integration-tests
- destination: int-tests-misc
-
- - store_test_results:
- path: build/test-reports
-
spark3-2_12-jdk11:
docker:
- image: cimg/openjdk:11.0
@@ -374,26 +248,13 @@ workflows:
version: 2
build-and-test:
jobs:
- - build-deps-jdk8
- build-deps-jdk11
- - spark2-2_11-jdk8:
- requires:
- - build-deps-jdk8
- - spark2-2_12-jdk8:
- requires:
- - build-deps-jdk8
- spark3-2_12-jdk11:
requires:
- build-deps-jdk11
- spark3-2_13-jdk11:
requires:
- build-deps-jdk11
- - int-spark2-2_11-jdk8:
- requires:
- - build-deps-jdk8
- - int-spark2-2_12-jdk8:
- requires:
- - build-deps-jdk8
- int-spark3-2_12-jdk11:
requires:
- build-deps-jdk11
diff --git a/CHANGES.txt b/CHANGES.txt
index 3e7e9b7..60b6c53 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
1.0.0
+ * Remove JDK8 support (CASSANALYTICS-17)
* Support CQL duration type (CASSANALYTICS-18)
* Add Schema Store interfaces for CDC (CASSANALYTICS-8)
* Add CassandraBridge helper APIs that can be used by external tooling
(CASSANALYTICS-4)
diff --git a/profiles/scala-2.11-spark-2-jdk-1.8.gradle
b/profiles/scala-2.11-spark-2-jdk-1.8.gradle
deleted file mode 100644
index 4f22ab9..0000000
--- a/profiles/scala-2.11-spark-2-jdk-1.8.gradle
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-ext {
- jacksonVersion="2.6.7"
- jacksonScalaModuleVersion="2.6.7.1"
- scalaMajorVersion="2.11"
- scalaVersion="2.11.12"
- sparkGroupId="org.apache.spark"
- sparkMajorVersion="2"
- sparkVersion="2.4.8"
- sidecarClientGroup="org.apache.cassandra.sidecar"
- sidecarClientName="vertx-client-all"
- sidecarVersion="1.0.0-jdk8-analytics"
-}
diff --git a/profiles/scala-2.12-spark-2-jdk-1.8.gradle
b/profiles/scala-2.12-spark-2-jdk-1.8.gradle
deleted file mode 100644
index 373309b..0000000
--- a/profiles/scala-2.12-spark-2-jdk-1.8.gradle
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-ext {
- jacksonVersion="2.6.7"
- jacksonScalaModuleVersion="2.6.7.1"
- scalaMajorVersion="2.12"
- scalaVersion="2.12.10"
- sparkGroupId="org.apache.spark"
- sparkMajorVersion="2"
- sparkVersion="2.4.8"
- sidecarClientGroup="org.apache.cassandra.sidecar"
- sidecarClientName="vertx-client-all"
- sidecarVersion="1.0.0-jdk8-analytics"
-}
diff --git a/scripts/build-sidecar.sh b/scripts/build-sidecar.sh
index 4c285ef..e1c63e4 100755
--- a/scripts/build-sidecar.sh
+++ b/scripts/build-sidecar.sh
@@ -31,11 +31,7 @@ java_ver_output=`"${JAVA:-java}" -version 2>&1`
jvmver=`echo "$java_ver_output" | grep '[openjdk|java] version' | awk -F'"'
'NR==1 {print $2}' | cut -d\- -f1`
JVM_VERSION=${jvmver%_*}
echo $JVM_VERSION
-if [ "${JVM_VERSION}" == "1.8.0" ]; then
- SIDECAR_BUILD_VERSION="1.0.0-jdk8-analytics"
-else
- SIDECAR_BUILD_VERSION="1.0.0-analytics"
-fi
+SIDECAR_BUILD_VERSION="1.0.0-analytics"
# Build from local sidecar repo. For instance,
# LOCAL_SIDECAR_REPO=/PATH/TO/cassandra-sidecar ./scripts/build-sidecar.sh
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
