* Add `module-info.java` and depend on modularized JavaCPP Presets t…

…o comply with JPMS
bytedeco · Mar 3, 2019 · b1c373b4d1291a9fe4bca945e919f3f7a2b6e7f9 · b1c373b
1 parent d15c669
commit b1c373b4d1291a9fe4bca945e919f3f7a2b6e7f9
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ dist: trusty
 sudo: false
 language: java
 jdk:
-  
-  - oraclejdk8
+  
+  - oraclejdk9
 cache:
  directories:
    - $HOME/.m2

diff --git a/platform/pom.xml b/platform/pom.xml
@@ -6,7 +6,7 @@
  <parent>
    <groupId>org.bytedeco</groupId>
    <artifactId>javacpp-presets</artifactId>
-  
-    <version>1.4.5-SNAPSHOT</version>
+  
+    <version>1.5-SNAPSHOT</version>
    <relativePath></relativePath>
  </parent>
@@ -26,62 +26,62 @@
    </dependency>
    <dependency>
-  
-      <groupId>org.bytedeco.javacpp-presets</groupId>
+  
+      <groupId>org.bytedeco</groupId>
      <artifactId>opencv-platform</artifactId>
      <version>4.0.1-${javacpp.version}</version>
    </dependency>
    <dependency>
-  
-      <groupId>org.bytedeco.javacpp-presets</groupId>
+  
+      <groupId>org.bytedeco</groupId>
      <artifactId>ffmpeg-platform</artifactId>
      <version>4.1.1-${javacpp.version}</version>
    </dependency>
    <dependency>
-  
-      <groupId>org.bytedeco.javacpp-presets</groupId>
+  
+      <groupId>org.bytedeco</groupId>
      <artifactId>flycapture-platform</artifactId>
      <version>2.13.3.31-${javacpp.version}</version>
    </dependency>
    <dependency>
-  
-      <groupId>org.bytedeco.javacpp-presets</groupId>
+  
+      <groupId>org.bytedeco</groupId>
      <artifactId>libdc1394-platform</artifactId>
      <version>2.2.5-${javacpp.version}</version>
    </dependency>
    <dependency>
-  
-      <groupId>org.bytedeco.javacpp-presets</groupId>
+  
+      <groupId>org.bytedeco</groupId>
      <artifactId>libfreenect-platform</artifactId>
      <version>0.5.7-${javacpp.version}</version>
    </dependency>
    <dependency>
-  
-      <groupId>org.bytedeco.javacpp-presets</groupId>
+  
+      <groupId>org.bytedeco</groupId>
      <artifactId>libfreenect2-platform</artifactId>
      <version>0.2.0-${javacpp.version}</version>
    </dependency>
    <dependency>
-  
-      <groupId>org.bytedeco.javacpp-presets</groupId>
+  
+      <groupId>org.bytedeco</groupId>
      <artifactId>librealsense-platform</artifactId>
      <version>1.12.1-${javacpp.version}</version>
    </dependency>
    <dependency>
-  
-      <groupId>org.bytedeco.javacpp-presets</groupId>
+  
+      <groupId>org.bytedeco</groupId>
      <artifactId>videoinput-platform</artifactId>
      <version>0.200-${javacpp.version}</version>
    </dependency>
    <dependency>
-  
-      <groupId>org.bytedeco.javacpp-presets</groupId>
+  
+      <groupId>org.bytedeco</groupId>
      <artifactId>artoolkitplus-platform</artifactId>
      <version>2.3.1-${javacpp.version}</version>
    </dependency>
    <dependency>
-  
-      <groupId>org.bytedeco.javacpp-presets</groupId>
+  
+      <groupId>org.bytedeco</groupId>
      <artifactId>flandmark-platform</artifactId>
      <version>1.07-${javacpp.version}</version>
    </dependency>
    <dependency>
-  
-      <groupId>org.bytedeco.javacpp-presets</groupId>
+  
+      <groupId>org.bytedeco</groupId>
      <artifactId>leptonica-platform</artifactId>
      <version>1.77.0-${javacpp.version}</version>
    </dependency>
    <dependency>
-  
-      <groupId>org.bytedeco.javacpp-presets</groupId>
+  
+      <groupId>org.bytedeco</groupId>
      <artifactId>tesseract-platform</artifactId>
      <version>4.0.0-${javacpp.version}</version>
    </dependency>
@@ -156,4 +156,79 @@
    </plugins>
  </build>
+  
+  <profiles>
+  
+    <!-- If we have at least Java 9, compile module-info.class as well and create a multi-release JAR -->
+  
+    <profile>
+  
+      <id>module-java9-enable</id>
+  
+      <activation>
+  
+        <jdk>[9,)</jdk>
+  
+      </activation>
+  
+      <build>
+  
+        <plugins>
+  
+          <plugin>
+  
+            <artifactId>maven-compiler-plugin</artifactId>
+  
+            <executions>
+  
+              <execution>
+  
+                <id>java9</id>
+  
+                <phase>compile</phase>
+  
+                <goals>
+  
+                  <goal>compile</goal>
+  
+                </goals>
+  
+                <configuration>
+  
+                  <source>9</source>
+  
+                  <target>9</target>
+  
+                  <compileSourceRoots>
+  
+                    <compileSourceRoot>${project.basedir}/src/main/java9</compileSourceRoot>
+  
+                  </compileSourceRoots>
+  
+                </configuration>
+  
+              </execution>
+  
+            </executions>
+  
+          </plugin>
+  
+          <!-- Copy module-info.class into META-INF and make sure to exclude the original from the JAR file -->
+  
+          <plugin>
+  
+            <artifactId>maven-resources-plugin</artifactId>
+  
+            <executions>
+  
+              <execution>
+  
+                <id>java9</id>
+  
+                <phase>prepare-package</phase>
+  
+                <goals>
+  
+                  <goal>copy-resources</goal>
+  
+                </goals>
+  
+                <configuration>
+  
+                  <outputDirectory>${project.build.outputDirectory}/META-INF/versions/9</outputDirectory>
+  
+                  <resources>
+  
+                    <resource>
+  
+                      <directory>${project.build.outputDirectory}</directory>
+  
+                      <includes>
+  
+                        <include>module-info.class</include>
+  
+                      </includes>
+  
+                    </resource>
+  
+                  </resources>
+  
+                </configuration>
+  
+              </execution>
+  
+            </executions>
+  
+          </plugin>
+  
+          <plugin>
+  
+            <artifactId>maven-jar-plugin</artifactId>
+  
+            <executions>
+  
+              <execution>
+  
+                <id>default-jar</id>
+  
+                <configuration>
+  
+                  <archive>
+  
+                    <manifestEntries>
+  
+                      <Multi-Release>true</Multi-Release>
+  
+                    </manifestEntries>
+  
+                  </archive>
+  
+                  <includes>
+  
+                    <include>META-INF/versions/9/module-info.class</include>
+  
+                  </includes>
+  
+                </configuration>
+  
+              </execution>
+  
+            </executions>
+  
+          </plugin>
+  
+        </plugins>
+  
+      </build>
+  
+    </profile>
+  
+  </profiles>
+  
+
 </project>
diff --git a/platform/src/main/java9/module-info.java b/platform/src/main/java9/module-info.java
@@ -0,0 +1,15 @@
+  
+module org.bytedeco.javacv.platform {
+  
+    requires transitive org.bytedeco.javacv;
+  
+    requires org.bytedeco.opencv.platform;
+  
+    requires org.bytedeco.ffmpeg.platform;
+  
+    requires org.bytedeco.flycapture.platform;
+  
+    requires org.bytedeco.libdc1394.platform;
+  
+    requires org.bytedeco.libfreenect.platform;
+  
+    requires org.bytedeco.libfreenect2.platform;
+  
+    requires org.bytedeco.librealsense.platform;
+  
+    requires org.bytedeco.videoinput.platform;
+  
+    requires org.bytedeco.artoolkitplus.platform;
+  
+    requires org.bytedeco.flandmark.platform;
+  
+    requires org.bytedeco.leptonica.platform;
+  
+    requires org.bytedeco.tesseract.platform;
+  
+}
diff --git a/platform/src/test/java/org/bytedeco/javacv/FrameConverterTest.java b/platform/src/test/java/org/bytedeco/javacv/FrameConverterTest.java
@@ -33,11 +33,13 @@
 import org.bytedeco.javacpp.Loader;
 import org.bytedeco.javacpp.indexer.Indexer;
 import org.bytedeco.javacpp.indexer.UByteIndexer;
-  
-import org.bytedeco.javacpp.lept.PIX;
 import org.junit.Test;
-  
-import static org.bytedeco.javacpp.opencv_core.*;
-  
-import static org.bytedeco.javacpp.opencv_imgproc.*;
+  
+import org.bytedeco.leptonica.PIX;
+  
+import org.bytedeco.opencv.opencv_core.*;
+  
+import org.bytedeco.opencv.opencv_imgproc.*;
+  
+import static org.bytedeco.opencv.global.opencv_core.*;
+  
+import static org.bytedeco.opencv.global.opencv_imgproc.*;
 import static org.junit.Assert.*;
 /**
@@ -208,7 +210,7 @@
    @Test public void testOpenCVFrameConverter() {
        System.out.println("OpenCVFrameConverter");
-  
-        Loader.load(org.bytedeco.javacpp.opencv_java.class);
+  
+        Loader.load(org.bytedeco.opencv.opencv_java.class);
        for (int depth = 8; depth <= 64; depth *= 2) {
            assertEquals(depth, OpenCVFrameConverter.getFrameDepth(OpenCVFrameConverter.getIplImageDepth(depth)));

diff --git a/platform/src/test/java/org/bytedeco/javacv/FrameFilterTest.java b/platform/src/test/java/org/bytedeco/javacv/FrameFilterTest.java
@@ -28,8 +28,8 @@
 import org.bytedeco.javacpp.Loader;
 import org.junit.Test;
-  
-import static org.bytedeco.javacpp.avcodec.*;
-  
-import static org.bytedeco.javacpp.avutil.*;
+  
+import static org.bytedeco.ffmpeg.global.avcodec.*;
+  
+import static org.bytedeco.ffmpeg.global.avutil.*;
 import static org.junit.Assert.*;
 /**

diff --git a/platform/src/test/java/org/bytedeco/javacv/FrameGrabberChangingResolutionTest.java b/platform/src/test/java/org/bytedeco/javacv/FrameGrabberChangingResolutionTest.java
@@ -32,7 +32,7 @@
 import org.bytedeco.javacpp.indexer.UByteIndexer;
 import org.junit.Test;
-  
-import static org.bytedeco.javacpp.avutil.*;
+  
+import static org.bytedeco.ffmpeg.global.avutil.*;
 import static org.junit.Assert.*;
 /**

diff --git a/platform/src/test/java/org/bytedeco/javacv/FrameGrabberTest.java b/platform/src/test/java/org/bytedeco/javacv/FrameGrabberTest.java
@@ -34,8 +34,8 @@
 import org.bytedeco.javacpp.indexer.UByteIndexer;
 import org.junit.Test;
-  
-import static org.bytedeco.javacpp.avcodec.*;
-  
-import static org.bytedeco.javacpp.avutil.*;
+  
+import static org.bytedeco.ffmpeg.global.avcodec.*;
+  
+import static org.bytedeco.ffmpeg.global.avutil.*;
 import static org.junit.Assert.*;
 /**