Merge pull request #572 from fugerit-org/571-chore-fix-recover-apache-fop-version

fix: recover apache fop version #571

Author: fugerit79

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- fj-doc-mod-fop, recover Apache FOP version <https://github.com/fugerit-org/fj-doc/issues/571>
+
 ## [8.17.4] - 2025-11-04
 
 ### Changed

fj-doc-guide/src/main/docs/asciidoc/chapters/00_2_release_notes.adoc

@@ -6,10 +6,12 @@ Whereas the link:https://github.com/fugerit-org/fj-doc/blob/main/CHANGELOG.md[CH
 [#doc-release-notes-unreleased]
 ==== Unreleased
 
+- fj-doc-mod-fop, recover Apache FOP version  link:https://github.com/fugerit-org/fj-doc/issues/571[#571]
+
 [#doc-release-notes-8-17-4]
 ==== Version 8.17.4 [2025-11-04]
 
-- fj-doc-mod-poi, metadata handlinglink:https://github.com/fugerit-org/fj-doc/issues/569[#569]
+- fj-doc-mod-poi, metadata handling link:https://github.com/fugerit-org/fj-doc/issues/569[#569]
 
 [#doc-release-notes-8-17-3]
 ==== Version 8.17.3 [2025-11-04]

fj-doc-mod-fop/src/main/java/org/fugerit/java/doc/mod/fop/PdfFopTypeHandler.java

@@ -30,6 +30,7 @@
 import org.fugerit.java.doc.base.typehelper.generic.SecurityHardeningConsts;
 import org.fugerit.java.doc.base.typehelper.generic.SecurityHardeningUtil;
 import org.fugerit.java.doc.mod.fop.config.FopConfigClassLoaderWrapper;
+import org.fugerit.java.doc.mod.fop.utils.ApacheFopUtils;
 import org.fugerit.java.doc.mod.fop.utils.ConfigUtils;
 import org.fugerit.java.doc.mod.fop.utils.FopHelperConstants;
 import org.fugerit.java.doc.mod.fop.utils.PoolUtils;
@@ -130,16 +131,12 @@ private static String getModuleVersion() {
 		return VenusVersion.getFjDocModuleVersionS( "fj-doc-mod-fop");
 	}
 
-	private static String getApacheFOPVersion() {
-		return MavenProps.getProperty( "org.apache.xmlgraphics", "fop", MavenProps.VERSION );
-	}
-
     private static final String PRODUCER_OVER = "Apache FOP";
 
     /**
      * Default producer
      */
-	private static final String PRODUCER_DEFAULT = String.format( VenusVersion.VENUS_PRODUCER_FORMAT, DocConfig.FUGERIT_VENUS_DOC , getModuleVersion() , PRODUCER_OVER, getApacheFOPVersion() );
+	private static final String PRODUCER_DEFAULT = String.format( VenusVersion.VENUS_PRODUCER_FORMAT, DocConfig.FUGERIT_VENUS_DOC , getModuleVersion() , PRODUCER_OVER, ApacheFopUtils.getApacheFOPVersion() );
 
     /**
      * Security hardened producer

fj-doc-mod-fop/src/main/java/org/fugerit/java/doc/mod/fop/utils/ApacheFopUtils.java

@@ -0,0 +1,23 @@
+package org.fugerit.java.doc.mod.fop.utils;
+
+import org.apache.fop.Version;
+import org.fugerit.java.core.lang.helpers.StringUtils;
+import org.fugerit.java.core.util.mvn.MavenProps;
+
+public class ApacheFopUtils {
+
+    private ApacheFopUtils() {}
+
+    private static final String APACHE_FOP_VERSION = StringUtils.valueWithDefault(
+            Version.getVersion(),
+            StringUtils.valueWithDefault(
+                    MavenProps.getProperty( "org.apache.xmlgraphics", "fop", MavenProps.VERSION ),
+                    "NA"    // if nothing else worked
+            )
+    );
+
+    public static String getApacheFOPVersion() {
+        return APACHE_FOP_VERSION;
+    }
+
+}

fj-doc-mod-fop/src/test/java/test/org/fugerit/java/doc/mod/fop/TestApacheFopVersion.java

@@ -0,0 +1,19 @@
+package test.org.fugerit.java.doc.mod.fop;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.fop.Version;
+import org.fugerit.java.doc.mod.fop.utils.ApacheFopUtils;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+@Slf4j
+class TestApacheFopVersion {
+
+    @Test
+    void testFopVersion() {
+        String fopVersion = ApacheFopUtils.getApacheFOPVersion();
+        log.info( "fop version : {}", fopVersion  );
+        Assertions.assertEquals(Version.getVersion(), fopVersion);
+    }
+
+}