Skip to content

Commit 744ef2a

Browse files
committed
Merge branch '2.14' into 2.15
2 parents 9f2c351 + 019f6c9 commit 744ef2a

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

src/main/resources/META-INF/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
This copy of Jackson JSON processor XML module is licensed under the
22
Apache (Software) License, version 2.0 ("the License").
33
See the License for details about distribution rights, and the
4-
specific rights regarding derivate works.
4+
specific rights regarding derivative works.
55

66
You may obtain a copy of the License at:
77

src/main/resources/META-INF/NOTICE

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ It was originally written by Tatu Saloranta ([email protected]), and has
55
been in development since 2007.
66
It is currently developed by a community of developers.
77

8+
## Copyright
9+
10+
Copyright 2007-, Tatu Saloranta ([email protected])
11+
812
## Licensing
913

1014
Jackson components are licensed under Apache (Software) License, version 2.0,

0 commit comments

Comments
 (0)