[DPE-7067] Kafka 4 (#30)

* update to use kafka 4 snap

* update base and user

* update license

* update tracked branches for CI

Author: zmraul

.github/workflows/publish.yaml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - 3-22.04
+      - 4-24.04
 
 jobs:
 

.github/workflows/trivy.yml

@@ -3,14 +3,15 @@ on:
   push:
     branches:
       - 3-22.04
+      - 4-24.04
   pull_request:
 jobs:
   build:
     uses: ./.github/workflows/build.yaml
   scan:
     name: Trivy scan and SBOM Generation
     needs: build
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v4

README.md

@@ -13,7 +13,7 @@ If you are using another version of Ubuntu or another operating system, the proc
 To avoid any issue with other operating systems you can simply build the image with [multipass](https://multipass.run/):
 ```bash
 sudo snap install multipass
-multipass launch 22.04 -n rock-dev
+multipass launch 24.04 -n rock-dev
 multipass shell rock-dev
 ``` 
 

licenses/LICENSE-kafka-binary

@@ -205,66 +205,54 @@
 This project bundles some components that are also licensed under the Apache
 License Version 2.0:
 
-audience-annotations-0.5.0
-commons-cli-1.4
-commons-lang3-3.8.1
-jackson-annotations-2.13.4
-jackson-core-2.13.4
-jackson-databind-2.13.4.2
-jackson-dataformat-csv-2.13.4
-jackson-dataformat-yaml-2.13.4
-jackson-datatype-jdk8-2.13.4
-jackson-datatype-jsr310-2.13.4
-jackson-jaxrs-base-2.13.4
-jackson-jaxrs-json-provider-2.13.4
-jackson-module-jaxb-annotations-2.13.4
-jackson-module-scala_2.13-2.13.4
-jackson-module-scala_2.12-2.13.4
-jakarta.validation-api-2.0.2
-javassist-3.27.0-GA
-jetty-client-9.4.48.v20220622
-jetty-continuation-9.4.48.v20220622
-jetty-http-9.4.48.v20220622
-jetty-io-9.4.48.v20220622
-jetty-security-9.4.48.v20220622
-jetty-server-9.4.48.v20220622
-jetty-servlet-9.4.48.v20220622
-jetty-servlets-9.4.48.v20220622
-jetty-util-9.4.48.v20220622
-jetty-util-ajax-9.4.48.v20220622
-jersey-common-2.34
-jersey-server-2.34
-jose4j-0.7.9
-lz4-java-1.8.0
-maven-artifact-3.8.4
-metrics-core-4.1.12.1
-metrics-core-2.2.0
-netty-buffer-4.1.78.Final
-netty-codec-4.1.78.Final
-netty-common-4.1.78.Final
-netty-handler-4.1.78.Final
-netty-resolver-4.1.78.Final
-netty-transport-4.1.78.Final
-netty-transport-classes-epoll-4.1.78.Final
-netty-transport-native-epoll-4.1.78.Final
-netty-transport-native-unix-common-4.1.78.Final
-plexus-utils-3.3.0
-reload4j-1.2.19
-rocksdbjni-7.1.2
-scala-collection-compat_2.13-2.6.0
-scala-library-2.13.10
-scala-logging_2.13-3.9.4
-scala-reflect-2.13.10
-scala-java8-compat_2.13-1.0.2
-snakeyaml-1.30
-snappy-java-1.1.8.4
-swagger-annotations-2.2.0
-swagger-core-2.2.0
-swagger-integration-2.2.0
-swagger-jaxrs2-2.2.0
-swagger-models-2.2.0
-zookeeper-3.6.4
-zookeeper-jute-3.6.4
+- caffeine-3.1.1
+- commons-beanutils-1.9.4
+- commons-collections-3.2.2
+- commons-digester-2.1
+- commons-lang3-3.12.0
+- commons-logging-1.3.2
+- commons-validator-1.9.0
+- error_prone_annotations-2.14.0
+- jackson-annotations-2.16.2
+- jackson-core-2.16.2
+- jackson-databind-2.16.2
+- jackson-dataformat-csv-2.16.2
+- jackson-dataformat-yaml-2.16.2
+- jackson-datatype-jdk8-2.16.2
+- jackson-jakarta-rs-base-2.16.2
+- jackson-jakarta-rs-json-provider-2.16.2
+- jackson-module-blackbird-2.16.2
+- jackson-module-jakarta-xmlbind-annotations-2.16.2
+- jakarta.inject-api-2.0.1
+- jakarta.validation-api-3.0.2
+- javassist-3.29.2-GA
+- jetty-alpn-client-12.0.15
+- jetty-client-12.0.15
+- jetty-ee10-servlet-12.0.15
+- jetty-ee10-servlets-12.0.15
+- jetty-http-12.0.15
+- jetty-io-12.0.15
+- jetty-security-12.0.15
+- jetty-server-12.0.15
+- jetty-session-12.0.15
+- jetty-util-12.0.15
+- jose4j-0.9.4
+- log4j-api-2.24.3
+- log4j-core-2.24.3
+- log4j-slf4j-impl-2.24.3
+- log4j-1.2-api-2.24.3
+- lz4-java-1.8.0
+- maven-artifact-3.9.6
+- metrics-core-2.2.0
+- opentelemetry-proto-1.0.0-alpha
+- plexus-utils-3.5.1
+- rocksdbjni-9.7.3
+- scala-library-2.13.15
+- scala-logging_2.13-3.9.5
+- scala-reflect-2.13.15
+- snappy-java-1.1.10.5
+- snakeyaml-2.2
+- swagger-annotations-2.2.25
 
 ===============================================================================
 This product bundles various third-party components under other open source
@@ -275,59 +263,60 @@ See licenses/ for text of these licenses.
 Eclipse Distribution License - v 1.0
 see: licenses/eclipse-distribution-license-1.0
 
-jakarta.activation-api-1.2.2
-jakarta.xml.bind-api-2.3.3
+- jakarta.activation-api-2.1.0
+- jakarta.xml.bind-api-3.0.1
 
 ---------------------------------------
 Eclipse Public License - v 2.0
 see: licenses/eclipse-public-license-2.0
 
-jakarta.annotation-api-1.3.5
-jakarta.ws.rs-api-2.1.6
-javax.annotation-api-1.3.2
-javax.ws.rs-api-2.1.1
-hk2-api-2.6.1
-hk2-locator-2.6.1
-hk2-utils-2.6.1
-osgi-resource-locator-1.0.3
-aopalliance-repackaged-2.6.1
-jakarta.inject-2.6.1
-jersey-container-servlet-2.34
-jersey-container-servlet-core-2.34
-jersey-client-2.34
-jersey-hk2-2.34
-jersey-media-jaxb-2.31
+- jakarta.annotation-api-2.1.1
+- jakarta.ws.rs-api-3.1.0
+- hk2-api-3.0.6
+- hk2-locator-3.0.6
+- hk2-utils-3.0.6
+- osgi-resource-locator-1.0.3
+- aopalliance-repackaged-3.0.6
+- jersey-client-3.1.9
+- jersey-common-3.1.9
+- jersey-container-servlet-3.1.9
+- jersey-container-servlet-core-3.1.9
+- jersey-hk2-3.1.9
+- jersey-server-3.1.9
 
 ---------------------------------------
 CDDL 1.1 + GPLv2 with classpath exception
 see: licenses/CDDL+GPL-1.1
 
-javax.servlet-api-3.1.0
-jaxb-api-2.3.0
-activation-1.1.1
+- jakarta.servlet-api-6.0.0
+- javax.activation-api-1.2.0
+- javax.annotation-api-1.3.2
+- jaxb-api-2.3.1
+- activation-1.1.1
 
 ---------------------------------------
 MIT License
 
-argparse4j-0.7.0, see: licenses/argparse-MIT
-jopt-simple-5.0.4, see: licenses/jopt-simple-MIT
-slf4j-api-1.7.36, see: licenses/slf4j-MIT
-slf4j-reload4j-1.7.36, see: licenses/slf4j-MIT
-classgraph-4.8.138, see: license/classgraph-MIT
+- argparse4j-0.7.0, see: licenses/argparse-MIT
+- classgraph-4.8.173, see: licenses/classgraph-MIT
+- jopt-simple-5.0.4, see: licenses/jopt-simple-MIT
+- slf4j-api-1.7.36, see: licenses/slf4j-MIT
+- pcollections-4.0.1, see: licenses/pcollections-MIT
 
 ---------------------------------------
 BSD 2-Clause
 
-zstd-jni-1.5.2-1 see: licenses/zstd-jni-BSD-2-clause
+- zstd-jni-1.5.6-6, see: licenses/zstd-jni-BSD-2-clause
+- HdrHistogram-2.2.2, see: licenses/hdrHistogram-BSD-2-clause
 
 ---------------------------------------
 BSD 3-Clause
 
-jline-3.21.0, see: licenses/jline-BSD-3-clause
-paranamer-2.8, see: licenses/paranamer-BSD-3-clause
+- jline-3.25.1, see: licenses/jline-BSD-3-clause
+- protobuf-java-3.25.5, see: licenses/protobuf-java-BSD-3-clause
+- jakarta.activation-2.0.1, see: licenses/jakarta-BSD-3-clause
 
 ---------------------------------------
-Do What The F*ck You Want To Public License
-see: licenses/DWTFYWTPL
+Go License
 
-reflections-0.9.12
+- re2j-1.7, see: licenses/re2j-GO

rockcraft.yaml

@@ -2,8 +2,8 @@
 # See LICENSE file for licensing details.
 ---
 name: charmed-kafka  # the name of your ROCK
-base: ubuntu@22.04  # the base environment for this ROCK
-version: '3.9.0'  # just for humans. Semantic versioning is recommended
+base: ubuntu@24.04  # the base environment for this ROCK
+version: '4.0.0'  # just for humans. Semantic versioning is recommended
 summary: Charmed Kafka ROCK OCI  # 79 char long summary
 description: |
   This is an OCI image that bundles Apache Kafka together with other tools
@@ -25,7 +25,7 @@ services:
     user: kafka
     group: kafka
     environment:
-      JAVA_HOME: /usr/lib/jvm/java-18-openjdk-amd64
+      JAVA_HOME: /usr/lib/jvm/java-21-openjdk-amd64
       KAFKA_OPTS: "-javaagent:/opt/kafka/libs/jmx_prometheus_javaagent.jar=\n
         9101:/etc/kafka/jmx_prometheus.yaml\n
         -Djava.security.auth.login.config=\n
@@ -35,17 +35,17 @@ parts:
   kafka:
     plugin: nil
     stage-packages:
-      - openjdk-18-jre-headless
+      - openjdk-21-jre-headless
       - libpsl5
       - curl
     build-environment:
-      - JAVA_HOME: /usr/lib/jvm/java-18-openjdk-amd64
+      - JAVA_HOME: /usr/lib/jvm/java-21-openjdk-amd64
     stage-snaps:
-      - charmed-kafka/3/edge
+      - charmed-kafka/4/edge
     override-build: |
-      ln -s /usr/lib/jvm/java-18-openjdk-amd64/bin/java \
+      ln -s /usr/lib/jvm/java-21-openjdk-amd64/bin/java \
         $CRAFT_PART_INSTALL/usr/bin/java
-      ln -s /usr/lib/jvm/java-18-openjdk-amd64/bin/keytool \
+      ln -s /usr/lib/jvm/java-21-openjdk-amd64/bin/keytool \
         $CRAFT_PART_INSTALL/usr/bin/keytool
 
       # making core dirs
@@ -64,12 +64,13 @@ parts:
     after: [kafka]
     overlay-script: |
       # Create a user in the $CRAFT_OVERLAY chroot
-      groupadd -R $CRAFT_OVERLAY -g 1000 kafka
-      useradd -R $CRAFT_OVERLAY -M -r -g kafka -u 1000 kafka
+      # This user is the same as the one in the snap
+      groupadd -R $CRAFT_OVERLAY -g 584792 kafka
+      useradd -R $CRAFT_OVERLAY -M -r -g kafka -u 584792 kafka
     override-prime: |
       craftctl default
       # Give permission ot the required folders
-      install -d -o 1000 -g 1000 -m 770 \
+      install -d -o 584792 -g 584792 -m 770 \
         opt/kafka \
         var/lib/kafka \
         var/log/kafka \