diff --git a/confluent-kafka.yaml b/confluent-kafka.yaml index f16dbd097b3..df80af15062 100644 --- a/confluent-kafka.yaml +++ b/confluent-kafka.yaml @@ -8,7 +8,7 @@ package: # with the `version:` field. # 2. Created a new variable `mangled-package-version` to append `-ccs` to the # version. - version: "8.2.0.349" + version: "8.2.0.351" epoch: 0 description: Community edition of Confluent Kafka. copyright: @@ -46,15 +46,10 @@ var-transforms: pipeline: - uses: git-checkout with: - expected-commit: c87f2c11b72e10f53f892300604014e2a31f5fea + expected-commit: 80a5f0f23dd84cd14fab6b6695da03deaec39b5a repository: https://github.com/confluentinc/kafka tag: v${{vars.mangled-package-version}} - - uses: patch - with: - patches: | - GHSA-j288-q9x7-2f5v.patch - - runs: | export JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 diff --git a/confluent-kafka/GHSA-j288-q9x7-2f5v.patch b/confluent-kafka/GHSA-j288-q9x7-2f5v.patch deleted file mode 100644 index 793c4ffcb72..00000000000 --- a/confluent-kafka/GHSA-j288-q9x7-2f5v.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/build.gradle b/build.gradle -index 266db12355..85aa4946ea 100644 ---- a/build.gradle -+++ b/build.gradle -@@ -208,6 +208,7 @@ allprojects { - // that are unrelated to the project dependencies, we should not change them - if (name != "zinc") { - resolutionStrategy { -+ force("org.apache.commons:commons-lang3:" + lang3Version) - force( - // be explicit about the javassist dependency version instead of relying on the transitive version - libs.javassist, -diff --git a/gradle.properties b/gradle.properties -index b8d806cc03..cc9d208322 100644 ---- a/gradle.properties -+++ b/gradle.properties -@@ -26,6 +26,7 @@ version=8.2.0-22-ccs - scalaVersion=2.13.16 - # Adding swaggerVersion in gradle.properties to have a single version in place for swagger - swaggerVersion=2.2.25 -+lang3Version=3.18.0 - task=build - org.gradle.jvmargs=-Xmx2g -Xss100m -XX\:+UseParallelGC - org.gradle.parallel=true