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

Updates to JSTL bucket for Java 11 Locale #664

Merged
merged 2 commits into from
Oct 26, 2021

Conversation

brideck
Copy link
Contributor

@brideck brideck commented Mar 15, 2021

Locale related changes to goldenfiles and JSPs to be included in the TCK once support for Java 8 is no longer needed.

Signed-off-by: Brian Decker bmdecker@us.ibm.com

Signed-off-by: Brian Decker <bmdecker@us.ibm.com>
@scottmarlow scottmarlow added the future Target future Jakarta EE release label Mar 16, 2021
@scottmarlow
Copy link
Contributor

@brideck do we need this change for Jakarta EE 10?

@brideck
Copy link
Contributor Author

brideck commented Oct 8, 2021

Yes. With Java 8 out of the picture in EE 10, we should be able to make these updates and drop use of the -Djava.locale.providers=COMPAT workaround for the jstl tests.

@pnicolucci
Copy link
Contributor

I missed this one! Sorry! I'll give it a look over next week. Thanks!

@scottmarlow scottmarlow added 10.0 Issues related to the Jakarta EE 10 Platform TCK release and removed future Target future Jakarta EE release labels Oct 8, 2021
Copy link
Contributor

@pnicolucci pnicolucci left a comment

Choose a reason for hiding this comment

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

Overall these changes make sense and look good. My only comment would be we should probably update the copyrights where appropriate to include: Copyright (c) 2021-2021 Contributors to the Eclipse Foundation

What do you think?

@scottmarlow
Copy link
Contributor

Overall these changes make sense and look good. My only comment would be we should probably update the copyrights where appropriate to include: Copyright (c) 2021-2021 Contributors to the Eclipse Foundation

What do you think?

Updating the copyright date in the updated files sounds right. For example, change from Copyright (c) 2003, 2020 Oracle and/or its affiliates. All rights reserved. to Copyright (c) 2003, 2021 Oracle and/or its affiliates. All rights reserved.

@brideck
Copy link
Contributor Author

brideck commented Oct 13, 2021

Agreed. I'll dig up this branch and make an update.

@pnicolucci
Copy link
Contributor

Overall these changes make sense and look good. My only comment would be we should probably update the copyrights where appropriate to include: Copyright (c) 2021-2021 Contributors to the Eclipse Foundation
What do you think?

Updating the copyright date in the updated files sounds right. For example, change from Copyright (c) 2003, 2020 Oracle and/or its affiliates. All rights reserved. to Copyright (c) 2003, 2021 Oracle and/or its affiliates. All rights reserved.

Hey @scottmarlow @brideck wouldn't we want to leave the Oracle copyright alone and add the general Eclipse copyright?

@brideck
Copy link
Contributor Author

brideck commented Oct 13, 2021

Overall these changes make sense and look good. My only comment would be we should probably update the copyrights where appropriate to include: Copyright (c) 2021-2021 Contributors to the Eclipse Foundation
What do you think?

Updating the copyright date in the updated files sounds right. For example, change from Copyright (c) 2003, 2020 Oracle and/or its affiliates. All rights reserved. to Copyright (c) 2003, 2021 Oracle and/or its affiliates. All rights reserved.

Hey @scottmarlow @brideck wouldn't we want to leave the Oracle copyright alone and add the general Eclipse copyright?

Not saying we shouldn't, but I interestingly only see an Eclipse copyright statement like the one Paul proposed in a few files in the TCK. @scottmarlow, are we wanting to transition to that statement as we make changes to TCK files going forward?

@scottmarlow
Copy link
Contributor

@brideck @pnicolucci good questions!

Hey @scottmarlow @brideck wouldn't we want to leave the Oracle copyright alone and add the general Eclipse copyright?

Does Eclipse prefer that approach of adding a secondary Eclipse copyright statement and only updating the secondary copyright?

@scottmarlow
Copy link
Contributor

@pnicolucci https://www.eclipse.org/lists/jakartaee-tck-dev/msg00465.html does agree with you. It appears that some files already have Eclipse as secondary copyright such as https://github.com/eclipse-ee4j/jakartaee-tck/blob/f800a7c8a65a946bb50ce608ea43a9c23c59fc72/src/web/jstl/spec/fmt/format/parsedate/positivePDTypeTest.jsp

@pnicolucci
Copy link
Contributor

@pnicolucci https://www.eclipse.org/lists/jakartaee-tck-dev/msg00465.html does agree with you. It appears that some files already have Eclipse as secondary copyright such as https://github.com/eclipse-ee4j/jakartaee-tck/blob/f800a7c8a65a946bb50ce608ea43a9c23c59fc72/src/web/jstl/spec/fmt/format/parsedate/positivePDTypeTest.jsp

Hey, @scottmarlow I'm just not sure if you need to add an entirely new copyright like in the example you provided or if we just need to add a new contributor. For instance, what I've been doing is: https://github.com/eclipse-ee4j/jstl-api/blob/master/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ImportSupport.java#L5 However, I'm not sure if we have any documents for how exactly to update the copyrights. If we don't I think we should have clarification for all the projects to ensure it is done consistently.

@brideck
Copy link
Contributor Author

brideck commented Oct 14, 2021

Per Ed's post from the dev list, it would seem that I leave the existing copyright statement alone, but add a new line:
"Portions copyrighted 2021, Contributors to the Eclipse Foundation."

Am I understanding that correctly?

@brideck brideck self-assigned this Oct 14, 2021
@scottmarlow
Copy link
Contributor

Per Ed's post from the dev list, it would seem that I leave the existing copyright statement alone, but add a new line: "Portions copyrighted 2021, Contributors to the Eclipse Foundation."

Am I understanding that correctly?

https://www.eclipse.org/lists/jakartaee-tck-dev/msg00466.html has a little more feedback that mentions updating the Oracle copyright date range and only add a new copyright notice if new original content is added to the file. I linked to the SMC email thread but it seems the link that I used does not actually contain the conversation that I quoted.

https://www.eclipse.org/projects/handbook/#ip-copyright-headers has general information as well.

@brideck
Copy link
Contributor Author

brideck commented Oct 14, 2021

Per Ed's post from the dev list, it would seem that I leave the existing copyright statement alone, but add a new line: "Portions copyrighted 2021, Contributors to the Eclipse Foundation."
Am I understanding that correctly?

https://www.eclipse.org/lists/jakartaee-tck-dev/msg00466.html has a little more feedback that mentions updating the Oracle copyright date range and only add a new copyright notice if new original content is added to the file. I linked to the SMC email thread but it seems the link that I used does not actually contain the conversation that I quoted.

https://www.eclipse.org/projects/handbook/#ip-copyright-headers has general information as well.

Okay, so given that I'm not really introducing anything I would consider to be original content here, I'm going to just update the year on the existing copyright notices. Please let me know if anyone objects to that approach.

@kwsutter
Copy link
Contributor

FYI... You can update the date range for the Oracle copyright. But, it should never be removed or replaced. You can add additional copyrights like the generic Eclipse contributors when you make changes.

Copy link
Contributor

@pnicolucci pnicolucci left a comment

Choose a reason for hiding this comment

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

Thanks for updating the copyrights. Approved.

@scottmarlow scottmarlow merged commit dcfc0d4 into jakartaee:master Oct 26, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.0 Issues related to the Jakarta EE 10 Platform TCK release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants