Migration to Java 25

Author: rmraya

README.md

@@ -16,10 +16,10 @@ Features in development:
 
 ## Building
 
-You need Java 21 and [Gradle](https://gradle.org/)
+You need Java 25 and [Gradle](https://gradle.org/)
 
 - Clone this repository
-- Point your JAVA_HOME variable to JDK 21
+- Point your JAVA_HOME variable to JDK 25
 - Run `gradle` to compile the source code
 
 ``` text

build.gradle

@@ -4,7 +4,7 @@ plugins {
 
 java {
     toolchain {
-        languageVersion = JavaLanguageVersion.of(21)
+        languageVersion = JavaLanguageVersion.of(25)
     }
 }
 

lib/xmljava.jar

@@ -2,14 +2,14 @@
 sonar.projectKey=XMLJava
 # this is the name displayed in the SonarQube UI
 sonar.projectName=XMLJava
-sonar.projectVersion=4.1.0
+sonar.projectVersion=5.0.0
 
 # Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows.
 # Since SonarQube 4.2, this property is optional if sonar.modules is set. 
 # If not set, SonarQube starts looking for source code from the directory containing 
 # the sonar-project.properties file.
 sonar.sources=src
-sonar.java.source=21
+sonar.java.source=25
 sonar.java.binaries=bin
 sonar.java.libraries=lib
 sonar.scm.provider=git

sonar-project.properties

@@ -442,7 +442,7 @@ public InputSource resolveEntity(String name, String publicId, String baseURI, S
                 return new InputSource(uri.toURL().openStream());
             }
             return new InputSource(new FileInputStream(uri.toURL().toString()));
-        } catch (URISyntaxException | IllegalArgumentException | NullPointerException e) {
+        } catch (URISyntaxException | IllegalArgumentException | NullPointerException _) {
             // ignore
         }
         if (dtdPublicEntities != null && publicId != null && dtdPublicEntities.containsKey(publicId)) {
@@ -578,7 +578,7 @@ public String matchSystem(String baseURI, String systemId) {
                 if (file.exists()) {
                     return file.getAbsolutePath();
                 }
-            } catch (MalformedURLException | URISyntaxException | IllegalArgumentException e) {
+            } catch (MalformedURLException | URISyntaxException | IllegalArgumentException _) {
                 // ignore
             }
         }
@@ -628,7 +628,7 @@ public String matchURI(String uri) {
                 if (u.isAbsolute() && u.toURL().getProtocol().startsWith("file")) {
                     return u.toString();
                 }
-            } catch (URISyntaxException | MalformedURLException | IllegalArgumentException e) {
+            } catch (URISyntaxException | MalformedURLException | IllegalArgumentException _) {
                 // ignore
             }
         }
@@ -681,7 +681,7 @@ public void parseDTD(String publicId) {
                     EntityDecl entity = it.next();
                     addDtdSystemEntity(entity.getValue(), entity.getSystemId());
                 }
-            } catch (IOException | SAXException e) {
+            } catch (IOException | SAXException _) {
                 // do nothing
                 MessageFormat mf = new MessageFormat(Messages.getString("Catalog.0"));
                 logger.log(Level.WARNING, mf.format(new String[] { publicId }));

src/com/maxprograms/xml/Catalog.java

@@ -12,8 +12,8 @@
 
 public class Constants {
 
-    public static final String VERSION = "4.2.0";
-    public static final String BUILD = "20260601_1626";
+    public static final String VERSION = "5.0.0";
+    public static final String BUILD = "20260609_1150";
 
     private Constants() {
         // private for security

src/com/maxprograms/xml/Constants.java

@@ -100,7 +100,7 @@ public void endElement(String uri, String localName, String qName) throws SAXExc
 				}
 			}
 			current = stack.pop();
-		} catch (EmptyStackException es) {
+		} catch (EmptyStackException _) {
 			throw new SAXException(Messages.getString("CustomContentHandler.0"));
 		}
 	}
@@ -215,7 +215,7 @@ public void setDocumentLocator(Locator locator) {
 		}
 		try {
 			documentBase = new File(new URI(sysId)).getParentFile();
-		} catch (Exception e) {
+		} catch (Exception _) {
 			documentBase = new File(sysId).getParentFile();
 		}
 	}

src/com/maxprograms/xml/CustomContentHandler.java

@@ -28,7 +28,7 @@ public InputSource resolveEntity(String publicId, String systemId) throws IOExce
 			if (file.exists()) {
 				return new InputSource(new FileInputStream(file));
 			}
-		} catch (URISyntaxException e) {
+		} catch (URISyntaxException _) {
 			// ignore
 		}
 		return null;

src/com/maxprograms/xml/DTDResolver.java

@@ -48,7 +48,7 @@ public static String getString(String key) {
                 }
             }
             return props.getProperty(key, '!' + key + '!');
-        } catch (IOException | NullPointerException e) {
+        } catch (IOException | NullPointerException _) {
             return '!' + key + '!';
         }
     }

src/com/maxprograms/xml/Messages.java

@@ -187,7 +187,7 @@ private void nameAttribute(Element e, Map<String, String> context) {
                 nameEl.setAttribute("ns", e.getAttributeValue("ns"));
                 e.removeAttribute("ns");
             } else {
-                String resolvedNs = resolveNamespaceBinding(value, currentContext, isElementPattern, isAttributePattern);
+                String resolvedNs = resolveNamespaceBinding(value, currentContext, isElementPattern);
                 if (resolvedNs != null && !resolvedNs.isEmpty()) {
                     nameEl.setAttribute("ns", resolvedNs);
                 }
@@ -216,8 +216,7 @@ private Map<String, String> augmentNamespaceContext(Map<String, String> base, El
         return updated;
     }
 
-    private String resolveNamespaceBinding(String lexicalName, Map<String, String> context, boolean isElementPattern,
-            boolean isAttributePattern) {
+    private String resolveNamespaceBinding(String lexicalName, Map<String, String> context, boolean isElementPattern) {
         int separatorIndex = lexicalName.indexOf(':');
         if (separatorIndex == -1) {
             if (isElementPattern) {