Merge branch '2.11' into 2.12

cowtowncoder · cowtowncoder · commit 86684ee7c5cf · 2020-12-08T19:02:48.000-08:00
diff --git a/eclipse-collections/src/main/resources/META-INF/LICENSE b/eclipse-collections/src/main/resources/META-INF/LICENSE
@@ -0,0 +1,8 @@
+This copy of Jackson JSON processor `jackson-datatype-eclipse-collections` module 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/eclipse-collections/src/main/resources/META-INF/services/com.fasterxml.jackson.databind.Module b/eclipse-collections/src/main/resources/META-INF/services/com.fasterxml.jackson.databind.Module
@@ -0,0 +1 @@
+com.fasterxml.jackson.datatype.eclipsecollections.EclipseCollectionsModule
diff --git a/guava/src/main/resources/META-INF/LICENSE b/guava/src/main/resources/META-INF/LICENSE
@@ -0,0 +1,8 @@
+This copy of Jackson JSON processor `jackson-datatype-guava` module 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/hppc/src/main/resources/META-INF/LICENSE b/hppc/src/main/resources/META-INF/LICENSE
@@ -1,4 +1,4 @@
-This copy of Jackson JSON processor streaming parser/generator is licensed under the
+This copy of Jackson JSON processor `jackson-datatype-hppc` module 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.
diff --git a/pcollections/src/main/resources/META-INF/LICENSE b/pcollections/src/main/resources/META-INF/LICENSE
@@ -1,4 +1,4 @@
-This copy of Jackson JSON processor streaming parser/generator is licensed under the
+This copy of Jackson JSON processor `jackson-datatype-pcollections` module 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.
diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -25,7 +25,12 @@ Active Maintainers:
 - Add Gradle Module Metadata (https://blog.gradle.org/alignment-with-gradle-module-metadata)
 - Update "preferred" Guava version to 21.0
 
-2.11.3 (not yet released)
+2.11.4 (not yet released)
+
+* Add missing "LICENSE" file for Guava- and Eclipse-collections modules
+* Add missing SPI metadata for auto-detecti Eclipse-collections module
+
+2.11.3 (02-Oct-2020)
 
 #71 (eclipse-collections) Can not deserialize concrete class instance inside nested
   immutable eclipse-collection

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+com.fasterxml.jackson.datatype.eclipsecollections.EclipseCollectionsModule`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-This copy of Jackson JSON processor streaming parser/generator is licensed under the`
	`1`	+This copy of Jackson JSON processor `jackson-datatype-hppc` module is licensed under the
`2`	`2`	`Apache (Software) License, version 2.0 ("the License").`
`3`	`3`	`See the License for details about distribution rights, and the`
`4`	`4`	`specific rights regarding derivate works.`