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

latest license updates #1005

Merged
merged 1 commit into from
Apr 29, 2023
Merged

Conversation

pjfanning
Copy link
Member

based on #1002 (comment)

this is only for jackson 2.14 to unblock a potential v2.14.3 release - we have more time to worry about getting v2.15 licenses sorted out

@pjfanning pjfanning merged commit a21fe7b into FasterXML:2.14 Apr 29, 2023
4 checks passed
@pjfanning
Copy link
Member Author

@cowtowncoder I got distracted while doing this PR and accidentally merged this when I thought I was only submitting it

Feel free to revert it and we can do a new one to replace it

@pjfanning pjfanning deleted the fastdouble-license branch April 29, 2023 18:47
@cowtowncoder
Copy link
Member

@pjfanning No that's perfectly fine, not a problem. I'll try merging it forward.

Thank you for doing it so quickly.

@cowtowncoder
Copy link
Member

Sigh. I know it's unavoidable, but I wish we didn't have to replicate almost identical 10kB licenses like this.
I know it gets compressed and it really doesn't matter but somehow makes me sad :)

But I really hope this avoids getting more requests, comments, by interested third parties. What bugs me is really the fact that none of actually relevant parties -- authors of packages themselves, and us -- had concerns, but it's others who are worried about hypothetical issues if relevant parties somehow did no longer (?) agree or something.
It's always very easy to file issues for others to take care of.

@cowtowncoder
Copy link
Member

@pjfanning There were minor merge conflicts 2.14->2.15; I hope I resolved those correctly.

@pjfanning
Copy link
Member Author

pjfanning commented Apr 30, 2023

@cowtowncoder this PR was not meant to be forward to 2.15 branch - see my description in the PR.

For Jackson 2.15, my plan really is to uptake the latest FastDoubleParser 0.9.0 release made today. #1006 is a draft of that change but there is an issue that needs fixing in that PR.

I had meant to do a PR for 2.15 branch but messed it up again and accidentally committed to 2.15 branch directly. I am travelling this weekend and am busy with stuff related to that and am struggling to concentrate on these commits.

7c11ed0 is my accidental commit. This reverts part of the forward fit.

I am deliberately using the MIT license of FastDoubleParser for Jackson 2.15+. It is much easier to use the default license instead of having a special Jackson only license for FastDoubleParser and all the confusion from that. Especially, since we now shade the FastDoubleParser source (new in Jackson 21.5 - Jackson 2.14 is different, the FastDoubleParser is checked into jackson-core repo and the source has adjusted Apache headers.

@cowtowncoder
Copy link
Member

cowtowncoder commented Apr 30, 2023

@pjfanning Ok, sorry about messing things up some more. I'll revert my merge then.

EDIT: Ok realized you did revert. Good. Will leave things as they are since you know the exact situation & steps to fix. So better for me to not do anything :)

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.

None yet

2 participants