diff --git a/pom.xml b/pom.xml index 77e4691de2..797c75bc21 100644 --- a/pom.xml +++ b/pom.xml @@ -126,14 +126,19 @@ com.fasterxml.jackson.core.*;version=${project.version} replacer - org.moditect moditect-maven-plugin - + + + org.codehaus.mojo + build-helper-maven-plugin + + de.jjohannes gradle-module-metadata-maven-plugin diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x index 460e4e80c3..800e26971b 100644 --- a/release-notes/VERSION-2.x +++ b/release-notes/VERSION-2.x @@ -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) diff --git a/src/main/resources/META-INF/LICENSE b/src/main/resources/META-INF/LICENSE deleted file mode 100644 index f5f45d26a4..0000000000 --- a/src/main/resources/META-INF/LICENSE +++ /dev/null @@ -1,8 +0,0 @@ -This copy of Jackson JSON processor streaming parser/generator is licensed under the -Apache (Software) License, version 2.0 ("the License"). -See the License for details about distribution rights, and the -specific rights regarding derivate works. - -You may obtain a copy of the License at: - -http://www.apache.org/licenses/LICENSE-2.0 diff --git a/src/main/resources/META-INF/NOTICE b/src/main/resources/META-INF/NOTICE index 4c976b7b4c..d226e890da 100644 --- a/src/main/resources/META-INF/NOTICE +++ b/src/main/resources/META-INF/NOTICE @@ -3,18 +3,15 @@ Jackson is a high-performance, Free/Open Source JSON processing library. It was originally written by Tatu Saloranta (tatu.saloranta@iki.fi), 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.