Skip to content

Commit

Permalink
Change inclusion of LICENSE slightly (use build-helper-maven-plugin)
Browse files Browse the repository at this point in the history
  • Loading branch information
cowtowncoder committed Nov 3, 2020
1 parent 441c533 commit c04e924
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 16 deletions.
9 changes: 7 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -126,14 +126,19 @@ com.fasterxml.jackson.core.*;version=${project.version}
<artifactId>replacer</artifactId>
</plugin>

<!-- 04-Mar-2019, tatu: Add rudimentary JDK9+ module info. To build with JDK 8
<!-- 04-Mar-2019, tatu: Add rudimentary JDK9+ module info. To build with JDK 8
will have to use `moduleInfoFile` as anything else requires JDK 9+
-->
<plugin>
<groupId>org.moditect</groupId>
<artifactId>moditect-maven-plugin</artifactId>
</plugin>

<!-- 03-Nov-2020, tatu: Add LICENSE from main level -->

This comment has been minimized.

Copy link
@cowtowncoder

cowtowncoder May 18, 2023

Author Member

@pjfanning This is supposed to make main-level LICENSE be included (wrt #1032). So maybe that broke somehow due to other changes? So removal was intentional just to remove duplication.

This comment has been minimized.

Copy link
@pjfanning

pjfanning May 18, 2023

Member

LICENSE is not appearing when I build the jar locally

This comment has been minimized.

Copy link
@cowtowncoder

cowtowncoder May 18, 2023

Author Member

Correct; as per my notes it was working up to and including 2.15.0, must be side-effect of some other added processing.

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
</plugin>

<plugin>
<groupId>de.jjohannes</groupId>
<artifactId>gradle-module-metadata-maven-plugin</artifactId>
Expand Down
1 change: 1 addition & 0 deletions release-notes/VERSION-2.x
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ JSON library.
#639: Limit initial allocated block size by `ByteArrayBuilder` to max block size
#640: Add `JacksonException` as parent class of `JsonProcessingException`
- Deprecate `JsonParser.getCurrentTokenId()` (use `#currentTokenId()` instead)
- Full "LICENSE" included in jar for easier access by compliancy tools

2.11.4 (not yet released)

Expand Down
8 changes: 0 additions & 8 deletions src/main/resources/META-INF/LICENSE

This file was deleted.

9 changes: 3 additions & 6 deletions src/main/resources/META-INF/NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,15 @@
Jackson is a high-performance, Free/Open Source JSON processing library.
It was originally written by Tatu Saloranta ([email protected]), and has
been in development since 2007.
It is currently developed by a community of developers, as well as supported
commercially by FasterXML.com.
It is currently developed by a community of developers.

## Licensing

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

## Credits

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

0 comments on commit c04e924

Please sign in to comment.