Skip to content

Commit c04e924

Browse files
committed
Change inclusion of LICENSE slightly (use build-helper-maven-plugin)
1 parent 441c533 commit c04e924

File tree

4 files changed

+11
-16
lines changed

4 files changed

+11
-16
lines changed

pom.xml

+7-2
Original file line numberDiff line numberDiff line change
@@ -126,14 +126,19 @@ com.fasterxml.jackson.core.*;version=${project.version}
126126
<artifactId>replacer</artifactId>
127127
</plugin>
128128

129-
<!-- 04-Mar-2019, tatu: Add rudimentary JDK9+ module info. To build with JDK 8
129+
<!-- 04-Mar-2019, tatu: Add rudimentary JDK9+ module info. To build with JDK 8
130130
will have to use `moduleInfoFile` as anything else requires JDK 9+
131131
-->
132132
<plugin>
133133
<groupId>org.moditect</groupId>
134134
<artifactId>moditect-maven-plugin</artifactId>
135135
</plugin>
136-
136+
<!-- 03-Nov-2020, tatu: Add LICENSE from main level -->
137+
<plugin>
138+
<groupId>org.codehaus.mojo</groupId>
139+
<artifactId>build-helper-maven-plugin</artifactId>
140+
</plugin>
141+
137142
<plugin>
138143
<groupId>de.jjohannes</groupId>
139144
<artifactId>gradle-module-metadata-maven-plugin</artifactId>

release-notes/VERSION-2.x

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ JSON library.
2929
#639: Limit initial allocated block size by `ByteArrayBuilder` to max block size
3030
#640: Add `JacksonException` as parent class of `JsonProcessingException`
3131
- Deprecate `JsonParser.getCurrentTokenId()` (use `#currentTokenId()` instead)
32+
- Full "LICENSE" included in jar for easier access by compliancy tools
3233

3334
2.11.4 (not yet released)
3435

src/main/resources/META-INF/LICENSE

-8
This file was deleted.

src/main/resources/META-INF/NOTICE

+3-6
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 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)