Skip to content

Commit fbc6de0

Browse files
JvD-Ericssondanielgospodinow
authored andcommitted
Remove support for Java 11 (linkedin#2308)
1. Why: Jetty 12 requires a minimum of Java 17, so Java 11 must be dropped to facilitate this upgrade. The current version of Jetty in cruise-control is 9.4.56.v20240826. This version contains two CVEs CVE-2024-13009 - patched in 9.4.57.v20241219 CVE-2024-6763 - patched in 12.0.12 So, Jetty 12 is need to patch CVE-2024-6763. 2. What: Remove support support for Java 11 Raise minimum JDK to 17 in builds, docs, and workflows - [x] refactor Signed-off-by: JvD_Ericsson <jeff.van.dam@est.tech>
1 parent 7d71bd7 commit fbc6de0

5 files changed

Lines changed: 12 additions & 12 deletions

File tree

.circleci/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
_JAVA_OPTIONS: "-Xms512m -Xmx1g"
88
working_directory: ~/workspace
99
docker:
10-
- image: cimg/openjdk:11.0
10+
- image: cimg/openjdk:17.0
1111
steps:
1212
- checkout
1313
- restore_cache:
@@ -40,7 +40,7 @@ jobs:
4040
_JAVA_OPTIONS: "-Xms512m -Xmx1g"
4141
working_directory: ~/workspace
4242
docker:
43-
- image: cimg/openjdk:11.0
43+
- image: cimg/openjdk:17.0
4444
steps:
4545
- checkout
4646
- restore_cache:
@@ -63,7 +63,7 @@ jobs:
6363
publish:
6464
working_directory: ~/workspace
6565
docker:
66-
- image: cimg/openjdk:11.0
66+
- image: cimg/openjdk:17.0
6767
steps:
6868
- checkout
6969
- restore_cache:

.github/workflows/artifactory.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
fetch-depth: 0 # so gradle doesn't fail traversing the history
1717
- uses: actions/setup-java@v4
1818
with:
19-
java-version: 11
19+
java-version: 17
2020
distribution: microsoft
2121
cache: gradle
2222
- uses: gradle/actions/setup-gradle@v4 # v4.0.0

.github/workflows/ci.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
strategy:
1818
fail-fast: false
1919
matrix:
20-
java-ver: [11, 17]
20+
java-ver: [17]
2121
java-dist: ['microsoft', 'temurin']
2222
steps:
2323
- uses: actions/checkout@v4
@@ -39,7 +39,7 @@ jobs:
3939
strategy:
4040
fail-fast: false
4141
matrix:
42-
java-ver: [11, 17]
42+
java-ver: [17]
4343
java-dist: ['microsoft', 'temurin']
4444
steps:
4545
- uses: actions/checkout@v4
@@ -60,7 +60,7 @@ jobs:
6060
strategy:
6161
fail-fast: false
6262
matrix:
63-
java-ver: [11]
63+
java-ver: [17]
6464
java-dist: ['temurin']
6565
hw_platform: ['s390x']
6666
runs-on: ubuntu-latest
@@ -78,4 +78,4 @@ jobs:
7878
--name qemu-cross-${{ matrix.hw_platform }} \
7979
--mount type=bind,source=${PWD},target=/workspace \
8080
--workdir /workspace \
81-
${{matrix.hw_platform}}/eclipse-temurin:11-jdk /bin/sh -c "uname -a; ./gradlew --no-daemon -PmaxParallelForks=1 build"
81+
${{matrix.hw_platform}}/eclipse-temurin:${{matrix.java-ver}}-jdk /bin/sh -c "uname -a; ./gradlew --no-daemon -PmaxParallelForks=1 build"

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Cruise Control for Apache Kafka
6060
* The `kafka_2_0_to_2_3` and `kafka_0_11_and_1_0` branches compile with `Scala 2.11`.
6161
* The branch `migrate_to_kafka_2_4` compiles with `Scala 2.12`.
6262
* The branch `migrate_to_kafka_2_5` compile with `Scala 2.13`.
63-
* This project requires Java 11, also compatible with Java 17.
63+
* This project requires Java 17.
6464

6565
#### Known Compatibility Issues ####
6666
* Support for Apache Kafka `2.0`, `2.1`, `2.2`, and `2.3` requires [KAFKA-8875](https://issues.apache.org/jira/browse/KAFKA-8875) hotfix.
@@ -77,7 +77,7 @@ Cruise Control for Apache Kafka
7777
&& git tag -a 0.1.10 -m "Init local version."`
7878
1. This step is required if `CruiseControlMetricsReporter` is used for metrics collection (i.e. the default for Cruise
7979
Control). The metrics reporter periodically samples the Kafka raw metrics on the broker and sends them to a Kafka topic.
80-
* `./gradlew jar` (Note: This project requires Java 11 or 17)
80+
* `./gradlew jar` (Note: This project requires Java 17)
8181
* Copy `./cruise-control-metrics-reporter/build/libs/cruise-control-metrics-reporter-A.B.C.jar` (Where `A.B.C` is
8282
the version of the Cruise Control) to your Kafka server dependency jar folder. For Apache Kafka, the folder would
8383
be `core/build/dependant-libs-SCALA_VERSION/` (for a Kafka source checkout) or `libs/` (for a Kafka release download).

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ subprojects {
9595
apply plugin: "com.github.spotbugs"
9696
apply plugin: 'jacoco'
9797

98-
// This project requires Java 11
99-
sourceCompatibility = JavaVersion.VERSION_11
98+
// This project requires Java 17
99+
sourceCompatibility = JavaVersion.VERSION_17
100100

101101
task sourcesJar(type: Jar, dependsOn: classes) {
102102
archiveClassifier.set("sources")

0 commit comments

Comments
 (0)