diff --git a/.gitignore b/.gitignore
index 872c981..cdd52b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -129,3 +129,6 @@ dmypy.json
 .pyre/
 
 .idea
+.gradle
+bin
+obj
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index fa6db07..6abe22a 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -3,13 +3,14 @@
 
 ## Maintainers
 
-| Maintainer           | Email                                    | GitHub ID                                                   | Affiliation                                                                                       | Joined     |
-|----------------------|------------------------------------------|-------------------------------------------------------------| ------------------------------------------------------------------------------------------------- |------------| 
-| Jörn Schimmelpfeng   | <joern.schimmelpfeng@mercedes-benz.com>  | [JoernSchimmelpfeng](https://github.com/joernschimmelpfeng) | Mercedes-Benz Connectivity Services GmbH, [imprint](https://connectivity.mercedes-benz.com/imprint) | 04/01/2021 | 
-| Javier Moreno Molina | <javier.moreno_molina@mercedes-benz.com> | [morelina](https://github.com/morelina)                     | Mercedes-Benz Connectivity Services GmbH, [imprint]( https://connectivity.mercedes-benz.com/imprint) | 04/01/2021 | 
-| David Piendl         | <david.piendl@mercedes-benz.com>         | [davidpiendl](https://github.com/davidpiendl)               | Mercedes-Benz Connectivity Services GmbH, [imprint]( https://connectivity.mercedes-benz.com/imprint) | 07/05/2022 |
-| Alexander Schapelt   | <alexander.schapelt@mercedes-benz.com>   | [SCHAPEA]                                                   | Mercedes-Benz Connectivity Services GmbH, [imprint]( https://connectivity.mercedes-benz.com/imprint) | 07/05/2022 |   
-| Akhilesh Sreelayam   | <akhilesh.sreelayam@mercedes-benz.com>   | [AkhileshSreelayam](https://github.com/akhileshsreelayam)   | Mercedes-Benz Connectivity Services GmbH, [imprint]( https://connectivity.mercedes-benz.com/imprint) | 19/06/2024 |
+| Maintainer            | Email                                    | GitHub ID                                                   | Affiliation                                                                                          | Joined     |
+|-----------------------|------------------------------------------|-------------------------------------------------------------| ---------------------------------------------------------------------------------------------------- |------------| 
+| Jörn Schimmelpfeng    | <joern.schimmelpfeng@mercedes-benz.com>  | [JoernSchimmelpfeng](https://github.com/joernschimmelpfeng) | Mercedes-Benz Connectivity Services GmbH, [imprint](https://connectivity.mercedes-benz.com/imprint)  | 04/01/2021 | 
+| Javier Moreno Molina  | <javier.moreno_molina@mercedes-benz.com> | [morelina](https://github.com/morelina)                     | Mercedes-Benz Connectivity Services GmbH, [imprint]( https://connectivity.mercedes-benz.com/imprint) | 04/01/2021 | 
+| David Piendl          | <david.piendl@mercedes-benz.com>         | [davidpiendl](https://github.com/davidpiendl)               | Mercedes-Benz Connectivity Services GmbH, [imprint]( https://connectivity.mercedes-benz.com/imprint) | 07/05/2022 |
+| Alexander Schapelt    | <alexander.schapelt@mercedes-benz.com>   | [SCHAPEA]                                                   | Mercedes-Benz Connectivity Services GmbH, [imprint]( https://connectivity.mercedes-benz.com/imprint) | 07/05/2022 |
+| Akhilesh Sreelayam    | <akhilesh.sreelayam@mercedes-benz.com>   | [AkhileshSreelayam](https://github.com/akhileshsreelayam)   | Mercedes-Benz Connectivity Services GmbH, [imprint]( https://connectivity.mercedes-benz.com/imprint) | 19/06/2024 |
+| Alexis Sarda-Espinosa | <alexis_marino.sarda_espinosa@mercedes-benz.com>   | [asardaes](https://github.com/asardaes)           | Mercedes-Benz Connectivity Services GmbH, [imprint]( https://connectivity.mercedes-benz.com/imprint) | 17/09/2025 |
 
 <!--
 ## Emeritus Maintainers
diff --git a/kafka-sample/c#/KafkaOauthDemo.cs b/kafka-sample/c#/KafkaOauthDemo.cs
index 317a5eb..245daa8 100644
--- a/kafka-sample/c#/KafkaOauthDemo.cs
+++ b/kafka-sample/c#/KafkaOauthDemo.cs
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 Mercedes-Benz Connectivity Services GmbH
+// Copyright 2021-2025 Mercedes-Benz Connectivity Services GmbH
 //
 // SPDX-License-Identifier: MIT
 
@@ -22,19 +22,14 @@ static void Main()
             var bootstrapUrl = "BOOTSTRAP_URL";                   // use the correct broker url for your region
             var oauthTokenApiUrl = "OAUTH_TOKEN_API_URL";         // use the correct token API url for your region
 
-            var securityProtocol = SecurityProtocol.SaslSsl;
-            var saslMechanism = SaslMechanism.OAuthBearer;
-            var sslEndpointIdentificationAlgorithm = SslEndpointIdentificationAlgorithm.None;
-            var autoOffsetReset = AutoOffsetReset.Earliest;
-
             var config = new ConsumerConfig
             {
                 BootstrapServers = bootstrapUrl,
                 GroupId = consumerGroup,
 
-                SslEndpointIdentificationAlgorithm = sslEndpointIdentificationAlgorithm,
-                SecurityProtocol = securityProtocol,
-                SaslMechanism = saslMechanism,
+                SslEndpointIdentificationAlgorithm = SslEndpointIdentificationAlgorithm.None,
+                SecurityProtocol = SecurityProtocol.SaslSsl,
+                SaslMechanism = SaslMechanism.OAuthBearer,
 
                 SaslOauthbearerMethod = SaslOauthbearerMethod.Oidc,
                 SaslOauthbearerClientId = clientId,
@@ -43,7 +38,7 @@ static void Main()
                 SaslOauthbearerTokenEndpointUrl = oauthTokenApiUrl,
 
                 Debug = "consumer,security",
-                AutoOffsetReset = autoOffsetReset,
+                AutoOffsetReset = AutoOffsetReset.Latest,
             };
 
 
diff --git a/kafka-sample/c#/README.md b/kafka-sample/c#/README.md
index 1b0d0af..77393bb 100644
--- a/kafka-sample/c#/README.md
+++ b/kafka-sample/c#/README.md
@@ -9,7 +9,7 @@ This is only a sample without support and liability to its correctness!
 Prerequisite
 ------------
 
-The code is based on .Net 8.0 and the Confluent.Kafka client (2.1.1).
+The code is based on .Net 8.0 and the Confluent.Kafka client (2.11.1).
 
 Package Links:
 
diff --git a/kafka-sample/c#/c#.csproj b/kafka-sample/c#/c#.csproj
index cec1bf6..2d17c74 100644
--- a/kafka-sample/c#/c#.csproj
+++ b/kafka-sample/c#/c#.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Confluent.Kafka" Version="2.1.1" />
+    <PackageReference Include="Confluent.Kafka" Version="2.11.1" />
   </ItemGroup>
 
 </Project>
diff --git a/kafka-sample/golang/README.md b/kafka-sample/golang/README.md
index ec9e9f2..516a71a 100644
--- a/kafka-sample/golang/README.md
+++ b/kafka-sample/golang/README.md
@@ -9,7 +9,7 @@ This is only a sample without support and liability to its correctness!
 Prerequisite
 ------------
 
-The code is based on Go 1.20 and the confluent-kafka-go v2.1.1.
+The code is based on Go 1.25 and the confluent-kafka-go v2.11.1.
 
 Links:
 
diff --git a/kafka-sample/golang/go.mod b/kafka-sample/golang/go.mod
index 0b84393..093fb05 100644
--- a/kafka-sample/golang/go.mod
+++ b/kafka-sample/golang/go.mod
@@ -1,15 +1,15 @@
 //
-// Copyright 2022 Mercedes-Benz Connectivity Services GmbH
+// Copyright 2022-2025 Mercedes-Benz Connectivity Services GmbH
 //
 // SPDX-License-Identifier: MIT
 
 module golang
 
-go 1.20
+go 1.25
 
 require (
-	github.com/confluentinc/confluent-kafka-go/v2 v2.1.1
+	github.com/confluentinc/confluent-kafka-go/v2 v2.11.1
 	github.com/sirupsen/logrus v1.9.3
 )
 
-require golang.org/x/sys v0.9.0 // indirect
+require golang.org/x/sys v0.36.0 // indirect
diff --git a/kafka-sample/golang/go.sum b/kafka-sample/golang/go.sum
index 1704dfd..571ce78 100644
--- a/kafka-sample/golang/go.sum
+++ b/kafka-sample/golang/go.sum
@@ -727,6 +727,8 @@ github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoC
 github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI=
 github.com/confluentinc/confluent-kafka-go/v2 v2.1.1 h1:qwZtgyGS4OjvebR4TkZPxHAQRN/IbdaxpCQyhDpxeaE=
 github.com/confluentinc/confluent-kafka-go/v2 v2.1.1/go.mod h1:mfGzHbxQ6LRc25qqaLotDHkhdYmeZQ3ctcKNlPUjDW4=
+github.com/confluentinc/confluent-kafka-go/v2 v2.11.1 h1:qGCQznyp2BxyBNyOE+M7O1YS2tI1/Y60O0jQP452zA4=
+github.com/confluentinc/confluent-kafka-go/v2 v2.11.1/go.mod h1:hScqtFIGUI1wqHIgM3mjoqEou4VweGGGX7dMpcUKves=
 github.com/containerd/aufs v0.0.0-20200908144142-dab0cbea06f4/go.mod h1:nukgQABAEopAHvB6j7cnP5zJ+/3aVcE7hCYqvIwAHyE=
 github.com/containerd/aufs v0.0.0-20201003224125-76a6863f2989/go.mod h1:AkGGQs9NM2vtYHaUen+NljV0/baGCAPELGm2q9ZXpWU=
 github.com/containerd/aufs v0.0.0-20210316121734-20793ff83c97/go.mod h1:kL5kd6KM5TzQjR79jljyi4olc1Vrx6XBlcyj3gNv2PU=
@@ -1916,6 +1918,8 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s=
 golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k=
+golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
diff --git a/kafka-sample/golang/kafka-oauth-consumer.go b/kafka-sample/golang/kafka-oauth-consumer.go
index d17c92b..41bad9b 100644
--- a/kafka-sample/golang/kafka-oauth-consumer.go
+++ b/kafka-sample/golang/kafka-oauth-consumer.go
@@ -1,5 +1,5 @@
 //
-// Copyright 2022 Mercedes-Benz Connectivity Services GmbH
+// Copyright 2022-2025 Mercedes-Benz Connectivity Services GmbH
 //
 // SPDX-License-Identifier: MIT
 
diff --git a/kafka-sample/java/README.md b/kafka-sample/java/README.md
index 26b5f09..437a605 100644
--- a/kafka-sample/java/README.md
+++ b/kafka-sample/java/README.md
@@ -9,10 +9,11 @@ This is only a sample without support and liability to its correctness!
 Prerequisite
 ------------
 
-The code is based on java version 17 and gradle. Required dependencies:
+The code is based on java version 21 and gradle. Required dependencies:
 
-* [com.github.johnrengelman.shadow](https://github.com/johnrengelman/shadow)
+* [gradle shadow plugin](https://github.com/GradleUp/shadow)
 * [apache kafka-clients](https://kafka.apache.org/documentation/)
+* [jose4j](https://bitbucket.org/b_c/jose4j/wiki/Home) (see also [KIP-1139](https://cwiki.apache.org/confluence/display/KAFKA/KIP-1139%3A+Add+support+for+OAuth+jwt-bearer+grant+type))
 * [jackson-databind](https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind) (runtimeOnly)
 * [log4j2](https://logging.apache.org/log4j/2.x/)
 * [apache commons-cli](https://commons.apache.org/proper/commons-cli/index.html)
@@ -34,23 +35,25 @@ How to use
 To use the sample please change at least the following configurations of the [consumer.properties file](consumer.properties).
 
 ```properties
-# if you are an MBCon customer, use the clientId and clientSecret you have received along with the correct scope for your region:
-sasl.jaas.config=org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginModule required \
-clientId="YOUR_CLIENT_ID" \
-clientSecret="YOUR_CLIENT_SECRET" \
-scope="SCOPE";
-# use the correct token API url for your region:
-sasl.oauthbearer.token.endpoint.url=OAUTH_TOKEN_API_URL
-# if you are an MBCon customer, use the received client name as the prefix. eg: '<client name>.GROUP_ID_POSTFIX_OF_YOUR_CHOICE':
-group.id=CONSUMER_GROUP
 # use the correct bootstrap url for your region
 bootstrap.servers=BOOTSTRAP_URL
+# if you are an MBCon customer, use the received client name as the prefix. eg: '<client name>.GROUP_ID_POSTFIX_OF_YOUR_CHOICE':
+group.id=CONSUMER_GROUP
+# use the correct token API url for your region:
+sasl.oauthbearer.token.endpoint.url=OAUTH_TOKEN_API_URL
+
+# if you are an MBCon customer, use the clientId and clientSecret you have received along with the correct scope for your region:
+sasl.oauthbearer.client.credentials.client.id=YOUR_CLIENT_ID
+sasl.oauthbearer.client.credentials.client.secret=YOUR_CLIENT_SECRET
+sasl.oauthbearer.scope=SCOPE
 ```
 
 After preparation, you can start the demo with
 
 ```bash
-java -jar build/libs/java-0.1.0-all.jar -t <YOUR_TOPIC_NAME>
+java '-Dorg.apache.kafka.sasl.oauthbearer.allowed.urls=<OAUTH_TOKEN_API_URL>' -jar build/libs/java-0.1.0-all.jar -t <YOUR_TOPIC_NAME>
 ```
 
-Copyright 2024 Mercedes-Benz Connectivity Services GmbH
+And note that, for the Kafka client version 4 and newer, the token URL must be explicitly repeated in the shown property.
+
+Copyright 2024-2025 Mercedes-Benz Connectivity Services GmbH
diff --git a/kafka-sample/java/build.gradle b/kafka-sample/java/build.gradle
index 6833297..74bc6bd 100644
--- a/kafka-sample/java/build.gradle
+++ b/kafka-sample/java/build.gradle
@@ -1,16 +1,16 @@
 plugins {
     id 'java'
     id 'application'
-    id 'com.github.johnrengelman.shadow' version "$shadow_plugin_version"
+    id 'com.gradleup.shadow' version "$shadow_plugin_version"
 }
 
 group = 'com.mbcs'
 version = '0.1.0'
 
-java {
-    toolchain {
-        languageVersion = JavaLanguageVersion.of(java_version)
-    }
+tasks.withType(JavaCompile).configureEach {
+    options.encoding = "UTF-8"
+    options.deprecation = true
+    options.release.set(java_version.toInteger())
 }
 
 repositories {
@@ -24,6 +24,7 @@ application {
 dependencies {
     // dependencies for kafka:
     implementation "org.apache.kafka:kafka-clients:$kafka_clients_version"
+    implementation "org.bitbucket.b_c:jose4j:$jose4j_version"
     runtimeOnly "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" // needed for OAUTHBEARER
 
     // dependencies to enable logging with log4j2:
diff --git a/kafka-sample/java/consumer.properties b/kafka-sample/java/consumer.properties
index 3ce7093..a07bd15 100644
--- a/kafka-sample/java/consumer.properties
+++ b/kafka-sample/java/consumer.properties
@@ -1,19 +1,19 @@
-# if you are an MBCon customer, use the clientId and clientSecret you have received along with the correct scope for your region:
-sasl.jaas.config=org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginModule required \
-clientId="YOUR_CLIENT_ID" \
-clientSecret="YOUR_CLIENT_SECRET" \
-scope="SCOPE";
-# use the correct token API url for your region:
-sasl.oauthbearer.token.endpoint.url=OAUTH_TOKEN_API_URL
-# if you are an MBCon customer, use the received client name as the prefix. eg: '<client name>.GROUP_ID_POSTFIX_OF_YOUR_CHOICE':
-group.id=CONSUMER_GROUP
 # use the correct bootstrap url for your region
 bootstrap.servers=BOOTSTRAP_URL
-sasl.login.callback.handler.class=org.apache.kafka.common.security.oauthbearer.secured.OAuthBearerLoginCallbackHandler
+# if you are an MBCon customer, use the received client name as the prefix. eg: '<client name>.GROUP_ID_POSTFIX_OF_YOUR_CHOICE':
+group.id=CONSUMER_GROUP
+# use the correct token API url for your region:
+sasl.oauthbearer.token.endpoint.url=OAUTH_TOKEN_API_URL
+sasl.login.callback.handler.class=org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginCallbackHandler
 sasl.mechanism=OAUTHBEARER
 security.protocol=SASL_SSL
 # following setting can be adjusted to your preferences:
 auto.offset.reset=latest
 enable.auto.commit=true
 key.deserializer=org.apache.kafka.common.serialization.StringDeserializer
-value.deserializer=org.apache.kafka.common.serialization.StringDeserializer
\ No newline at end of file
+value.deserializer=org.apache.kafka.common.serialization.StringDeserializer
+# if you are an MBCon customer, use the clientId and clientSecret you have received along with the correct scope for your region:
+sasl.jaas.config=org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginModule required;
+sasl.oauthbearer.client.credentials.client.id=YOUR_CLIENT_ID
+sasl.oauthbearer.client.credentials.client.secret=YOUR_CLIENT_SECRET
+sasl.oauthbearer.scope=SCOPE
diff --git a/kafka-sample/java/gradle.properties b/kafka-sample/java/gradle.properties
index 64b0adc..4409c2f 100644
--- a/kafka-sample/java/gradle.properties
+++ b/kafka-sample/java/gradle.properties
@@ -1,7 +1,8 @@
-shadow_plugin_version=8.1.1
-java_version=17
-kafka_clients_version=3.5.0
-jackson_databind_version=2.15.2
-log4j2_version=2.20.0
-commons_cli_version=1.5.0
+java_version=21
+shadow_plugin_version=9.1.0
+kafka_clients_version=4.1.0
+jose4j_version=0.9.6
+jackson_databind_version=2.20.0
+log4j2_version=2.25.1
+commons_cli_version=1.10.0
 
diff --git a/kafka-sample/java/gradle/wrapper/gradle-wrapper.jar b/kafka-sample/java/gradle/wrapper/gradle-wrapper.jar
index 249e583..8bdaf60 100644
Binary files a/kafka-sample/java/gradle/wrapper/gradle-wrapper.jar and b/kafka-sample/java/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/kafka-sample/java/gradle/wrapper/gradle-wrapper.properties b/kafka-sample/java/gradle/wrapper/gradle-wrapper.properties
index b049f70..2a84e18 100644
--- a/kafka-sample/java/gradle/wrapper/gradle-wrapper.properties
+++ b/kafka-sample/java/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
-#Fri Jun 30 12:42:27 CEST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/kafka-sample/java/gradlew b/kafka-sample/java/gradlew
index 1b6c787..ef07e01 100644
--- a/kafka-sample/java/gradlew
+++ b/kafka-sample/java/gradlew
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +82,11 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -133,22 +133,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,18 +200,28 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.
diff --git a/kafka-sample/java/gradlew.bat b/kafka-sample/java/gradlew.bat
index 107acd3..db3a6ac 100644
--- a/kafka-sample/java/gradlew.bat
+++ b/kafka-sample/java/gradlew.bat
@@ -13,8 +13,10 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +27,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -56,32 +59,34 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
diff --git a/kafka-sample/java/src/main/java/com/mbcs/examples/kafka/KafkaSampleCliParser.java b/kafka-sample/java/src/main/java/com/mbcs/examples/kafka/KafkaSampleCliParser.java
index af92159..4c23dfc 100644
--- a/kafka-sample/java/src/main/java/com/mbcs/examples/kafka/KafkaSampleCliParser.java
+++ b/kafka-sample/java/src/main/java/com/mbcs/examples/kafka/KafkaSampleCliParser.java
@@ -1,6 +1,9 @@
 package com.mbcs.examples.kafka;
 
 import org.apache.commons.cli.*;
+import org.apache.commons.cli.help.HelpFormatter;
+
+import java.io.IOException;
 
 public class KafkaSampleCliParser {
     private final CommandLineParser parser = new DefaultParser();
@@ -15,14 +18,14 @@ public CommandLine parse(String[] args) throws ParseException {
                 .hasArg()
                 .argName("topic name")
                 .type(String.class)
-                .build());
+                .get());
         options.addOption(Option.builder("c")
                 .longOpt("config")
                 .desc("path to kafka consumer config file")
                 .hasArg()
                 .argName("config file path")
                 .type(String.class)
-                .build());
+                .get());
 
         CommandLine cmd;
         cmd = parser.parse(options, args);
@@ -30,7 +33,11 @@ public CommandLine parse(String[] args) throws ParseException {
     }
 
     public void printHelp() {
-        HelpFormatter hf = new HelpFormatter();
-        hf.printHelp("java -jar <executable .jar path>", options, true);
+        HelpFormatter hf = HelpFormatter.builder().get();
+        try {
+            hf.printHelp("java -jar <executable .jar path>", null, options, null, true);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
     }
 }
diff --git a/kafka-sample/java/src/main/java/com/mbcs/examples/kafka/Main.java b/kafka-sample/java/src/main/java/com/mbcs/examples/kafka/Main.java
index d6833e9..cb85923 100644
--- a/kafka-sample/java/src/main/java/com/mbcs/examples/kafka/Main.java
+++ b/kafka-sample/java/src/main/java/com/mbcs/examples/kafka/Main.java
@@ -23,6 +23,7 @@ public static void main(String[] args) {
             System.err.println("Consumer config file '" + consumerConfig + "' could not be opened.");
             parser.printHelp();
         } catch (Exception e) {
+            e.printStackTrace();
             parser.printHelp();
         }
     }
diff --git a/kafka-sample/python/README.md b/kafka-sample/python/README.md
index f22922e..0f87841 100644
--- a/kafka-sample/python/README.md
+++ b/kafka-sample/python/README.md
@@ -9,7 +9,7 @@ This is only a sample without support and liability to its correctness!
 Prerequisite
 ------------
 
-The script is based on Python 3.9 and [confluent-kafka-python](https://github.com/confluentinc/confluent-kafka-python)
+The script is based on Python 3.13 and [confluent-kafka-python](https://github.com/confluentinc/confluent-kafka-python)
 
 Related Links:
 
@@ -65,4 +65,4 @@ confluent-kafka-python library as soon as it is available to your platform. In c
 connections will be closed, as soon as the token expires. The client will automatically reconnect, but you will receive
 error logs.
 
-Copyright 2024 Mercedes-Benz Connectivity Services GmbH
+Copyright 2024-2025 Mercedes-Benz Connectivity Services GmbH
diff --git a/kafka-sample/python/kafka-oauth-demo.py b/kafka-sample/python/kafka-oauth-demo.py
index 371b354..b5cc85d 100644
--- a/kafka-sample/python/kafka-oauth-demo.py
+++ b/kafka-sample/python/kafka-oauth-demo.py
@@ -2,7 +2,7 @@
 # coding: utf-8
 
 #
-# Copyright 2021 Mercedes-Benz Connectivity Services GmbH
+# Copyright 2021-2025 Mercedes-Benz Connectivity Services GmbH
 #
 # SPDX-License-Identifier: MIT
 
@@ -65,7 +65,7 @@ def configure_consumer():
         'sasl.oauthbearer.scope': scope,
         'sasl.oauthbearer.token.endpoint.url': oauth_token_api_url,
         'group.id': group,
-        'auto.offset.reset': 'earliest',
+        'auto.offset.reset': 'latest',
         'enable.auto.commit': True,
     }
     if args.kafka_debug != ["none"]:
diff --git a/kafka-sample/python/requirements.txt b/kafka-sample/python/requirements.txt
index bd187ae..c1e9aba 100644
--- a/kafka-sample/python/requirements.txt
+++ b/kafka-sample/python/requirements.txt
@@ -1 +1 @@
-confluent-kafka ~= 2.1.1
\ No newline at end of file
+confluent-kafka ~= 2.11.1
\ No newline at end of file