From 75e734cdbff92b34324bcca21f1c1408a8944168 Mon Sep 17 00:00:00 2001
From: Simon Steiner <ssteiner@apache.org>
Date: Mon, 22 Jan 2024 14:39:19 +0000
Subject: [PATCH] Run tests on Java 11 and 17

---
 .github/workflows/maven.yml                          | 2 +-
 fop-core/src/tools/resources/findbugs/exclusions.xml | 9 +++++++++
 pom.xml                                              | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 394564531..b43276cf1 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        jdk: ['8']
+        jdk: ['8', '11', '17']
         os: [ubuntu-latest, windows-latest]
 
     steps:
diff --git a/fop-core/src/tools/resources/findbugs/exclusions.xml b/fop-core/src/tools/resources/findbugs/exclusions.xml
index 54a827c8a..c502e4b72 100644
--- a/fop-core/src/tools/resources/findbugs/exclusions.xml
+++ b/fop-core/src/tools/resources/findbugs/exclusions.xml
@@ -413,6 +413,15 @@
       <Class name="org.apache.fop.servlet.FopServlet"/>
     </And>    
   </Match>
+  <Match>
+    <Bug pattern="EQ_DOESNT_OVERRIDE_EQUALS"/>
+    <Or>
+      <Class name="org.apache.fop.layoutmgr.inline.LineLayoutManager$Paragraph"/>
+      <Class name="org.apache.fop.layoutmgr.InlineKnuthSequence"/>
+      <Class name="org.apache.fop.layoutmgr.BlockKnuthSequence"/>
+      <Class name="org.apache.fop.layoutmgr.AbstractBreaker$BlockSequence"/>
+    </Or>
+  </Match>  
   
   <Match>
     <Bug pattern="DMI_RANDOM_USED_ONLY_ONCE"/>
diff --git a/pom.xml b/pom.xml
index 608c4b93b..aa61f80a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
     <commons.logging.version>1.0.4</commons.logging.version>
     <compiler.plugin.version>3.11.0</compiler.plugin.version>
     <exec.plugin.version>1.4.0</exec.plugin.version>
-    <findbugs.plugin.version>3.1.12.2</findbugs.plugin.version>
+    <findbugs.plugin.version>4.2.3</findbugs.plugin.version>
     <jar.plugin.version>3.1.1</jar.plugin.version>
     <java.version>8</java.version>
     <junit.version>4.11</junit.version>
-- 
2.39.5