Skip to content

KAFKA-18050: Upgrade the checkstyle version to 10.20.2#17999

Merged
chia7712 merged 14 commits into
apache:trunkfrom
m1a2st:KAFKA-18050
Dec 5, 2024
Merged

KAFKA-18050: Upgrade the checkstyle version to 10.20.2#17999
chia7712 merged 14 commits into
apache:trunkfrom
m1a2st:KAFKA-18050

Conversation

@m1a2st

@m1a2st m1a2st commented Dec 1, 2024

Copy link
Copy Markdown
Collaborator

Jira: https://issues.apache.org/jira/browse/KAFKA-18050

As we don't support the Java version8, we can avoid the CVE-2023-2976 and CVE-2020-8908m thus we should upgrade the checkstyle version, and some file are missed in old version checkstyle, thus we should upgrade the checkstyle version.

Committer Checklist (excluded from commit message)

  • Verify design and implementation
  • Verify test coverage and CI build status
  • Verify documentation (including upgrade notes)

@github-actions github-actions Bot added streams core Kafka Broker producer consumer tools connect kraft mirror-maker-2 storage Pull requests that target the storage module build Gradle build or GitHub Actions clients labels Dec 1, 2024
@dejan2609

Copy link
Copy Markdown
Contributor

Related PR: #10967

@m1a2st I will try to test my PR on top of your changes.

@chia7712

chia7712 commented Dec 2, 2024

Copy link
Copy Markdown
Member

@m1a2st please rebase code

@dejan2609

dejan2609 commented Dec 2, 2024

Copy link
Copy Markdown
Contributor

@m1a2st you may also use latest Checkstyle patch version (10.20.2)

# Conflicts:
#	gradle/dependencies.gradle
# Conflicts:
#	clients/src/main/java/org/apache/kafka/clients/admin/KafkaAdminClient.java
@m1a2st m1a2st changed the title KAFKA-18050: Upgrade the checkstyle version to 10.20.1 KAFKA-18050: Upgrade the checkstyle version to 10.20.2 Dec 2, 2024
@m1a2st

m1a2st commented Dec 2, 2024

Copy link
Copy Markdown
Collaborator Author

@dejan2609 I found there is an error when I use the version of 10.20.2, PTAL, Thanks for your helping https://github.com/apache/kafka/actions/runs/12122917186/job/33797238123?pr=17999

@dejan2609

dejan2609 commented Dec 2, 2024

Copy link
Copy Markdown
Contributor

No problem @m1a2st ! Upgrade to version 10.20.1 is still awesome.

You may want to squash commits into one so maintainer (@chia7712) could merge your change into the trunk.

@romani

romani commented Dec 2, 2024

Copy link
Copy Markdown

It will be awesome to create separate PR after merge of this PR to update to latest checkstyle and share report content to let us review how it was possible to generate bad xml

@dejan2609

dejan2609 commented Dec 2, 2024

Copy link
Copy Markdown
Contributor

It will be awesome to create separate PR after merge of this PR to update to latest checkstyle and share report content to let us review how it was possible to generate bad xml

I agree with that, @romani.

Anyhow: I tested (on my computer) this branch with Checkstyle 10.20.2 and it compiles just fine.
Gradle command used: ./gradlew checkstyleMain checkstyleTest -x test --info

Maybe Github Actions build went berserk 😃 ? We will check eventually.

@romani

romani commented Dec 2, 2024

Copy link
Copy Markdown

Let's merge this PR first.

@chia7712

chia7712 commented Dec 2, 2024

Copy link
Copy Markdown
Member

I tested (on my computer) this branch with Checkstyle 10.20.2 and it compiles just fine.

I run the 10.20.2 on #18010, and it works well.

Let's merge this PR first.

I have updated this PR to use version 10.20.2 again. Let's see what happens this time.

@chia7712 chia7712 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@m1a2st thanks for this patch. one small comment is left.

Comment thread gradle/dependencies.gradle Outdated
@@ -61,7 +61,7 @@ versions += [
// when updating checkstyle, check whether the exclusion of

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please remove those comments? they are out-of-date after you upgrade the checkstyle version

@chia7712

chia7712 commented Dec 5, 2024

Copy link
Copy Markdown
Member

The failed test is traced by https://issues.apache.org/jira/browse/KAFKA-18036

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

build Gradle build or GitHub Actions ci-approved clients connect consumer core Kafka Broker kraft mirror-maker-2 producer storage Pull requests that target the storage module streams tools

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants