Skip to content

Commit

Permalink
Merge pull request #19 from idrsolutions/task/java-17
Browse files Browse the repository at this point in the history
Java 17 & Modules
  • Loading branch information
Amy1612 authored Oct 9, 2024
2 parents bfc3fc2 + e062405 commit 4965656
Show file tree
Hide file tree
Showing 3 changed files with 111 additions and 12 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ You can then add this plugin into your pom as a dependency.
<dependency>
<groupId>com.idrsolutions</groupId>
<artifactId>jdeli-imageio</artifactId>
<version>1.0</version>
<version>3.0</version>
</dependency>
</dependencies>
```
Expand Down
43 changes: 32 additions & 11 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>com.idrsolutions</groupId>
<artifactId>jdeli-imageio${profile.identifier}</artifactId>
<version>2.0</version>
<version>3.0</version>
<packaging>jar</packaging>

<dependencies>
Expand All @@ -22,34 +22,34 @@
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh-external</artifactId>
<version>2.12</version>
<version>3.5.3</version>
</extension>
</extensions>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<version>3.13.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.7</version>
<version>3.1.3</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.16.0</version>
<version>2.17.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.0</version>
<version>3.4.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.1</version>
<version>3.6.0</version>
<executions>
<execution>
<phase>package</phase>
Expand All @@ -75,21 +75,42 @@
</execution>
</executions>
</plugin>

<plugin>
<!-- We don't want to deal with module info needing to be compiled in the context of the
packages, so this plugin sorts it for us -->
<groupId>org.moditect</groupId>
<artifactId>moditect-maven-plugin</artifactId>
<version>1.2.2.Final</version>
<executions>
<execution>
<id>add-module-info</id>
<phase>package</phase>
<goals>
<goal>add-module-info</goal>
</goals>
</execution>
</executions>
<configuration>
<overwriteExistingFiles>true</overwriteExistingFiles>
<module>
<moduleInfoFile>src/main/java-modules/module-info.java</moduleInfoFile>
</module>
</configuration>
</plugin>
</plugins>
<finalName>${finalName}-${project.version}</finalName>
</build>

<properties>
<finalName>${project.artifactId}</finalName>
<depVersion>2024.08</depVersion>
<depVersion>2024.10</depVersion>
<depArtifact>jdeli</depArtifact>

<!--An identifier used to change the artifactID for the daily, trial, and trial daily builds-->
<!--suppress CheckTagEmptyBody -->
<profile.identifier></profile.identifier>

<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.release>17</maven.compiler.release>
</properties>

<profiles>
Expand Down
78 changes: 78 additions & 0 deletions src/main/java-modules/module-info.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
module com.idrsolutions.jdeli_imageio_plugin {
requires java.desktop;

exports com.idrsolutions;

exports com.idrsolutions.image;
exports com.idrsolutions.image.bmp;
exports com.idrsolutions.image.bmp.options;
exports com.idrsolutions.image.dicom;
exports com.idrsolutions.image.dicom.options;
exports com.idrsolutions.image.emf;
exports com.idrsolutions.image.emf.options;
exports com.idrsolutions.image.encoder;
exports com.idrsolutions.image.encoder.options;
exports com.idrsolutions.image.gif;
exports com.idrsolutions.image.gif.options;
exports com.idrsolutions.image.heic;
exports com.idrsolutions.image.heic.options;
exports com.idrsolutions.image.ico;
exports com.idrsolutions.image.jpeg;
exports com.idrsolutions.image.jpeg.options;
exports com.idrsolutions.image.jpeg2000;
exports com.idrsolutions.image.jpeg2000.options;
exports com.idrsolutions.image.jpeglossless;
exports com.idrsolutions.image.metadata;
exports com.idrsolutions.image.metadata.ifd;
exports com.idrsolutions.image.pdf;
exports com.idrsolutions.image.pdf.options;
exports com.idrsolutions.image.png;
exports com.idrsolutions.image.png.options;
exports com.idrsolutions.image.process;
exports com.idrsolutions.image.psd;
exports com.idrsolutions.image.psd.options;
exports com.idrsolutions.image.scale;
exports com.idrsolutions.image.sgi;
exports com.idrsolutions.image.sgi.options;
exports com.idrsolutions.image.tiff;
exports com.idrsolutions.image.tiff.options;
exports com.idrsolutions.image.utility;
exports com.idrsolutions.image.webp;
exports com.idrsolutions.image.webp.options;
exports com.idrsolutions.image.wmf;
exports com.idrsolutions.image.wmf.options;

exports com.idrsolutions.image.tika;

exports com.idrsolutions.imageio;

exports org.jpedal.utils;

provides javax.imageio.spi.ImageReaderSpi with
com.idrsolutions.BMPImageReaderSpi,
com.idrsolutions.DICOMImageReaderSpi,
com.idrsolutions.EMFImageReaderSpi,
com.idrsolutions.GIFImageReaderSpi,
com.idrsolutions.HEICImageReaderSpi,
com.idrsolutions.JDeliImageReaderSpi,
com.idrsolutions.JPEG2000ImageReaderSpi,
com.idrsolutions.JPEGImageReaderSpi,
com.idrsolutions.JPEGXLImageReaderSpi,
com.idrsolutions.PNGImageReaderSpi,
com.idrsolutions.PSDImageReaderSpi,
com.idrsolutions.SGIImageReaderSpi,
com.idrsolutions.TIFFImageReaderSpi,
com.idrsolutions.WEBPImageReaderSpi,
com.idrsolutions.WMFImageReaderSpi;

provides javax.imageio.spi.ImageWriterSpi with
com.idrsolutions.BMPImageWriterSpi,
com.idrsolutions.HEICImageWriterSpi,
com.idrsolutions.JDeliImageWriterSpi,
com.idrsolutions.JPEG2000ImageWriterSpi,
com.idrsolutions.JPEGImageWriterSpi,
com.idrsolutions.PDFImageWriterSpi,
com.idrsolutions.PNGImageWriterSpi,
com.idrsolutions.TIFFImageWriterSpi,
com.idrsolutions.WEBPImageWriterSpi;
}

0 comments on commit 4965656

Please sign in to comment.