From 674150dc755fda7d82c839d8437c3d774670344b Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 2 Sep 2022 10:50:23 +1200
Subject: [PATCH] Minor dependency bump for jackson, assertj-core, joda-time,
 h2database

---
 ebean-core/pom.xml                             | 13 ++++++-------
 ebean-core/src/main/java/module-info.java      |  2 +-
 ebean-joda-time/pom.xml                        |  2 +-
 ebean-querybean/pom.xml                        |  2 +-
 ebean-querybean/src/main/java/module-info.java |  2 +-
 ebean-test/pom.xml                             |  4 ++--
 ebean-test/src/main/java/module-info.java      |  1 -
 pom.xml                                        |  4 ++--
 8 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 75cab30f2..b0dfed881 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -19,6 +19,11 @@
   </scm>
 
   <dependencies>
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-api</artifactId>
+      <version>13.9.2-SNAPSHOT</version>
+    </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
@@ -38,12 +43,6 @@
       <version>${ebean-migration-auto.version}</version>
     </dependency>
 
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-api</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
-    </dependency>
-
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
@@ -106,7 +105,7 @@
     <dependency>
       <groupId>joda-time</groupId>
       <artifactId>joda-time</artifactId>
-      <version>2.9.7</version>
+      <version>2.11.1</version>
       <optional>true</optional>
     </dependency>
 
diff --git a/ebean-core/src/main/java/module-info.java b/ebean-core/src/main/java/module-info.java
index 73c0e92f4..ee9ba85ea 100644
--- a/ebean-core/src/main/java/module-info.java
+++ b/ebean-core/src/main/java/module-info.java
@@ -37,7 +37,7 @@ module io.ebean.core {
   requires static java.naming;
   requires static java.validation;
   requires static org.postgresql.jdbc;
-  requires static joda.time;
+  requires static org.joda.time;
 
   exports io.ebeaninternal.server.cache;
 
diff --git a/ebean-joda-time/pom.xml b/ebean-joda-time/pom.xml
index a8ce19836..eb5a70fcd 100644
--- a/ebean-joda-time/pom.xml
+++ b/ebean-joda-time/pom.xml
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>joda-time</groupId>
       <artifactId>joda-time</artifactId>
-      <version>2.11.0</version>
+      <version>2.11.1</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 8d061fe1a..70294328f 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -41,7 +41,7 @@
     <dependency>
       <groupId>joda-time</groupId>
       <artifactId>joda-time</artifactId>
-      <version>1.6</version>
+      <version>2.11.1</version>
       <optional>true</optional>
     </dependency>
 
diff --git a/ebean-querybean/src/main/java/module-info.java b/ebean-querybean/src/main/java/module-info.java
index b45c04c57..b82ec244a 100644
--- a/ebean-querybean/src/main/java/module-info.java
+++ b/ebean-querybean/src/main/java/module-info.java
@@ -5,7 +5,7 @@ module io.ebean.querybean {
   requires io.ebean.api;
   requires io.ebean.core;
   requires static io.ebean.types;
-  requires static joda.time;
+  requires static org.joda.time;
   requires static io.avaje.jsr305x;
 
 }
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index ef67e4bf1..74eaaa1d4 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>
-      <version>3.22.0</version>
+      <version>3.23.1</version>
     </dependency>
 
     <!-- Including JAXB for DB Migration generation with Java 11+ -->
@@ -155,7 +155,7 @@
     <dependency>
       <groupId>joda-time</groupId>
       <artifactId>joda-time</artifactId>
-      <version>2.11.0</version>
+      <version>2.11.1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/src/main/java/module-info.java b/ebean-test/src/main/java/module-info.java
index 823483a0e..428c3b3f4 100644
--- a/ebean-test/src/main/java/module-info.java
+++ b/ebean-test/src/main/java/module-info.java
@@ -23,7 +23,6 @@ module io.ebean.test {
   requires transitive com.h2database;
 
   // support testing
-  requires static org.slf4j;
   requires static org.junit.jupiter.api;
   requires static jdk.management;
   requires static io.avaje.jsr305x;
diff --git a/pom.xml b/pom.xml
index 09ccf9b12..3fdfe8f71 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,8 +39,8 @@
 
   <properties>
     <nexus.staging.autoReleaseAfterClose>false</nexus.staging.autoReleaseAfterClose>
-    <jackson.version>2.13.2</jackson.version>
-    <h2database.version>2.1.212</h2database.version>
+    <jackson.version>2.13.3</jackson.version>
+    <h2database.version>2.1.214</h2database.version>
     <ebean-persistence-api.version>3.0</ebean-persistence-api.version>
     <ebean-types.version>3.0</ebean-types.version>
     <ebean-annotation.version>8.2</ebean-annotation.version>