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.

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

Fixes #344 - jlink complains about openpdf being an automatic module #395

Merged
merged 3 commits into from
Sep 9, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions openpdf/src/main/java9/module-info.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
module com.github.librepdf.openpdf {
requires static org.bouncycastle.pkix;
requires static org.bouncycastle.provider;
requires static com.github.spotbugs.spotbugs;
requires static imageio.tiff;
requires static fop;
requires static xmlgraphics.commons;

exports com.lowagie.bouncycastle;
exports com.lowagie.text;
exports com.lowagie.text.alignment;
exports com.lowagie.text.error_messages;
exports com.lowagie.text.exceptions;
exports com.lowagie.text.factories;
exports com.lowagie.text.html;
exports com.lowagie.text.html.simpleparser;
exports com.lowagie.text.pdf;
exports com.lowagie.text.pdf.codec;
exports com.lowagie.text.pdf.codec.wmf;
exports com.lowagie.text.pdf.collection;
exports com.lowagie.text.pdf.crypto;
exports com.lowagie.text.pdf.draw;
exports com.lowagie.text.pdf.events;
exports com.lowagie.text.pdf.fonts;
exports com.lowagie.text.pdf.fonts.cmaps;
exports com.lowagie.text.pdf.hyphenation;
exports com.lowagie.text.pdf.interfaces;
exports com.lowagie.text.pdf.internal;
exports com.lowagie.text.pdf.parser;
exports com.lowagie.text.utils;
exports com.lowagie.text.xml;
exports com.lowagie.text.xml.simpleparser;
exports com.lowagie.text.xml.xmp;
}
16 changes: 16 additions & 0 deletions pdf-swing/src/main/java9/module-info.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
module com.github.librepdf.pdfSwing {
requires com.github.librepdf.openpdf;
requires dom4j;
requires pdf.renderer;

exports com.lowagie.rups;
exports com.lowagie.rups.controller;
exports com.lowagie.rups.io;
exports com.lowagie.rups.io.filters;
exports com.lowagie.rups.model;
exports com.lowagie.rups.view;
exports com.lowagie.rups.view.icons;
exports com.lowagie.rups.view.itext;
exports com.lowagie.rups.view.itext.treenodes;
exports com.lowagie.rups.view.models;
}
13 changes: 13 additions & 0 deletions pdf-toolbox/src/main/java9/module-info.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
module com.github.librepdf.pdfToolbox {
requires com.github.librepdf.openpdf;
requires jfreechart;
requires jcommon;

exports com.lowagie.toolbox;
exports com.lowagie.toolbox.arguments;
exports com.lowagie.toolbox.arguments.filters;
exports com.lowagie.toolbox.plugins;
exports com.lowagie.toolbox.plugins.watermarker;
exports com.lowagie.toolbox.swing;
exports com.lowagie.tools;
}
34 changes: 33 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
<manifestEntries>
<Automatic-Module-Name>${java-module-name}</Automatic-Module-Name>
<Multi-Release>true</Multi-Release>
</manifestEntries>
</archive>
</configuration>
Expand Down Expand Up @@ -279,7 +280,38 @@
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>jdk9</id>
<activation>
<jdk>[9,)</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven.compiler.plugin.version}</version>
<executions>
<execution>
<id>compile-java-9</id>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<release>9</release>
<compileSourceRoots>
<compileSourceRoot>${project.basedir}/src/main/java9</compileSourceRoot>
</compileSourceRoots>
<multiReleaseOutput>true</multiReleaseOutput>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<dependencyManagement>
<dependencies>
<dependency>
Expand Down