Skip to content

Commit 856c61c

Browse files
cowtowncodercowtowncoder
committed
Merge branch '3.1' into 3.x
2 parents 01334d3 + 76914df commit 856c61c

5 files changed

Lines changed: 185 additions & 2 deletions

File tree

‎release-notes/VERSION‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ JSON library.
3939
#1561: Javadoc for 3.1.0 doesn't work (build with JDK 21)
4040
(reported by Rob S)
4141
(fix by @cowtowncoder)
42+
#1597: Rework 3rd party licenses in jar
43+
(fix by @pjfanning)
4244

4345
3.1.1 (27-Mar-2026)
4446

‎src/main/resources/META-INF/FastDoubleParser-LICENSE‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
MIT License
2+
3+
Copyright (c) 2024 Werner Randelshofer, Switzerland.
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.
22+
23+
------
24+
This is a Java port of Daniel Lemire's fast_float project.
25+
This project provides parsers for double, float, BigDecimal and BigInteger values.
26+
27+
## Copyright
28+
29+
Copyright © 2024 Werner Randelshofer, Switzerland.
30+
31+
## Licensing
32+
33+
This code is licensed under MIT License.
34+
https://github.com/wrandelshofer/FastDoubleParser/blob/522be16e145f43308c43b23094e31d5efcaa580e/LICENSE
35+
(The file 'LICENSE' is included in the sources and classes Jar files that are released by this project
36+
- as is required by that license - see FastDoubleParser-LICENSE.)
37+
38+
Some portions of the code have been derived from other projects.
39+
All these projects require that we include a copyright notice, and some require that we also include some text of their
40+
license file.
41+
42+
fast_double_parser, Copyright (c) 2022 Daniel Lemire. Boost Software License.
43+
https://github.com/lemire/fast_double_parser
44+
https://github.com/lemire/fast_double_parser/blob/07d9189a8fb815fe800cb15ca022e7a07093236e/LICENSE.BSL
45+
(The file 'LICENSE.BSL' is included in the sources and classes Jar files that are released by this project
46+
- as is required by that license - see FastDoubleParser-ThirdParty-LICENSE.)
47+
48+
fast_float, Copyright (c) 2021 The fast_float authors. MIT License.
49+
https://github.com/fastfloat/fast_float
50+
https://github.com/fastfloat/fast_float/blob/cc1e01e9eee74128e48d51488a6b1df4a767a810/LICENSE-MIT
51+
(The file 'LICENSE-MIT' is included in the sources and classes Jar files that are released by this project
52+
- as is required by that license - see FastDoubleParser-ThirdParty-LICENSE.)
53+
54+
bigint, Copyright 2020 Tim Buktu. 2-clause BSD License.
55+
https://github.com/tbuktu/bigint/tree/floatfft
56+
https://github.com/tbuktu/bigint/blob/617c8cd8a7c5e4fb4d919c6a4d11e2586107f029/LICENSE
57+
https://github.com/wrandelshofer/FastDoubleParser/blob/39e123b15b71f29a38a087d16a0bc620fc879aa6/bigint-LICENSE
58+
(We only use those portions of the bigint project that can be licensed under 2-clause BSD License.)
59+
(The file 'bigint-LICENSE' is included in the sources and classes Jar files that are released by this project
60+
- as is required by that license - see FastDoubleParser-ThirdParty-LICENSE.)
61+

