-
-
Notifications
You must be signed in to change notification settings - Fork 6
feat(kafka): Add 3.9.0, Bump 3.7.1 to 3.7.2 #988
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
982712d
feat(kafka): Add 3.9.0, remove 3.7.1
NickLarsenNZ 9aeb301
chore: Ignore patchable-work dir
NickLarsenNZ 3c8ad76
chore: Update changelog
NickLarsenNZ a5b54a5
Apply suggestions from code review
NickLarsenNZ b388251
fix: Use correct PR number in the changelog
NickLarsenNZ 9123dcf
chore(kafka): Add a patches for 3.7.2
NickLarsenNZ File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,5 @@ | ||
| # Byte-compiled / optimized / DLL files | ||
| __pycache__/ | ||
| *.py[cod] | ||
|
|
||
| patchable-work/ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,20 @@ | ||
| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
| From: Nick Larsen <[email protected]> | ||
| Date: Wed, 29 Jan 2025 16:50:30 +0100 | ||
| Subject: Add cyclonedx-plugin | ||
|
|
||
| --- | ||
| build.gradle | 42 ++++++++++++++++++++++++++++++++++++++++++ | ||
| 1 file changed, 42 insertions(+) | ||
|
|
||
| diff --git a/build.gradle b/build.gradle | ||
| index 32e6e8f..13a0def 100644 | ||
| index 5b064f4203..2d7b442e7b 100644 | ||
| --- a/build.gradle | ||
| +++ b/build.gradle | ||
| @@ -48,6 +48,47 @@ plugins { | ||
| // artifacts - see https://github.com/johnrengelman/shadow/issues/901 | ||
| id 'com.github.johnrengelman.shadow' version '8.1.0' apply false | ||
| id 'com.diffplug.spotless' version '6.14.0' apply false // 6.14.1 and newer require Java 11 at compile time, so we can't upgrade until AK 4.0 | ||
| @@ -51,6 +51,48 @@ plugins { | ||
| // We are going to drop JDK8 support. Hence, the spotless is upgrade to newest version and be applied only if the build env is compatible with JDK 11. | ||
| // spotless 6.15.0+ has issue in runtime with JDK8 even through we define it with `apply:false`. see https://github.com/diffplug/spotless/issues/2156 for more details | ||
| id 'com.diffplug.spotless' version "6.14.0" apply false | ||
| + id 'org.cyclonedx.bom' version '1.10.0' | ||
| +} | ||
| + | ||
|
|
@@ -45,8 +54,14 @@ index 32e6e8f..13a0def 100644 | |
| + 'upgrade-system-tests-33', | ||
| + 'upgrade-system-tests-34', | ||
| + 'upgrade-system-tests-35', | ||
| + 'upgrade-system-tests-36' | ||
| + 'upgrade-system-tests-36', | ||
| + 'upgrade-system-tests-37' | ||
| + ] | ||
| } | ||
|
|
||
| ext { | ||
|
|
||
| base-commit: 84caaa6e9da06435411510a81fa321d4f99c351f | ||
| -- | ||
| 2.40.1 | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,14 @@ | ||
| From e5102449fe825cfbba20ce6ace1f51cd91550780 Mon Sep 17 00:00:00 2001 | ||
| From: Lars Francke <[email protected]> | ||
| Date: Thu, 12 Dec 2024 10:09:47 +0100 | ||
| Subject: [PATCH] Change Gradle to use the Nexus Build Repo | ||
| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
| From: Nick Larsen <[email protected]> | ||
| Date: Wed, 29 Jan 2025 17:00:48 +0100 | ||
| Subject: Use stackable maven mirror | ||
|
|
||
| --- | ||
| build.gradle | 8 ++++++-- | ||
| 1 file changed, 6 insertions(+), 2 deletions(-) | ||
|
|
||
| diff --git a/build.gradle b/build.gradle | ||
| index 92082fe7cf..3b56a2ad98 100644 | ||
| index 2d7b442e7b..3e727be2f0 100644 | ||
| --- a/build.gradle | ||
| +++ b/build.gradle | ||
| @@ -20,7 +20,9 @@ import java.nio.charset.StandardCharsets | ||
|
|
@@ -22,7 +22,7 @@ index 92082fe7cf..3b56a2ad98 100644 | |
| } | ||
| apply from: "$rootDir/gradle/dependencies.gradle" | ||
|
|
||
| @@ -126,7 +128,9 @@ ext { | ||
| @@ -171,7 +173,9 @@ ext { | ||
| allprojects { | ||
|
|
||
| repositories { | ||
|
|
@@ -34,5 +34,5 @@ index 92082fe7cf..3b56a2ad98 100644 | |
|
|
||
| dependencyUpdates { | ||
| -- | ||
| 2.47.1 | ||
| 2.40.1 | ||
NickLarsenNZ marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| upstream = "https://github.com/apache/kafka" | ||
| base = "84caaa6e9da06435411510a81fa321d4f99c351f" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,20 @@ | ||
| versions = [ | ||
| { | ||
| "product": "3.7.1", | ||
| "product": "3.8.0", | ||
| "java-base": "21", | ||
| "java-devel": "21", | ||
| "scala": "2.13", | ||
| "kcat": "1.7.0", | ||
| "opa_authorizer": "1.5.1", | ||
| "jmx_exporter": "1.0.1-stackable", | ||
| "jmx_exporter": "1.1.0", | ||
| }, | ||
| { | ||
| "product": "3.8.0", | ||
| "product": "3.9.0", | ||
| "java-base": "21", | ||
| "java-devel": "21", | ||
| "scala": "2.13", | ||
| "kcat": "1.7.0", | ||
| "opa_authorizer": "1.5.1", | ||
| "jmx_exporter": "1.0.1-stackable", | ||
| "jmx_exporter": "1.1.0", | ||
| }, | ||
| ] |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.