Skip to content

Commit e9abe20

Browse files
committed
Merge branch '2.14' into 2.15
2 parents c6ce275 + 9443add commit e9abe20

File tree

5 files changed

+5
-5
lines changed
  • avro/src/main/resources/META-INF
  • cbor/src/main/resources/META-INF
  • ion/src/main/resources/META-INF
  • protobuf/src/main/resources/META-INF
  • smile/src/main/resources/META-INF

5 files changed

+5
-5
lines changed

avro/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 Avro 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

cbor/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 CBOR 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

ion/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 Ion 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

protobuf/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 Protobuf 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

smile/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 Smile 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

0 commit comments

Comments
 (0)