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

Updated github URLS from eclipse to eclipse-openj9 #130

Merged
merged 1 commit into from
May 3, 2021

Conversation

SAY-droid427
Copy link
Contributor

@pshipton
Copy link
Contributor

Pls update the IBM copyright end date in the files that contain IBM copyrights.
The scripts that contain Copyright (c) 2017 IBM Corp. should be updated to Copyright (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

@pshipton
Copy link
Contributor

There is one more reference in openj9.test.sharedClasses.jvmti/build.xml that should be updated as well.

@llxia
Copy link
Contributor

llxia commented Apr 30, 2021

@Mesbah-Alam could you please review?

@SAY-droid427
Copy link
Contributor Author

@pshipton Should I update the references of Copyright (c) 2016, 2020 IBM Corp. and others to Copyright (c) 2017, 2021 IBM Corp. and others?
I have also updated the references of Copyright (c) 2017, 2019 IBM Corp. to Copyright (c) 2017, 2021 IBM Corp. and others. Is taht correct?

@Mesbah-Alam
Copy link
Contributor

@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.

@pshipton
Copy link
Contributor

The start date should be preserved, so Copyright (c) 2016, 2020 IBM Corp. and others changes to Copyright (c) 2016, 2021 IBM Corp. and others. i.e. the end date changes from 2020 to 2021

@@ -1,5 +1,5 @@
#################################################################################
# Copyright (c) 2017 IBM Corp.
# Copyright (c) 2017, 2021 IBM Corp. and others
Copy link
Contributor

@Mesbah-Alam Mesbah-Alam Apr 30, 2021

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.

Copy link
Contributor Author

@SAY-droid427 SAY-droid427 Apr 30, 2021

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

Copy link
Contributor

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.

Copy link
Contributor

@Mesbah-Alam Mesbah-Alam Apr 30, 2021

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.

Copy link
Contributor Author

@SAY-droid427 SAY-droid427 Apr 30, 2021

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 contain Copyright (c) 2017 IBM Corp. should be updated to Copyright (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?

Copy link
Contributor

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.

Copy link
Contributor

Choose a reason for hiding this comment

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

Copy link
Contributor Author

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.

Copy link
Contributor

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?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

@pshipton
Copy link
Contributor

This lgtm now. Mesbah if you are good with it I can merge it.

@Mesbah-Alam
Copy link
Contributor

Mesbah-Alam commented Apr 30, 2021

The Line Endings Check has failed: https://ci.eclipse.org/openj9/job/PullRequest-LineEndingsCheck-Systemtest/174/console

13:06:11  ERROR - should have CRLF line terminators: 'openj9.build/scripts/openj9-systemtest-clone-make.bat' type: 'ASCII text'

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.

@SAY-droid427
Copy link
Contributor Author

The Line Endings Check has failed: https://ci.eclipse.org/openj9/job/PullRequest-LineEndingsCheck-Systemtest/174/console

13:06:11  ERROR - should have CRLF line terminators: 'openj9.build/scripts/openj9-systemtest-clone-make.bat' type: 'ASCII text'

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.

@SAY-droid427
Copy link
Contributor Author

@Mesbah-Alam I am facing this issue:

warning: CRLF will be replaced by LF in README.md.
The file will have its original line endings in your working directory.
warning: CRLF will be replaced by LF in openj9.build/docs/build.md.
The file will have its original line endings in your working directory.
warning: CRLF will be replaced by LF in openj9.build/scripts/openj9-systemtest-clone-make.bat.
The file will have its original line endings in your working directory.
warning: CRLF will be replaced by LF in openj9.build/scripts/openj9-systemtest-clone-make.sh.
The file will have its original line endings in your working directory.
warning: CRLF will be replaced by LF in openj9.stf.extensions/src/stf.extensions/net/openj9/stf/sharedClasses/StfSharedClassesExtension.java.
The file will have its original line endings in your working directory.
warning: CRLF will be replaced by LF in openj9.test.sharedClasses.jvmti/build.xml.
The file will have its original line endings in your working directory.
warning: CRLF will be replaced by LF in openj9.test.sharedClasses.jvmti/src/test.sharedClasses.jvmti/net/openj9/sc/api/SharedClassesCacheChecker.java.
The file will have its original line endings in your working directory.

I did find this article on handling the line endings but I am a bit confused.

@Mesbah-Alam
Copy link
Contributor

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.

@SAY-droid427
Copy link
Contributor Author

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

@Mesbah-Alam
Copy link
Contributor

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 : git config --global core.safecrlf true

@SAY-droid427
Copy link
Contributor Author

SAY-droid427 commented Apr 30, 2021

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 : git config --global core.safecrlf true

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:
j

@SAY-droid427
Copy link
Contributor Author

@Mesbah-Alam Could you please tell me what should I do to overcome this issue?

@Mesbah-Alam
Copy link
Contributor

@pshipton - do we have any guideline somewhere internally about how to prepare a PR that'd pass the Line Endings check ?

@pshipton pshipton merged commit 3e1fe4e into adoptium:master May 3, 2021
@pshipton
Copy link
Contributor

pshipton commented May 3, 2021

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?

@keithc-ca
Copy link
Contributor

I expect the unwanted conversion to use LF line-ends in *.bat files has something to do with how git is configured for @SAY-droid427. We don't want git to do any automatic conversion: *.bat files are expected to use CR-LF; #131 should fix that file.

@keithc-ca
Copy link
Contributor

It seems it has more to do with the contents of the repo itself.

@pshipton
Copy link
Contributor

pshipton commented May 3, 2021

@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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update github URL in test repos to refer to eclipse-openj9
5 participants