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.

Sign up for GitHub

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

Jump to bottom

Correct SPDX license identifiers #6996

Merged
merged 1 commit into from
Jun 19, 2023
Merged

Correct SPDX license identifiers #6996

merged 1 commit into from
Jun 19, 2023

Conversation

keithc-ca
Copy link
Member

@keithc-ca keithc-ca commented May 18, 2023 •
edited
Loading

Issue #6995:

  • "GPL-2.0" should have been "GPL-2.0-only"
  • "OpenJDK-assembly-exception-1.0" replaces "Assembly-exception"

mstoodle
mstoodle reviewed May 24, 2023
View reviewed changes
jitbuilder/apigen/schema/api.schema.json Outdated
@@ -4,7 +4,7 @@
"title": "API Description Format",
"description": "Format for describing framework and library APIs in a way that allows simple generation of language bindings",
"$comment": "Copyright IBM Corp. and others 2018 (see LICENSE.md)",
"$comment": "SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception",
"$comment": "SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
Copy link
Contributor

Choose a reason for hiding this comment

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

Missing ", on the end of this line

Copy link
Member Author

Choose a reason for hiding this comment

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

Corrected in 62c1cd9.

mstoodle
mstoodle requested changes May 24, 2023
View reviewed changes
Copy link
Contributor

@mstoodle mstoodle left a comment

Choose a reason for hiding this comment

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

haven't checked everything yet, but the mentioned missing characters cause build breaks

mstoodle
mstoodle requested changes May 24, 2023
View reviewed changes
Copy link
Contributor

@mstoodle mstoodle left a comment

Choose a reason for hiding this comment

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

even json file has the same issue of missing ", at the end of the line that's been updated (except the first one I pointed out which has been fixed - thanks!)

jitbuilder/apigen/schema/api-class.schema.json Outdated Show resolved Hide resolved
jitbuilder/apigen/schema/api-field.schema.json Outdated Show resolved Hide resolved
jitbuilder/apigen/schema/api-service.schema.json Outdated Show resolved Hide resolved
jitbuilder/apigen/schema/api-type.schema.json Outdated Show resolved Hide resolved
@keithc-ca
Copy link
Member Author

Hopefully I've fixed all files in 0972f4a.

@keithc-ca keithc-ca marked this pull request as draft May 25, 2023 18:58
@keithc-ca
Copy link
Member Author

Besides the json files, there were others that didn't get (mechanically) updated properly. Marking as draft until those are corrected.

@keithc-ca
Correct SPDX license identifiers
4e4c71a 
* "GPL-2.0" should have been "GPL-2.0-only"
* "OpenJDK-assembly-exception-1.0" replaces "Assembly-exception"

Signed-off-by: Keith W. Campbell <[email protected]>
@keithc-ca
Copy link
Member Author

Rebased and updated:

  • fix new files added recently
  • fix *.s files where long lines are not permitted
  • correct files where the license identifier expression spanned two or more lines
  • fix strange "SPDX-L$(LIBJITBUILDERDIR)cense-Identifier"

@keithc-ca keithc-ca marked this pull request as ready for review May 25, 2023 19:53
@keithc-ca
Copy link
Member Author

keithc-ca commented May 29, 2023 •
edited
Loading

Removed "fixes" comment; new files added by recent pull requests (e.g. #7003) will need to be updated.

mstoodle
mstoodle approved these changes May 29, 2023
View reviewed changes
Copy link
Contributor

@mstoodle mstoodle left a comment

Choose a reason for hiding this comment

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

I found doc/ValgrindMemcheckAPI.md which does not have the right license string (only "SPDX-License-Identifier: EPL-2.0 OR Apache-2.0" which is, I think, our original identifier so has been missed for a long time :( ). We can handle it in this PR or under a separate one since it's a long standing mistake.

The failure on MacOS is not due to this change (another instance of #6516)

@mstoodle
Copy link
Contributor

jenkins build all

@keithc-ca
Copy link
Member Author

I left doc/ValgrindMemcheckAPI.md as it was. It didn't have any invalid identifiers discussed in the issue. If I recall correctly, there were other such files. If the license in those files should be updated, I think that should be handled separately.

@AdamBrousseau
Copy link
Contributor

jenkins build riscv

@jdmpapin jdmpapin mentioned this pull request Jun 1, 2023
Merged
@keithc-ca
Copy link
Member Author

Is this waiting for additional committer approvals, or something else?

@mstoodle
Copy link
Contributor

sorry, the delay is entirely my fault :( . At this point, let's just get this change merged so the licenses are mostly up to date and we'll deal with stragglers in a follow on.

@mstoodle mstoodle merged commit e94833d into eclipse:master Jun 19, 2023
@keithc-ca keithc-ca deleted the spdx branch June 19, 2023 16:31
keithc-ca added a commit to keithc-ca/omr that referenced this pull request Jun 19, 2023
@keithc-ca
Correct SPDX license identifiers (cont'd)
c98be22 
* fix new files added while eclipse#6996 was in flight

Signed-off-by: Keith W. Campbell <[email protected]>
@keithc-ca keithc-ca mentioned this pull request Jun 19, 2023
Merged
@jdmpapin jdmpapin mentioned this pull request Dec 21, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mstoodle mstoodle mstoodle approved these changes

@charliegracie charliegracie Awaiting requested review from charliegracie

@Leonardo2718 Leonardo2718 Awaiting requested review from Leonardo2718

@fjeremic fjeremic Awaiting requested review from fjeremic fjeremic is a code owner

@0xdaryl 0xdaryl Awaiting requested review from 0xdaryl 0xdaryl is a code owner

@youngar youngar Awaiting requested review from youngar

@babsingh babsingh Awaiting requested review from babsingh babsingh is a code owner

@aviansie-ben aviansie-ben Awaiting requested review from aviansie-ben

@knn-k knn-k Awaiting requested review from knn-k knn-k is a code owner

@vijaysun-omr vijaysun-omr Awaiting requested review from vijaysun-omr vijaysun-omr is a code owner

Assignees
No one assigned
Labels
build / configure ci cmake
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@keithc-ca @mstoodle @AdamBrousseau