From c4721346ed42ce9c15b9ddd532bdb0a17a4f8b4d Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Mon, 24 Jun 2024 14:37:28 +0300 Subject: [PATCH] Require Java 17 or Java 21 for building Bookkeeper --- .github/workflows/bk-ci.yml | 16 ++--- .github/workflows/bk-streamstorage-python.yml | 2 +- .github/workflows/codeql.yml | 2 +- .github/workflows/website-deploy.yaml | 2 +- .github/workflows/website-pr-validation.yml | 2 +- circe-checksum/pom.xml | 34 +++++++++ cpu-affinity/pom.xml | 34 +++++++++ pom.xml | 69 +++++++++++++------ 8 files changed, 127 insertions(+), 34 deletions(-) diff --git a/.github/workflows/bk-ci.yml b/.github/workflows/bk-ci.yml index 1f6ffd652ec..b4572e4b820 100644 --- a/.github/workflows/bk-ci.yml +++ b/.github/workflows/bk-ci.yml @@ -78,7 +78,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: 11 + java-version: 17 - name: Validate pull request if: steps.check_changes.outputs.docs_only != 'true' @@ -156,7 +156,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: 11 + java-version: 17 - name: Build run: | @@ -230,7 +230,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: 11 + java-version: 17 - name: Pick ubuntu mirror for the docker image build run: | @@ -315,7 +315,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: 8 + java-version: 17 - name: Pick ubuntu mirror for the docker image build run: | @@ -397,7 +397,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: 11 + java-version: 17 - name: mvn package run: mvn -B -nsu clean package -DskipTests @@ -429,7 +429,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: 11 + java-version: 17 - name: mvn package run: mvn -B -nsu clean package -DskipTests @@ -444,10 +444,6 @@ jobs: fail-fast: false matrix: include: - - step_name: Compatibility Check Java8 - jdk_version: 8 - - step_name: Compatibility Check Java11 - jdk_version: 11 - step_name: Compatibility Check Java17 jdk_version: 17 - step_name: Compatibility Check Java21 diff --git a/.github/workflows/bk-streamstorage-python.yml b/.github/workflows/bk-streamstorage-python.yml index 71dbe610452..d53b730b07c 100644 --- a/.github/workflows/bk-streamstorage-python.yml +++ b/.github/workflows/bk-streamstorage-python.yml @@ -70,7 +70,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: 11 + java-version: 17 - name: Build run: mvn -q -T 1C -B -nsu clean install -DskipTests -Dcheckstyle.skip -Dspotbugs.skip -Drat.skip -Dmaven.javadoc.skip - name: Pick ubuntu mirror for the docker image build diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index e838fccc36e..76443f9e740 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -83,7 +83,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: 11 + java-version: 17 - name: Validate pull request if: steps.check_changes.outputs.docs_only != 'true' diff --git a/.github/workflows/website-deploy.yaml b/.github/workflows/website-deploy.yaml index 868b1db0c7b..253ff26647a 100644 --- a/.github/workflows/website-deploy.yaml +++ b/.github/workflows/website-deploy.yaml @@ -44,7 +44,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: 11 + java-version: 17 - name: Setup NodeJS diff --git a/.github/workflows/website-pr-validation.yml b/.github/workflows/website-pr-validation.yml index 9d38cb59f28..5ffa667582c 100644 --- a/.github/workflows/website-pr-validation.yml +++ b/.github/workflows/website-pr-validation.yml @@ -41,7 +41,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: 11 + java-version: 17 - name: Setup NodeJS diff --git a/circe-checksum/pom.xml b/circe-checksum/pom.xml index 9f9ca5f0c6f..5997c02580a 100644 --- a/circe-checksum/pom.xml +++ b/circe-checksum/pom.xml @@ -63,6 +63,10 @@ org.apache.maven.plugins maven-compiler-plugin + + + 8 + com.github.maven-nar @@ -111,6 +115,36 @@ + + org.apache.maven.plugins + maven-enforcer-plugin + ${maven-enforcer-plugin.version} + + + enforce-bytecode-version + + enforce + + + + + 8 + + test + + + + + + + + + org.codehaus.mojo + extra-enforcer-rules + ${extra-enforcer-rules.version} + + + diff --git a/cpu-affinity/pom.xml b/cpu-affinity/pom.xml index 5ba9bc95de5..c77347376da 100644 --- a/cpu-affinity/pom.xml +++ b/cpu-affinity/pom.xml @@ -48,6 +48,10 @@ org.apache.maven.plugins maven-compiler-plugin + + + 8 + com.github.maven-nar @@ -87,6 +91,36 @@ + + org.apache.maven.plugins + maven-enforcer-plugin + ${maven-enforcer-plugin.version} + + + enforce-bytecode-version + + enforce + + + + + 8 + + test + + + + + + + + + org.codehaus.mojo + extra-enforcer-rules + ${extra-enforcer-rules.version} + + + diff --git a/pom.xml b/pom.xml index 1651bfcac71..83ee1c64c97 100644 --- a/pom.xml +++ b/pom.xml @@ -191,6 +191,8 @@ 3.3.1 3.12.1 3.2.5 + 3.5.0 + 1.8.0 9.2.0 3.10.1 1.4.1.Final @@ -883,6 +885,28 @@ + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + + 17 + UTF-8 + true + true + + + org.projectlombok + lombok + ${lombok.version} + + + + -parameters + + + org.apache.maven.plugins maven-checkstyle-plugin @@ -940,6 +964,31 @@ + + org.apache.maven.plugins + maven-enforcer-plugin + ${maven-enforcer-plugin.version} + + + enforce-maven + + enforce + + + + + [17,18),[21,22) + Java 17 or Java 21 is required to build Bookkeeper. + + + 3.6.1 + Maven 3.6.1 or newer is required to build Bookkeeper. + + + + + + com.github.spotbugs spotbugs-maven-plugin @@ -948,26 +997,6 @@ ${session.executionRootDirectory}/buildtools/src/main/resources/bookkeeper/findbugsExclude.xml - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - UTF-8 - true - true - - - org.projectlombok - lombok - ${lombok.version} - - - - -parameters - - - org.apache.maven.plugins maven-surefire-plugin