From 30c63c637229e11f050721372abc3f9c9d670b66 Mon Sep 17 00:00:00 2001
From: Gili Tzabari <cowwoc2020@gmail.com>
Date: Mon, 12 Oct 2020 11:45:29 -0400
Subject: [PATCH] =?UTF-8?q?Fixed=20optional=20dependencies=20that=20were?=
 =?UTF-8?q?=20marked=20as=20required=20in=20module-in=E2=80=A6=20(#1669)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fixed optional dependencies that were marked as required in module-info.java

* * Upgraded bundle plugin to fix https://issues.apache.org/jira/browse/FELIX-6259.
* Windows requires the use of ${file.separator} to separate classpath entries.

* Need to use a different log4j-slf4j-impl artifact under Java 11.
---
 pom.xml                          | 33 +++++++++++++++++++++-----------
 src/main/java11/module-info.java | 14 +++++++-------
 2 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/pom.xml b/pom.xml
index 11bdf2295..a969cc8e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
 
    <properties>
@@ -10,7 +11,7 @@
       <artifact.classifier />
 
       <docker.maven.plugin.fabric8.version>0.33.0</docker.maven.plugin.fabric8.version>
-      <felix.bundle.plugin.version>4.2.1</felix.bundle.plugin.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>
       <javassist.version>3.24.1-GA</javassist.version>
@@ -23,7 +24,6 @@
       <pax.exam.version>4.13.1</pax.exam.version>
       <pax.url.version>2.5.4</pax.url.version>
       <postgresql.version>42.1.4</postgresql.version>
-      <slf4j.version>1.7.25</slf4j.version>
       <log4j.version>2.11.1</log4j.version>
       <commons.csv.version>1.5</commons.csv.version>
       <h2.version>1.4.196</h2.version>
@@ -78,12 +78,6 @@
          <artifactId>slf4j-api</artifactId>
          <version>${slf4j.version}</version>
       </dependency>
-      <dependency>
-         <groupId>org.apache.logging.log4j</groupId>
-         <artifactId>log4j-slf4j-impl</artifactId>
-         <version>${log4j.version}</version>
-         <scope>test</scope>
-      </dependency>
       <dependency>
          <groupId>org.apache.logging.log4j</groupId>
          <artifactId>log4j-api</artifactId>
@@ -325,7 +319,7 @@
                <executable>java</executable>
                <arguments>
                   <argument>-cp</argument>
-                  <argument>${project.build.outputDirectory}:${maven.compile.classpath}</argument>
+                  <argument>${project.build.outputDirectory}${path.separator}${maven.compile.classpath}</argument>
                   <argument>com.zaxxer.hikari.util.JavassistProxyFactory</argument>
                </arguments>
             </configuration>
@@ -580,7 +574,16 @@
          </activation>
          <properties>
             <automatic.module.name>com.zaxxer.hikari</automatic.module.name>
+            <slf4j.version>1.7.25</slf4j.version>
          </properties>
+         <dependencies>
+            <dependency>
+               <groupId>org.apache.logging.log4j</groupId>
+               <artifactId>log4j-slf4j-impl</artifactId>
+               <version>${log4j.version}</version>
+               <scope>test</scope>
+            </dependency>
+         </dependencies>
       </profile>
       <profile>
          <id>Java11</id>
@@ -594,9 +597,17 @@
                -add-exports java.base/sun.net.www.protocol.http=ALL-UNNAMED
                -add-exports java.base/sun.net.www.protocol.https=ALL-UNNAMED
             </sureFireOptions11 -->
+            <slf4j.version>2.0.0-alpha1</slf4j.version>
             <sureFireForks11>true</sureFireForks11>
          </properties>
-
+         <dependencies>
+            <dependency>
+               <groupId>org.apache.logging.log4j</groupId>
+               <artifactId>log4j-slf4j18-impl</artifactId>
+               <version>${log4j.version}</version>
+               <scope>test</scope>
+            </dependency>
+         </dependencies>
          <build>
             <plugins>
                <plugin>
diff --git a/src/main/java11/module-info.java b/src/main/java11/module-info.java
index 18d3c0551..7cd84c642 100644
--- a/src/main/java11/module-info.java
+++ b/src/main/java11/module-info.java
@@ -1,15 +1,15 @@
 module com.zaxxer.hikari
 {
-   requires hibernate.core;
+   requires static hibernate.core;
    requires java.sql;
    requires java.management;
    requires java.naming;
-   requires javassist;
-   requires simpleclient;
-   requires slf4j.api;
-   requires metrics.core;
-   requires metrics.healthchecks;
-   requires micrometer.core;
+   requires static javassist;
+   requires static simpleclient;
+   requires org.slf4j;
+   requires static metrics.core;
+   requires static metrics.healthchecks;
+   requires static micrometer.core;
 
    exports com.zaxxer.hikari;
    exports com.zaxxer.hikari.hibernate;