From 99d7a4e4b4ac8d41accd08ccf380abd37111305a Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Fri, 19 Feb 2021 09:43:56 +1300
Subject: [PATCH] Tidy up pom jackson dependency versions (all optional
 dependencies) and bump to 2.12.1

---
 ebean-api/pom.xml       | 9 ++-------
 ebean-core-type/pom.xml | 7 +------
 ebean-core/pom.xml      | 9 ++-------
 ebean-postgis/pom.xml   | 3 +--
 ebean-test/pom.xml      | 8 ++------
 pom.xml                 | 1 +
 6 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 80d8db37a..dc2bd347e 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -11,11 +11,6 @@
   <description>ebean api</description>
   <artifactId>ebean-api</artifactId>
 
-  <properties>
-    <jackson-core.version>2.11.3</jackson-core.version>
-    <jackson-databind.version>2.11.3</jackson-databind.version>
-  </properties>
-
   <dependencies>
 
     <!--
@@ -74,7 +69,7 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
-      <version>${jackson-core.version}</version>
+      <version>${jackson.version}</version>
       <optional>true</optional>
     </dependency>
 
@@ -82,7 +77,7 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>${jackson-databind.version}</version>
+      <version>${jackson.version}</version>
       <optional>true</optional>
     </dependency>
 
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index 56aebbb2c..36e38b2da 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -11,11 +11,6 @@
   <name>ebean core type</name>
   <description>ebean scalar types api</description>
 
-  <properties>
-    <jackson-core.version>2.11.3</jackson-core.version>
-    <jackson-databind.version>2.11.3</jackson-databind.version>
-  </properties>
-
   <dependencies>
 
     <dependency>
@@ -27,7 +22,7 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
-      <version>${jackson-core.version}</version>
+      <version>${jackson.version}</version>
       <optional>true</optional>
     </dependency>
 
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index dcdad1b0e..e335e97c3 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -18,11 +18,6 @@
     <tag>ebean-parent-12.6.5</tag>
   </scm>
 
-  <properties>
-    <jackson-core.version>2.11.3</jackson-core.version>
-    <jackson-databind.version>2.11.3</jackson-databind.version>
-  </properties>
-
   <profiles>
     <profile>
       <!-- Note: to use this profile, you need to download manually the db2jcc4 driver.
@@ -163,14 +158,14 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
-      <version>${jackson-core.version}</version>
+      <version>${jackson.version}</version>
       <optional>true</optional>
     </dependency>
 
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>${jackson-databind.version}</version>
+      <version>${jackson.version}</version>
       <optional>true</optional>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index 0e6936d14..61271ef1f 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -15,7 +15,6 @@
 
   <properties>
     <postgis.jdbc.version>2.2.1</postgis.jdbc.version>
-    <jackson-core.version>2.11.3</jackson-core.version>
   </properties>
 
   <dependencies>
@@ -31,7 +30,7 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
-      <version>${jackson-core.version}</version>
+      <version>${jackson.version}</version>
       <optional>true</optional>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index caef82218..420986916 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -12,10 +12,6 @@
   <description>Testing support for Ebean</description>
   <artifactId>ebean-test</artifactId>
 
-  <properties>
-    <jackson-databind.version>2.11.3</jackson-databind.version>
-  </properties>
-
   <dependencies>
 
     <dependency>
@@ -47,14 +43,14 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>${jackson-databind.version}</version>
+      <version>${jackson.version}</version>
       <optional>true</optional>
     </dependency>
 
     <dependency>
       <groupId>com.fasterxml.jackson.datatype</groupId>
       <artifactId>jackson-datatype-jsr310</artifactId>
-      <version>${jackson-databind.version}</version>
+      <version>${jackson.version}</version>
       <optional>true</optional>
     </dependency>
 
diff --git a/pom.xml b/pom.xml
index 88954f378..12b4d3540 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,6 +40,7 @@
   <properties>
     <nexus.staging.autoReleaseAfterClose>false</nexus.staging.autoReleaseAfterClose>
     <ebean-datasource.version>7.0</ebean-datasource.version>
+    <jackson.version>2.12.1</jackson.version>
   </properties>
 
   <dependencies>