Version bump

phax · Sep 10, 2024 · e08ba87 · e08ba87
1 parent c18fd91
commit e08ba87
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 27 deletions.
diff --git a/ph-schematron-ant-task/pom.xml b/ph-schematron-ant-task/pom.xml
@@ -115,6 +115,7 @@
     <dependency>
       <groupId>com.github.spotbugs</groupId>
       <artifactId>spotbugs-annotations</artifactId>
+      <version>${spotbugs-annotations.version}</version>
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>

diff --git a/ph-schematron-api/pom.xml b/ph-schematron-api/pom.xml
@@ -75,13 +75,6 @@
       <groupId>net.sf.saxon</groupId>
       <artifactId>Saxon-HE</artifactId>
     </dependency>
-
-    <dependency>
-      <groupId>com.github.spotbugs</groupId>
-      <artifactId>spotbugs-annotations</artifactId>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
 
     <dependency>
       <groupId>junit</groupId>

diff --git a/ph-schematron-api/src/main/java/com/helger/schematron/SchematronHelper.java b/ph-schematron-api/src/main/java/com/helger/schematron/SchematronHelper.java
@@ -55,8 +55,6 @@
 import com.helger.xml.sax.InputSourceFactory;
 import com.helger.xml.serialize.read.ISAXReaderSettings;
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-
 /**
  * This is a helper class that provides a way to easily apply an Schematron
  * resource on an XML resource.
@@ -158,9 +156,8 @@ public static IErrorList convertToErrorList (@Nonnull final SchematronOutputType
     return ret;
   }
 
-  @SuppressFBWarnings ("RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE")
   @Nonnull
-  private static ESuccess _recursiveResolveAllSchematronIncludes (@Nonnull final IMicroElement eRoot,
+  private static ESuccess _recursiveResolveAllSchematronIncludes (@Nullable final IMicroElement eRoot,
                                                                   @Nonnull final IReadableResource aResource,
                                                                   @Nullable final ISAXReaderSettings aSettings,
                                                                   @Nonnull final ISchematronErrorHandler aErrorHandler,
@@ -232,14 +229,17 @@ private static ESuccess _recursiveResolveAllSchematronIncludes (@Nonnull final I
                                                           new DefaultHierarchyVisitorCallback <IMicroNode> ()
                                                           {
                                                             @Override
-                                                            public EHierarchyVisitorReturn onItemBeforeChildren (final IMicroNode aItem)
+                                                            public EHierarchyVisitorReturn onItemBeforeChildren (@Nonnull final IMicroNode aItem)
                                                             {
                                                               if (aItem.isElement ())
                                                               {
                                                                 final IMicroElement aCurElement = (IMicroElement) aItem;
                                                                 final String sID = aCurElement.getAttributeValue ("id");
                                                                 if (sFinalAnchor.equals (sID))
+                                                                {
                                                                   aMatch.set (aCurElement);
+                                                                  return EHierarchyVisitorReturn.STOP_ITERATION;
+                                                                }
                                                               }
                                                               return EHierarchyVisitorReturn.CONTINUE;
                                                             }

diff --git a/ph-schematron-maven-plugin/pom.xml b/ph-schematron-maven-plugin/pom.xml
@@ -122,6 +122,7 @@
     <dependency>
       <groupId>com.github.spotbugs</groupId>
       <artifactId>spotbugs-annotations</artifactId>
+      <version>${spotbugs-annotations.version}</version>
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>

diff --git a/ph-schematron-pure/pom.xml b/ph-schematron-pure/pom.xml
@@ -58,13 +58,6 @@
       <groupId>com.helger.schematron</groupId>
       <artifactId>ph-schematron-api</artifactId>
     </dependency>
-
-    <dependency>
-      <groupId>com.github.spotbugs</groupId>
-      <artifactId>spotbugs-annotations</artifactId>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
 
     <dependency>
       <groupId>junit</groupId>

diff --git a/ph-schematron-pure/src/test/java/com/helger/schematron/pure/supplementary/Issue004Test.java b/ph-schematron-pure/src/test/java/com/helger/schematron/pure/supplementary/Issue004Test.java
@@ -20,21 +20,20 @@
 
 import java.io.File;
 
+import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.helger.schematron.pure.SchematronResourcePure;
 import com.helger.schematron.pure.errorhandler.LoggingPSErrorHandler;
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-
 public final class Issue004Test
 {
   private static final Logger LOGGER = LoggerFactory.getLogger (Issue004Test.class);
 
   @Test
-  @SuppressFBWarnings ("DMI_HARDCODED_ABSOLUTE_FILENAME")
+  @Ignore
   public void testReadFromUNCWithInclude () throws Exception
   {
     final File aSchematronFile = new File ("\\\\PC61826\\share\\example-8-5.sch");

diff --git a/ph-schematron-pure/src/test/java/com/helger/schematron/pure/supplementary/Issue006Test.java b/ph-schematron-pure/src/test/java/com/helger/schematron/pure/supplementary/Issue006Test.java
@@ -32,8 +32,6 @@
 import com.helger.schematron.svrl.jaxb.SchematronOutputType;
 import com.helger.xml.serialize.write.XMLWriter;
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-
 public final class Issue006Test
 {
   @Test
@@ -43,7 +41,6 @@ public void testIssue () throws Exception
                             new File ("src/test/resources/external/issues/github6/test.xml"));
   }
 
-  @SuppressFBWarnings ("BC_IMPOSSIBLE_INSTANCEOF")
   public static void validateAndProduceSVRL (final File schematron, final File xml) throws Exception
   {
     final IReadableResource aSchematron = new FileSystemResource (schematron.getAbsoluteFile ());

diff --git a/pom.xml b/pom.xml
@@ -70,20 +70,21 @@
   </developers>
 
   <properties>
-    <ant.version>1.10.14</ant.version>
+    <ant.version>1.10.15</ant.version>
     <jaxb-plugin.group>org.jvnet.jaxb</jaxb-plugin.group>
     <jaxb-plugin.artifact>jaxb-maven-plugin</jaxb-plugin.artifact>
     <jaxb-plugin.version>4.0.8</jaxb-plugin.version>
     <ph-jaxb-plugin.version>4.0.3</ph-jaxb-plugin.version>
     <schxslt.version>1.10</schxslt.version>
+    <spotbugs-annotations.version>4.8.6</spotbugs-annotations.version>
   </properties>
 
   <dependencyManagement>
     <dependencies>
       <dependency>
         <groupId>com.helger.commons</groupId>
         <artifactId>ph-commons-parent-pom</artifactId>
-        <version>11.1.6</version>
+        <version>11.1.8</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>