Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
_JAVA_OPTIONS: "-Xms512m -Xmx1g"
working_directory: ~/workspace
docker:
- image: cimg/openjdk:11.0
- image: cimg/openjdk:17.0
steps:
- checkout
- restore_cache:
Expand Down Expand Up @@ -40,7 +40,7 @@ jobs:
_JAVA_OPTIONS: "-Xms512m -Xmx1g"
working_directory: ~/workspace
docker:
- image: cimg/openjdk:11.0
- image: cimg/openjdk:17.0
steps:
- checkout
- restore_cache:
Expand All @@ -63,7 +63,7 @@ jobs:
publish:
working_directory: ~/workspace
docker:
- image: cimg/openjdk:11.0
- image: cimg/openjdk:17.0
steps:
- checkout
- restore_cache:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/artifactory.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
fetch-depth: 0 # so gradle doesn't fail traversing the history
- uses: actions/setup-java@v4
with:
java-version: 11
java-version: 17
distribution: microsoft
cache: gradle
- uses: gradle/actions/setup-gradle@v4 # v4.0.0
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
strategy:
fail-fast: false
matrix:
java-ver: [11, 17]
java-ver: [17]
java-dist: ['microsoft', 'temurin']
steps:
- uses: actions/checkout@v4
Expand All @@ -39,7 +39,7 @@ jobs:
strategy:
fail-fast: false
matrix:
java-ver: [11, 17]
java-ver: [17]
java-dist: ['microsoft', 'temurin']
steps:
- uses: actions/checkout@v4
Expand All @@ -60,7 +60,7 @@ jobs:
strategy:
fail-fast: false
matrix:
java-ver: [11]
java-ver: [17]
java-dist: ['temurin']
hw_platform: ['s390x']
runs-on: ubuntu-latest
Expand All @@ -78,4 +78,4 @@ jobs:
--name qemu-cross-${{ matrix.hw_platform }} \
--mount type=bind,source=${PWD},target=/workspace \
--workdir /workspace \
${{matrix.hw_platform}}/eclipse-temurin:11-jdk /bin/sh -c "uname -a; ./gradlew --no-daemon -PmaxParallelForks=1 build"
${{matrix.hw_platform}}/eclipse-temurin:${{matrix.java-ver}}-jdk /bin/sh -c "uname -a; ./gradlew --no-daemon -PmaxParallelForks=1 build"
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ Cruise Control for Apache Kafka
* The `kafka_2_0_to_2_3` and `kafka_0_11_and_1_0` branches compile with `Scala 2.11`.
* The branch `migrate_to_kafka_2_4` compiles with `Scala 2.12`.
* The branch `migrate_to_kafka_2_5` compile with `Scala 2.13`.
* This project requires Java 11, also compatible with Java 17.
* This project requires Java 17.

#### Known Compatibility Issues ####
* 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.
Expand All @@ -77,7 +77,7 @@ Cruise Control for Apache Kafka
&& git tag -a 0.1.10 -m "Init local version."`
1. This step is required if `CruiseControlMetricsReporter` is used for metrics collection (i.e. the default for Cruise
Control). The metrics reporter periodically samples the Kafka raw metrics on the broker and sends them to a Kafka topic.
* `./gradlew jar` (Note: This project requires Java 11 or 17)
* `./gradlew jar` (Note: This project requires Java 17)
* Copy `./cruise-control-metrics-reporter/build/libs/cruise-control-metrics-reporter-A.B.C.jar` (Where `A.B.C` is
the version of the Cruise Control) to your Kafka server dependency jar folder. For Apache Kafka, the folder would
be `core/build/dependant-libs-SCALA_VERSION/` (for a Kafka source checkout) or `libs/` (for a Kafka release download).
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ subprojects {
apply plugin: "com.github.spotbugs"
apply plugin: 'jacoco'

// This project requires Java 11
sourceCompatibility = JavaVersion.VERSION_11
// This project requires Java 17
sourceCompatibility = JavaVersion.VERSION_17

task sourcesJar(type: Jar, dependsOn: classes) {
archiveClassifier.set("sources")
Expand Down
Loading