aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Steiner <ssteiner@apache.org>2024-02-22 12:01:29 +0000
committerSimon Steiner <ssteiner@apache.org>2024-02-22 12:01:29 +0000
commited60079e0064febb68d8c5be690c853f6d83ac4a (patch)
treebe565d67e31d4e6bd9539610181790565b4ed965
parent08d676ebd139a827fc2e6756d1ab542bce1a17b7 (diff)
downloadxmlgraphics-fop-ed60079e0064febb68d8c5be690c853f6d83ac4a.tar.gz
xmlgraphics-fop-ed60079e0064febb68d8c5be690c853f6d83ac4a.zip
FOP-3159: Set an automatic module name by Samael Bate
-rw-r--r--fop-core/pom.xml5
-rw-r--r--fop-events/pom.xml11
-rw-r--r--fop-sandbox/pom.xml1
-rw-r--r--fop-transcoder/pom.xml3
-rw-r--r--fop-util/pom.xml11
-rw-r--r--fop/pom.xml1
-rw-r--r--pom.xml6
7 files changed, 34 insertions, 4 deletions
diff --git a/fop-core/pom.xml b/fop-core/pom.xml
index d1e1a2f65..a041e727d 100644
--- a/fop-core/pom.xml
+++ b/fop-core/pom.xml
@@ -357,9 +357,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>
diff --git a/fop-events/pom.xml b/fop-events/pom.xml
index a7a6d2d0e..15e4e9947 100644
--- a/fop-events/pom.xml
+++ b/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>
diff --git a/fop-sandbox/pom.xml b/fop-sandbox/pom.xml
index 880195c65..c1bc58f45 100644
--- a/fop-sandbox/pom.xml
+++ b/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>
diff --git a/fop-transcoder/pom.xml b/fop-transcoder/pom.xml
index 2ef6f7fc7..0af565a79 100644
--- a/fop-transcoder/pom.xml
+++ b/fop-transcoder/pom.xml
@@ -58,6 +58,9 @@
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
+ <manifestEntries>
+ <Automatic-Module-Name>org.apache.xmlgraphics.fop.transcoder</Automatic-Module-Name>
+ </manifestEntries>
</archive>
<descriptors>
<descriptor>src/tools/resources/assembly/assembly.xml</descriptor>
diff --git a/fop-util/pom.xml b/fop-util/pom.xml
index 33fc903c3..109f219a7 100644
--- a/fop-util/pom.xml
+++ b/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>
diff --git a/fop/pom.xml b/fop/pom.xml
index 5845e1f2c..43d68deca 100644
--- a/fop/pom.xml
+++ b/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>
diff --git a/pom.xml b/pom.xml
index aa61f80a6..91d95dcf9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,13 +11,13 @@
<url>http://xmlgraphics.apache.org/fop/</url>
<properties>
- <ant.version>1.9.15</ant.version>
+ <ant.version>1.10.14</ant.version>
<antrun.plugin.version>1.8</antrun.plugin.version>
- <batik.version>1.16.0-SNAPSHOT</batik.version>
+ <batik.version>1.17.0-SNAPSHOT</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>
- <commons.logging.version>1.0.4</commons.logging.version>
+ <commons.logging.version>1.3.0</commons.logging.version>
<compiler.plugin.version>3.11.0</compiler.plugin.version>
<exec.plugin.version>1.4.0</exec.plugin.version>
<findbugs.plugin.version>4.2.3</findbugs.plugin.version>