[FOP-3159] support JPMS via Automatic-Module-Name

fop-core/pom.xml

@@ -345,9 +345,12 @@
             <manifest>
               <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
             </manifest>
+            <manifestEntries>
+              <Automatic-Module-Name>org.apache.xmlgraphics.fop.core</Automatic-Module-Name>
+            </manifestEntries>
           </archive>
         </configuration>
-      </plugin>      
+      </plugin>
     </plugins>
     <resources>
       <resource>

fop-events/pom.xml

@@ -53,6 +53,17 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Automatic-Module-Name>org.apache.xmlgraphics.fop.events</Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
       <!-- generate event collector models -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

fop-sandbox/pom.xml

@@ -81,6 +81,7 @@
               <mainClass>org.apache.fop.cli.Main</mainClass>
             </manifest>
             <manifestEntries>
+              <Automatic-Module-Name>org.apache.xmlgraphics.fop.sandbox</Automatic-Module-Name>
               <SpecificationTitle>XSL-FO - Extensible Stylesheet Language</SpecificationTitle>
               <SpecificationVersion>1.1</SpecificationVersion>
               <SpecificationVendor>World Wide Web Consortium</SpecificationVendor>

fop-servlet/pom.xml

@@ -48,6 +48,20 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifest>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+            </manifest>
+            <manifestEntries>
+              <Automatic-Module-Name>org.apache.xmlgraphics.fop.servlet</Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
       <plugin>
         <artifactId>maven-war-plugin</artifactId>
         <version>${war.plugin.version}</version>

fop-transcoder/pom.xml

@@ -41,6 +41,20 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifest>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+            </manifest>
+            <manifestEntries>
+              <Automatic-Module-Name>org.apache.xmlgraphics.fop.transcode</Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>

fop-util/pom.xml

@@ -31,6 +31,17 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Automatic-Module-Name>org.apache.xmlgraphics.fop.util</Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
       <!-- junit testing -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

fop/pom.xml

@@ -52,6 +52,7 @@
               <mainClass>org.apache.fop.cli.Main</mainClass>
             </manifest>
             <manifestEntries>
+              <Automatic-Module-Name>org.apache.xmlgraphics.fop</Automatic-Module-Name>
               <SpecificationTitle>XSL-FO - Extensible Stylesheet Language</SpecificationTitle>
               <SpecificationVersion>1.1</SpecificationVersion>
               <SpecificationVendor>World Wide Web Consortium</SpecificationVendor>

pom.xml

@@ -11,9 +11,9 @@
   <url>http://xmlgraphics.apache.org/fop/</url>
 
   <properties>
-    <ant.version>1.9.15</ant.version>
-    <antrun.plugin.version>1.8</antrun.plugin.version>
-    <batik.version>1.16.0-SNAPSHOT</batik.version>
+    <ant.version>1.10.14</ant.version>
+    <antrun.plugin.version>3.1.0</antrun.plugin.version>
+    <batik.version>1.17</batik.version>
     <build.helper.plugin.version>1.9.1</build.helper.plugin.version>
     <checkstyle.plugin.version>2.14</checkstyle.plugin.version>
     <commons.io.version>2.11.0</commons.io.version>
@@ -21,7 +21,7 @@
     <compiler.plugin.version>3.11.0</compiler.plugin.version>
     <exec.plugin.version>1.4.0</exec.plugin.version>
     <findbugs.plugin.version>3.0.4</findbugs.plugin.version>
-    <jar.plugin.version>3.1.1</jar.plugin.version>
+    <jar.plugin.version>3.3.0</jar.plugin.version>
     <java.version>8</java.version>
     <junit.version>4.11</junit.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -30,7 +30,7 @@
     <surefire.plugin.version>2.18.1</surefire.plugin.version>
     <war.plugin.version>3.3.2</war.plugin.version>
     <xml.plugin.version>1.0.1</xml.plugin.version>
-    <xmlgraphics.commons.version>2.9.0-SNAPSHOT</xmlgraphics.commons.version>
+    <xmlgraphics.commons.version>2.9</xmlgraphics.commons.version>
     <xmlunit.version>1.2</xmlunit.version>
     <jdk.path>${env.JAVA_HOME}</jdk.path>
   </properties>
@@ -62,9 +62,15 @@
   <build>
     <pluginManagement>
       <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-assembly-plugin</artifactId>
+          <version>3.6.0</version>
+        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
+          <version>3.6.2</version>
           <configuration>
             <tags>
               <tag>