-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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
Replace Apache license headers with SPDX ID #5808
Replace Apache license headers with SPDX ID #5808
Conversation
Signed-off-by: Prabhat <iprabhatdev@gmail.com>
|
Signed-off-by: Prabhat Kumar Sahu <iprabhatdev@gmail.com>
Thanks for the review. I was looking at this |
Signed-off-by: Prabhat Kumar Sahu <iprabhatdev@gmail.com>
I merged main, please do a pull to get the merge commit before any future changes |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I tried on one file and got this diff
// Copyright (c) 2019 The Jaeger Authors.
// Copyright (c) 2017 Uber Technologies, Inc.
//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// SPDX-License-Identifier: Apache-2.0
I don't think we need the empty comment after Copyright lines, remove it too. This is what we want:
// Copyright (c) 2023 The Jaeger Authors.
// SPDX-License-Identifier: Apache-2.0
package main
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #5808 +/- ##
==========================================
+ Coverage 96.65% 96.66% +0.01%
==========================================
Files 342 342
Lines 16525 16525
==========================================
+ Hits 15972 15974 +2
+ Misses 363 362 -1
+ Partials 190 189 -1
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
Signed-off-by: Prabhat Kumar Sahu <iprabhatdev@gmail.com>
Signed-off-by: Prabhat Kumar Sahu <iprabhatdev@gmail.com>
Signed-off-by: Prabhat Kumar Sahu <iprabhatdev@gmail.com>
Signed-off-by: Yuri Shkuro <github@ysh.us>
Signed-off-by: Yuri Shkuro <github@ysh.us>
There is a bug: when I run this script on |
Signed-off-by: Prabhat Kumar Sahu <iprabhatdev@gmail.com>
Thank you for pointing out the bug. I have updated the script to address the issue. I have tested the script on |
Signed-off-by: Yuri Shkuro <github@ysh.us>
This reverts commit 80c6f1c. Signed-off-by: Yuri Shkuro <github@ysh.us>
Signed-off-by: Yuri Shkuro <github@ysh.us>
Thanks! |
## Which problem is this PR solving? - Resolves jaegertracing#5807 ## Description of the changes - Added a new Python script `update_license_headers.py` in the `./scripts/` directory - Replaces old Apache headers with SPDX identifiers - Works on .go files - No changes to source files are included in this PR. ## How was this change tested? - I gave it a spin on the `cmd` folder. Seemed to work fine - it found the right files and swapped out the headers. I checked a few of the updated files manually to make sure it did what it was supposed to. ## Checklist - [x] I have read https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md - [x] I have signed all commits - [ ] I have added unit tests for the new functionality - [x] I have run lint and test steps successfully - for `jaeger`: `make lint test` - for `jaeger-ui`: `yarn lint` and `yarn test` --------- Signed-off-by: Prabhat <iprabhatdev@gmail.com> Signed-off-by: Prabhat Kumar Sahu <iprabhatdev@gmail.com> Signed-off-by: Yuri Shkuro <github@ysh.us> Co-authored-by: Yuri Shkuro <yurishkuro@users.noreply.github.com> Co-authored-by: Yuri Shkuro <github@ysh.us> Signed-off-by: Jared Tan <jian.tan@daocloud.io>
Which problem is this PR solving?
Description of the changes
update_license_headers.py
in the./scripts/
directoryHow was this change tested?
cmd
folder. Seemed to work fine - it found the right files and swapped out the headers. I checked a few of the updated files manually to make sure it did what it was supposed to.Checklist
jaeger
:make lint test
jaeger-ui
:yarn lint
andyarn test