Manual merge of fix for #52 for master (pom changes not auto-mergeable)

FasterXML · Mar 27, 2022 · 36ed7d2 · 36ed7d2
1 parent d6d7013
commit 36ed7d2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/base/pom.xml b/base/pom.xml
@@ -43,6 +43,11 @@ NOTE: NOT to be used by components outside of Jackson: application code should o
     <moditect.sourceGroup>${project.groupId}</moditect.sourceGroup>
     <moditect.sourceArtifact>${project.artifactId}</moditect.sourceArtifact>
     <moditect.sourceVersion>${project.version}</moditect.sourceVersion>
+
+    <!-- To fix [jackson-bom#52] need to first use better default version for
+         parent pom, and then also allow override as need be
+      -->
+    <jackson-bom.version>${project.parent.version}</jackson-bom.version>
   </properties>
 
   <dependencies>
@@ -267,7 +272,7 @@ tail?id=66) -->
               <dependency>
                 <groupId>com.fasterxml.jackson</groupId>
                 <artifactId>jackson-bom</artifactId>
-                <version>${project.version}</version>
+                <version>${jackson-bom.version}</version>
               </dependency>
             </platformDependencies>
           </configuration>

diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -11,7 +11,7 @@ Jackson components (core, modules)
 
 2.14.0 (not yet released)
 
-No changes since 2.13
+#52: Gradle reports incorrect jackson-bom dependency version
 
 2.13.2 (not yet released)