‎src/main/resources/META-INF/FastDoubleParser-ThirdParty-LICENSE‎

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
# FastDoubleParser
2+
3+
This is a Java port of Daniel Lemire's fast_float project.
4+
This project provides parsers for double, float, BigDecimal and BigInteger values.
5+
6+
Copyright (c) Daniel Lemire
7+
8+
Boost Software License - Version 1.0 - August 17th, 2003
9+
10+
Permission is hereby granted, free of charge, to any person or organization
11+
obtaining a copy of the software and accompanying documentation covered by
12+
this license (the "Software") to use, reproduce, display, distribute,
13+
execute, and transmit the Software, and to prepare derivative works of the
14+
Software, and to permit third-parties to whom the Software is furnished to
15+
do so, all subject to the following:
16+
17+
The copyright notices in the Software and this entire statement, including
18+
the above license grant, this restriction and the following disclaimer,
19+
must be included in all copies of the Software, in whole or in part, and
20+
all derivative works of the Software, unless such copies or derivative
21+
works are solely in the form of machine-executable object code generated by
22+
a source language processor.
23+
24+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
25+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
26+
FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
27+
SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
28+
FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
29+
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
30+
DEALINGS IN THE SOFTWARE.
31+
32+
------
33+
Third-party license for
34+
fast_float, Copyright (c) 2021 The fast_float authors. MIT License.
35+
https://github.com/fastfloat/fast_float
36+
https://github.com/fastfloat/fast_float/blob/35d523195bf7d57aba0e735ad6eba1e6f71ba8d6/LICENSE-MIT
37+
38+
MIT License
39+
40+
Copyright (c) 2021 The fast_float authors
41+
42+
Permission is hereby granted, free of charge, to any person obtaining a copy
43+
of this software and associated documentation files (the "Software"), to deal
44+
in the Software without restriction, including without limitation the rights
45+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
46+
copies of the Software, and to permit persons to whom the Software is
47+
furnished to do so, subject to the following conditions:
48+
49+
The above copyright notice and this permission notice shall be included in all
50+
copies or substantial portions of the Software.
51+
52+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
53+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
54+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
55+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
56+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
57+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
58+
SOFTWARE.
59+
------
60+
Third-party license for
61+
bigint, Copyright 2020 Tim Buktu. 2-clause BSD License.
62+
https://github.com/tbuktu/bigint/tree/floatfft
63+
https://github.com/tbuktu/bigint/blob/617c8cd8a7c5e4fb4d919c6a4d11e2586107f029/LICENSE
64+
https://github.com/wrandelshofer/FastDoubleParser/blob/39e123b15b71f29a38a087d16a0bc620fc879aa6/bigint-LICENSE
65+
(We only use those portions of the bigint project that can be licensed under 2-clause BSD License.)
66+
67+
2-clause BSD License
68+
69+
Copyright 2022 Tim Buktu
70+
71+
Redistribution and use in source and binary forms, with or without
72+
modification, are permitted provided that the following conditions
73+
are met:
74+
75+
1. Redistributions of source code must retain the above copyright notice, this
76+
list of conditions and the following disclaimer.
77+
78+
2. Redistributions in binary form must reproduce the above copyright notice,
79+
this list of conditions and the following disclaimer in the documentation
80+
and/or other materials provided with the distribution.
81+
82+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND
83+
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
84+
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
85+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
86+
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
87+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
88+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
89+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
90+
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
91+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

‎src/main/resources/META-INF/Schubfach-LICENSE‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
Copyright 2018-2020 Raffaello Giulietti
2+
3+
Permission is hereby granted, free of charge, to any person obtaining a copy
4+
of this software and associated documentation files (the "Software"), to deal
5+
in the Software without restriction, including without limitation the rights
6+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
7+
copies of the Software, and to permit persons to whom the Software is
8+
furnished to do so, subject to the following conditions:
9+
10+
The above copyright notice and this permission notice shall be included in
11+
all copies or substantial portions of the Software.
12+
13+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
19+
THE SOFTWARE.

‎src/main/resources/META-INF/jackson-core-NOTICE‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,15 @@ under the following copyright.
2828

2929
Copyright © 2023 Werner Randelshofer, Switzerland. MIT License.
3030

31-
See FastDoubleParser-NOTICE for details of other source code included in FastDoubleParser
32-
and the licenses and copyrights that apply to that code.
31+
See FastDoubleParser-LICENSE and also FastDoubleParser-ThirdParty-LICENSE for details of other source code
32+
included in FastDoubleParser and the licenses and copyrights that apply to that code.
33+
34+
## Schubfach
35+
36+
jackson-core bundles a copy of the Schubfach number writing code <https://github.com/c4f7fcce9cb06515/Schubfach>.
37+
That code is available under an MIT license <https://github.com/c4f7fcce9cb06515/Schubfach/blob/master/todec/LICENSE>
38+
under the following copyright.
39+
40+
Copyright 2018-2020 Raffaello Giulietti
41+
42+
See Schubfach-LICENSE.

0 commit comments

Comments
 (0)