-
-
Notifications
You must be signed in to change notification settings - Fork 39
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
Updated github URLS from eclipse to eclipse-openj9 #130
Conversation
Pls update the IBM copyright end date in the files that contain IBM copyrights.
|
There is one more reference in openj9.test.sharedClasses.jvmti/build.xml that should be updated as well. |
@Mesbah-Alam could you please review? |
@pshipton Should I update the references of |
@SAY-droid427 : please check the output of the failed checks above and fix the files that are reported to be broken. For example, the copyright check here https://ci.eclipse.org/openj9/job/PullRequest-CopyrightCheck-Systemtest/167/console lists the files from this PR that have wrong copyright message that need to be updated. |
The start date should be preserved, so |
.gitattributes.zos
Outdated
@@ -1,5 +1,5 @@ | |||
################################################################################# | |||
# Copyright (c) 2017 IBM Corp. | |||
# Copyright (c) 2017, 2021 IBM Corp. and others |
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.
Please remove the "and others" part from this and the rest of the 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.
Should I restore it to Copyright (c) 2017 IBM Corp.
only in this file? Also when I changed the end dates of the copyright of the following files to 2021, there were copyright errors so I have restored the copyright to what it was earlier.
20:24:23 README.md
[Pipeline] echo
20:24:23 openj9.test.daa/src/test.daa/net/openj9/test/simple/ConvertDecimal.java
[Pipeline] echo
20:24:23 openj9.test.daa/src/test.daa/net/openj9/test/simple/MarshalUnmarshalBinary.java
However I did not find an occurrence of copyright in README.md
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.
As far as checks of this PR is concerned - you only need to update the copyright of the files you had touched. You don't need to update every single file of the entire repo.
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.
About my comment above, what I meant is :
The copyright should read like this: "Copyright (c) 2017, 2021 IBM Corp."
Not this: "Copyright (c) 2017, 2021 IBM Corp. and others"
It appears that you have added two extra words by mistake in your change : "and others". These two words should be removed.
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.
Pls update the IBM copyright end date in the files that contain IBM copyrights.
The scripts that containCopyright (c) 2017 IBM Corp.
should be updated toCopyright (c) 2017, 2021 IBM Corp. and others
23:32:17 The following files were modified and have incorrect copyrights [Pipeline] echo 23:32:17 openj9.build/docs/build.md [Pipeline] echo 23:32:17 openj9.build/scripts/openj9-systemtest-clone-make.bat [Pipeline] echo 23:32:17 openj9.build/scripts/openj9-systemtest-clone-make.sh [Pipeline] echo 23:32:17 openj9.stf.extensions/src/stf.extensions/net/openj9/stf/sharedClasses/StfSharedClassesExtension.java [Pipeline] echo 23:32:17 openj9.test.sharedClasses.jvmti/src/test.sharedClasses.jvmti/net/openj9/sc/api/SharedClassesCacheChecker.java
I thought that I had to update the copyrights of the all the files that contain the copyright. Should I revert the 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.
You can leave it. You didn't need to add it as part of this change, but since you've already added it we might as well keep it.
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.
The copyright check still has failures: https://ci.eclipse.org/openj9/job/PullRequest-CopyrightCheck-Systemtest/172/console
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.
@Mesbah-Alam I have updated both the top-level README.md as asked by @pshipton and also the openj9.test.sharedClasses/docs/README.md as asked by you. The copyright check is passing now.
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.
lgtm. Can you squash the commits?
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.
Done
fc86261
to
cbbb41b
Compare
This lgtm now. Mesbah if you are good with it I can merge it. |
7103802
to
1e898d1
Compare
The Line Endings Check has failed: https://ci.eclipse.org/openj9/job/PullRequest-LineEndingsCheck-Systemtest/174/console
Could you please fix this? If you use Eclipse, this can be done easily by selecting the file first, and then: File->Convert Line delimiters to->CRLF. |
I use VSCode, but after searching a bit, I found this and I think this will solve the issue. |
@Mesbah-Alam I am facing this issue:
I did find this article on handling the line endings but I am a bit confused. |
The only file you need to change is : 'openj9.build/scripts/openj9-systemtest-clone-make.bat' (as reported by https://ci.eclipse.org/openj9/job/PullRequest-LineEndingsCheck-Systemtest/174/console). Please do not update line terminators in any other file. |
Okay. But I am unable to add the changes to the file(CRLF), when using git add . It gives the above warning |
Googled and found this: https://lexsheehan.blogspot.com/2014/05/warning-crlf-will-be-replaced-by-lf-in.html Perhaps you can try again after setting : |
I did as you told after changing the end of line terminator to LF from CRLF as it originally was for the other files. But this is what I got: |
@Mesbah-Alam Could you please tell me what should I do to overcome this issue? |
@pshipton - do we have any guideline somewhere internally about how to prepare a PR that'd pass the |
I've merged the changes, which addresses updating the github URLs. @keithc-ca do you know why openj9.build/scripts/openj9-systemtest-clone-make.bat is failing the line ending check, and now to fix it? |
I expect the unwanted conversion to use LF line-ends in |
It seems it has more to do with the contents of the repo itself. |
@Mesbah-Alam for the record, the primary purpose of the line endings check is so a PR doesn't mess up the "good" line endings we already have. For any files that aren't already "good", while we appreciate contributors fixing those types of problems when possible, it's not the responsibility of someone making other changes to fix them, and it doesn't need to block accepting contributions. |
Fixes adoptium/aqa-tests#2551