Skip to content
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

[ISSUE #3888]Optimize xml file License #3890

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

mxsm
Copy link
Member

@mxsm mxsm commented May 8, 2023

Fixes #3888

Motivation

Explain the content here.
Explain why you want to make the changes and what problem you're trying to solve.

Modifications

  • Optimize xml file License

Documentation

  • Does this pull request introduce a new feature? (yes / no)
  • If yes, how is the feature documented? (not applicable / docs / JavaDocs / not documented)
  • If a feature is not applicable for documentation, explain why?
  • If a feature is not documented yet in this PR, please create a followup issue for adding the documentation

@codecov
Copy link

codecov bot commented May 9, 2023

Codecov Report

Merging #3890 (70485dd) into master (e1e9aca) will not change coverage.
The diff coverage is n/a.

❗ Current head 70485dd differs from pull request most recent head 01c6426. Consider uploading reports for the commit 01c6426 to get more accurate results

@@            Coverage Diff            @@
##             master    #3890   +/-   ##
=========================================
  Coverage     13.93%   13.93%           
  Complexity     1291     1291           
=========================================
  Files           570      570           
  Lines         28847    28847           
  Branches       2811     2811           
=========================================
  Hits           4019     4019           
  Misses        24455    24455           
  Partials        373      373           

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@weihubeats
Copy link
Member

Conflict resolution, please.

Comment on lines +3 to +4
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
Copy link
Member

Choose a reason for hiding this comment

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

The ~ should be removed, not just the ~, to maintain the correct two-space indentation.

Copy link
Member Author

Choose a reason for hiding this comment

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

The ~ should be removed, not just the ~, to maintain the correct two-space indentation.

I will do later

Copy link
Member

Choose a reason for hiding this comment

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

Most of log4j.xml files has been removed in #4719, and a checkstyle-header-xml.txt header file has been added in #4827.

It seems the xml header file with ~ included is the default header applied by apache/skywalking-eyes action. Do you think we still need to remove the ~ in the header?

Copy link
Member

Choose a reason for hiding this comment

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

@pchengma @mxsm We have an unresolved conversation here~ Please take a look.

Copy link
Member

Choose a reason for hiding this comment

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

I think both styles are OK. If ~ is auto-generated, it is fine to keep it. Nevertheless, some projects may not use ~ , for example fineract.

Copy link
Member

Choose a reason for hiding this comment

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

Yes, the apache/skywalking-eyes action is considered valid for both license headers with and without ~. However it adds ~ when auto-generating. Considering that all xml license headers in EventMesh now have ~, we can unify having ~.

Copy link
Contributor

It has been 60 days since the last activity on this pull request. I am reaching out here to gently remind you that the Apache EventMesh community values every pull request, and please feel free to get in touch with the reviewers at any time. They are available to assist you in advancing the progress of your pull request and offering the latest feedback.

If you encounter any challenges during development, seeking support within the community is encouraged. We sincerely appreciate your contributions to Apache EventMesh.

@github-actions github-actions bot added the Stale label Apr 22, 2024
@codecov-commenter
Copy link

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 13.93%. Comparing base (e1e9aca) to head (70485dd).
Report is 502 commits behind head on master.

❗ Current head 70485dd differs from pull request most recent head 01c6426. Consider uploading reports for the commit 01c6426 to get more accurate results

Additional details and impacted files
@@            Coverage Diff            @@
##             master    #3890   +/-   ##
=========================================
  Coverage     13.93%   13.93%           
  Complexity     1291     1291           
=========================================
  Files           570      570           
  Lines         28847    28847           
  Branches       2811     2811           
=========================================
  Hits           4019     4019           
  Misses        24455    24455           
  Partials        373      373           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@github-actions github-actions bot removed the Stale label Apr 23, 2024
Copy link
Member

@pchengma pchengma left a comment

Choose a reason for hiding this comment

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

LGTM

@pchengma
Copy link
Member

@mxsm Please fix conflicts.

Copy link
Contributor

It has been 60 days since the last activity on this pull request. I am reaching out here to gently remind you that the Apache EventMesh community values every pull request, and please feel free to get in touch with the reviewers at any time. They are available to assist you in advancing the progress of your pull request and offering the latest feedback.

If you encounter any challenges during development, seeking support within the community is encouraged. We sincerely appreciate your contributions to Apache EventMesh.

@github-actions github-actions bot added the Stale label Jul 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Enhancement] Optimize xml file License
6 participants