From e13cc2a7c8412dee03f3960511a7bab1ccfc53ca Mon Sep 17 00:00:00 2001
From: Jason Harrop <jason@plutext.org>
Date: Fri, 29 Nov 2024 13:55:11 +1100
Subject: [PATCH] FOP 2.10 config notes (FOP 2.10 not used yet)

---
 .../src/main/java/module-info.java            | 20 ++++++++++++++++++-
 .../src/main/java/module-info.java            | 13 ++++++++----
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/docx4j-export-fo/src/main/java/module-info.java b/docx4j-export-fo/src/main/java/module-info.java
index 289d7f261..dc42ed78b 100644
--- a/docx4j-export-fo/src/main/java/module-info.java
+++ b/docx4j-export-fo/src/main/java/module-info.java
@@ -10,7 +10,7 @@
 	//requires fop.events;
 	// requires qdox;
 
-	requires fop;
+	requires fop;  // FOP 2.7
 	// deps of org.apache.xmlgraphics:fop-core:jar:2.5
 		requires batik.anim;
 		requires batik.css;
@@ -36,6 +36,24 @@
 			
 	// necessary for FOP 2.9 but not 2.9 or earlier
 //	requires fop.core; 
+		
+// FOP 2.10
+//		requires org.apache.xmlgraphics.fop.core;
+//		requires org.apache.xmlgraphics.fop.events;
+//		requires org.apache.xmlgraphics.fop.util;
+//		
+//		// deps of org.apache.xmlgraphics:fop-core:jar:2.5
+//			requires org.apache.xmlgraphics.batik.anim;
+//			requires org.apache.xmlgraphics.batik.css;
+//			requires org.apache.xmlgraphics.batik.dom;
+//			requires org.apache.xmlgraphics.batik.ext;
+//			requires org.apache.xmlgraphics.batik.parser;
+////			requires org.apache.xmlgraphics.batik.shared.resources;
+////			requires org.apache.xmlgraphics.batik.svg.dom;
+//			requires org.apache.xmlgraphics.batik.util;
+//			requires org.apache.xmlgraphics.batik.constants;
+//			requires org.apache.xmlgraphics.batik.i18n;
+		
 
 	
 	exports org.docx4j.convert.out.fo;
diff --git a/docx4j-samples-docx-export-fo/src/main/java/module-info.java b/docx4j-samples-docx-export-fo/src/main/java/module-info.java
index 6663fe109..edfb284d8 100644
--- a/docx4j-samples-docx-export-fo/src/main/java/module-info.java
+++ b/docx4j-samples-docx-export-fo/src/main/java/module-info.java
@@ -5,11 +5,16 @@
 	requires org.docx4j.openxml_objects;
 	
 	requires org.docx4j.export_fo;
-	requires fop;
+	requires fop; // FOP 2.7
 	
-	// necessary for FOP 2.9 but not 2.8 or earlier
-//	requires fop.core; 
-//	requires fop.events; 
+	// necessary for broken FOP 2.9 but not 2.8 or earlier
+//	requires fop.core;
+//	requires fop.events;
+	
+	// necessary for FOP 2.10, but broken
+//	requires org.apache.xmlgraphics.fop.core;
+//	requires org.apache.xmlgraphics.fop.events;
+//	requires org.apache.xmlgraphics.fop.util;
 	
 	requires jakarta.xml.bind;