Merge branch '2.16'

FasterXML · Oct 16, 2023 · 1eeaecf · 1eeaecf
2 parents 269a6d9 + 1122721
commit 1eeaecf
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,7 +8,7 @@ syntax: glob
 .DS_Store
 
 # building
-/target
+target
 .mvn/wrapper/maven-wrapper.jar
 
 # Eclipse

diff --git a/pcollections/src/moditect/module-info.java b/pcollections/src/moditect/module-info.java
@@ -1,7 +1,7 @@
 module jackson.datatype.pcollections {
     requires tools.jackson.core;
     requires tools.jackson.databind;
-    requires pcollections;
+    requires org.pcollections;
 
     exports tools.jackson.datatype.pcollections;
     exports tools.jackson.datatype.pcollections.deser;

diff --git a/release-notes/CREDITS-2.x b/release-notes/CREDITS-2.x
@@ -110,6 +110,10 @@ Joo Hyuk Kim (JooHyukKim@github)
    without explicit deserializer
   (2.16.0)
 
+Ethan McCue (@bowbahdoe)
+  * Reported #122: PCollections module info (`module-info.class`) incorrect
+   (2.15.4)
+
 Wolff Bock von Wülfingen (wlfbck@github)
   * Reported #90: Cache Serialization serializes empty contents
    (2.16.0)
diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -26,6 +26,8 @@ Active Maintainers:
  (contributed by Joo-Hyuk K)
 #117: (guava) `ImmutableRangeSet` fails to deserialize without explicit deserializer
  (contributed by Joo-Hyuk K)
+#122: PCollections module info (`module-info.class`) incorrect
+ (reported by Ethan M)
 
 2.15.3 (12-Oct-2023)
 2.15.2 (30-May-2023)