Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed optional dependencies that were marked as required in module-in… #1669

Merged
merged 3 commits into from Oct 12, 2020
Merged

Fixed optional dependencies that were marked as required in module-in… #1669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c8ac85
Fixed optional dependencies that were marked as required in module-in…
cowwoc Oct 11, 2020
2691416
* Upgraded bundle plugin to fix https://issues.apache.org/jira/browse…
cowwoc Oct 11, 2020
f88dcc6
Need to use a different log4j-slf4j-impl artifact under Java 11.
cowwoc Oct 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
33 changes: 22 additions & 11 deletions pom.xml
View file
Open in desktop
@@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down
14 changes: 7 additions & 7 deletions src/main/java11/module-info.java
View file
Open in desktop
@@ -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;
Expand Down