Skip to content

Commit 6d7df6f

Browse files
committed
Merge branch '2.15' into 2.16
2 parents ff09928 + fd73cb2 commit 6d7df6f

File tree

3 files changed

+30
-0
lines changed

3 files changed

+30
-0
lines changed

release-notes/VERSION-2.x

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ No changes since 2.15
2323
#999: Gradle metadata for `jackson-core` `2.15.0` adds dependency on
2424
`ch.randelshofer:fastdoubleparser`
2525
(reported by Chris R)
26+
#1003: Add FastDoubleParser section to `NOTICE`
2627

2728
2.15.0 (23-Apr-2023)
2829

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
MIT License
2+
3+
Copyright <YEAR> <COPYRIGHT HOLDER>
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.

src/main/resources/META-INF/NOTICE

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,11 @@ To find the details that apply to this artifact see the accompanying LICENSE fil
1919
A list of contributors may be found from CREDITS(-2.x) file, which is included
2020
in some artifacts (usually source distributions); but is always available
2121
from the source code management (SCM) system project uses.
22+
23+
## FastDoubleParser
24+
25+
jackson-core bundles a shaded copy of FastDoubleParser <https://github.com/wrandelshofer/FastDoubleParser>.
26+
That code is available under an MIT license <https://github.com/wrandelshofer/FastDoubleParser/blob/main/LICENSE>
27+
under the following copyright.
28+
29+
Copyright © 2023 Werner Randelshofer, Switzerland. MIT License.

0 commit comments

Comments
 (0)