Skip to content

Commit 4b79211

Browse files
committed
Improve inclusion mechanism of META-INF/LICENSE a bit
1 parent bdfac7b commit 4b79211

File tree

4 files changed

+9
-14
lines changed

4 files changed

+9
-14
lines changed

pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,11 @@
200200
<groupId>org.moditect</groupId>
201201
<artifactId>moditect-maven-plugin</artifactId>
202202
</plugin>
203+
<!-- 03-Nov-2020, tatu: Add LICENSE from main level -->
204+
<plugin>
205+
<groupId>org.codehaus.mojo</groupId>
206+
<artifactId>build-helper-maven-plugin</artifactId>
207+
</plugin>
203208

204209
<plugin>
205210
<groupId>de.jjohannes</groupId>

release-notes/VERSION-2.x

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ Project: jackson-databind
2929
#2903: Allow preventing "Enum from integer" coercion using new `CoercionConfig` system
3030
#2909: `@JsonValue` not considered when evaluating inclusion
3131
(reported by chrylis@github)
32+
- Full "LICENSE" included in jar for easier access by compliancy tools
3233

3334
2.12.0-rc1 (12-Oct-2020)
3435

src/main/resources/META-INF/LICENSE

Lines changed: 0 additions & 8 deletions
This file was deleted.

src/main/resources/META-INF/NOTICE

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,15 @@
33
Jackson is a high-performance, Free/Open Source JSON processing library.
44
It was originally written by Tatu Saloranta ([email protected]), and has
55
been in development since 2007.
6-
It is currently developed by a community of developers, as well as supported
7-
commercially by FasterXML.com.
6+
It is currently developed by a community of developers.
87

98
## Licensing
109

11-
Jackson core and extension components may be licensed under different licenses.
10+
Jackson 2.x core and extension components are licensed under Apache License 2.0
1211
To find the details that apply to this artifact see the accompanying LICENSE file.
13-
For more information, including possible other licensing options, contact
14-
FasterXML.com (http://fasterxml.com).
1512

1613
## Credits
1714

18-
A list of contributors may be found from CREDITS file, which is included
15+
A list of contributors may be found from CREDITS(-2.x) file, which is included
1916
in some artifacts (usually source distributions); but is always available
2017
from the source code management (SCM) system project uses.

0 commit comments

Comments
 (0)