From 8217f2082d884f878c8d245dae19ca28dce5577d Mon Sep 17 00:00:00 2001
From: Prashant Bhat <prashant.mr@gmail.com>
Date: Thu, 15 Oct 2020 19:42:07 +0800
Subject: [PATCH] #1582: update module-info to mark optional dependencies as
 'static' (#1587)

* #1582: update module-info to mark optional dependencies as 'static'

* update to hibernate.core release 5.4.16.Final and use its module name

Co-authored-by: Brett Wooldridge <brett.wooldridge@gmail.com>
---
 pom.xml                          | 4 ++--
 src/main/java11/module-info.java | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index a969cc8e..c31840a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
       <docker.maven.plugin.fabric8.version>0.33.0</docker.maven.plugin.fabric8.version>
       <felix.bundle.plugin.version>5.1.1</felix.bundle.plugin.version>
       <felix.version>6.0.1</felix.version>
-      <hibernate.version>5.2.10.Final</hibernate.version>
+      <hibernate.version>5.4.16.Final</hibernate.version>
       <javassist.version>3.24.1-GA</javassist.version>
       <jndi.version>0.11.4.1</jndi.version>
       <maven.release.version>2.5.3</maven.release.version>
@@ -574,7 +574,7 @@
          </activation>
          <properties>
             <automatic.module.name>com.zaxxer.hikari</automatic.module.name>
-            <slf4j.version>1.7.25</slf4j.version>
+            <slf4j.version>1.7.30</slf4j.version>
          </properties>
          <dependencies>
             <dependency>
diff --git a/src/main/java11/module-info.java b/src/main/java11/module-info.java
index 7cd84c64..c0fe5b5a 100644
--- a/src/main/java11/module-info.java
+++ b/src/main/java11/module-info.java
@@ -1,12 +1,12 @@
 module com.zaxxer.hikari
 {
-   requires static hibernate.core;
    requires java.sql;
    requires java.management;
    requires java.naming;
+   requires org.slf4j;
+   requires static org.hibernate.orm.core;
    requires static javassist;
    requires static simpleclient;
-   requires org.slf4j;
    requires static metrics.core;
    requires static metrics.healthchecks;
    requires static micrometer.core;