Upgrade zu to java 21

Author: amuraru

.github/workflows/codeql.yml

@@ -0,0 +1,87 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '34 23 * * 4'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-22.04
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'go', 'java' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
+        # Learn more:
+        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v5
+
+    # Set up JDK for Java analysis
+    - name: Set up JDK 21
+      if: matrix.language == 'java'
+      uses: actions/setup-java@v4
+      with:
+        java-version: '21'
+        distribution: 'temurin'
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v3
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Build projects for CodeQL analysis
+    - name: Build projects
+      run: |
+        if [ "${{ matrix.language }}" == "go" ]; then
+          # Build main module
+          go build ./...
+          
+          # Build api module
+          cd api
+          go build ./...
+          cd ..
+          
+          # Build main binary
+          go build -o bin/manager main.go
+        elif [ "${{ matrix.language }}" == "java" ]; then
+          # Build Java/Kotlin project in docker/zu/
+          cd docker/zu
+          ./gradlew build
+        fi
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v3

docker/Dockerfile

@@ -8,12 +8,12 @@
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
 
-FROM gradle:jdk17
+FROM gradle:jdk21
 
 RUN mkdir /zu
 COPY zu /zu
 WORKDIR /zu
-RUN ./gradlew shadowJar
+RUN ./gradlew shadowJar --no-daemon
 
 # use forked base zookeeper 3.8.4 docker image
 # that runs on openjdk-21

docker/zu/build.gradle.kts

@@ -2,28 +2,33 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    kotlin("jvm") version "1.5.31"
-    id("com.github.johnrengelman.shadow") version "7.1.0"
+    kotlin("jvm") version "1.9.21"
+    id("com.github.johnrengelman.shadow") version "8.1.1"
 }
 
 repositories {
     mavenCentral()
 }
 
+java {
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
+}
+
 dependencies {
     implementation(kotlin("stdlib"))
     implementation("org.apache.zookeeper:zookeeper:3.9.3")
 }
 
 tasks.withType<ShadowJar>() {
-    classifier = null
+    archiveClassifier.set("")
     manifest {
         attributes["Main-Class"] = "io.pravega.zookeeper.MainKt"
     }
 }
 
 tasks.withType<KotlinCompile> {
   kotlinOptions {
-    jvmTarget = "11"
+    jvmTarget = "21"
   }
 }

docker/zu/gradle.properties

@@ -0,0 +1,5 @@
+# Gradle daemon configuration for Docker builds
+org.gradle.daemon=false
+org.gradle.parallel=true
+org.gradle.configureondemand=true
+org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m

docker/zu/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists