From eb01fe625b1e51fbb1a16b668ff5676b49aa0274 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Fri, 28 Apr 2023 20:39:23 +0200 Subject: [PATCH 1/2] add FastDoubleParser section to NOTICE (#1003) --- .../META-INF/FastDoubleParser-LICENSE | 21 +++++++++++++++++++ src/main/resources/META-INF/NOTICE | 8 +++++++ 2 files changed, 29 insertions(+) create mode 100644 src/main/resources/META-INF/FastDoubleParser-LICENSE diff --git a/src/main/resources/META-INF/FastDoubleParser-LICENSE b/src/main/resources/META-INF/FastDoubleParser-LICENSE new file mode 100644 index 0000000000..85a9d6e0e6 --- /dev/null +++ b/src/main/resources/META-INF/FastDoubleParser-LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/src/main/resources/META-INF/NOTICE b/src/main/resources/META-INF/NOTICE index d226e890da..2e683dd217 100644 --- a/src/main/resources/META-INF/NOTICE +++ b/src/main/resources/META-INF/NOTICE @@ -15,3 +15,11 @@ To find the details that apply to this artifact see the accompanying LICENSE fil A list of contributors may be found from CREDITS(-2.x) file, which is included in some artifacts (usually source distributions); but is always available from the source code management (SCM) system project uses. + +## FastDoubleParser + +jackson-core bundles a shaded copy of FastDoubleParser . +That code is available under an MIT license +under the following copyright. + +Copyright © 2023 Werner Randelshofer, Switzerland. MIT License. From f37e0cabf20000c282d2a0a42035d79a3d1b311c Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Fri, 28 Apr 2023 20:53:02 +0200 Subject: [PATCH 2/2] adjust license for jackson 2.14 - see https://github.com/FasterXML/jackson-core/issues/577#issuecomment-1086600093 --- .../META-INF/FastDoubleParser-LICENSE | 21 ------------------- src/main/resources/META-INF/NOTICE | 5 ++--- 2 files changed, 2 insertions(+), 24 deletions(-) delete mode 100644 src/main/resources/META-INF/FastDoubleParser-LICENSE diff --git a/src/main/resources/META-INF/FastDoubleParser-LICENSE b/src/main/resources/META-INF/FastDoubleParser-LICENSE deleted file mode 100644 index 85a9d6e0e6..0000000000 --- a/src/main/resources/META-INF/FastDoubleParser-LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/src/main/resources/META-INF/NOTICE b/src/main/resources/META-INF/NOTICE index 2e683dd217..5db1d95019 100644 --- a/src/main/resources/META-INF/NOTICE +++ b/src/main/resources/META-INF/NOTICE @@ -19,7 +19,6 @@ from the source code management (SCM) system project uses. ## FastDoubleParser jackson-core bundles a shaded copy of FastDoubleParser . -That code is available under an MIT license -under the following copyright. +That code is available under an Apache license under the following copyright. -Copyright © 2023 Werner Randelshofer, Switzerland. MIT License. +Copyright (c) Werner Randelshofer. Apache 2.0 License.