(ws-axiom) branch master updated: Upgrade to Woodstox 7

[veithen]

This is an automated email from the ASF dual-hosted git repository.

veithen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ws-axiom.git


The following commit(s) were added to refs/heads/master by this push:
     new db929f500 Upgrade to Woodstox 7
db929f500 is described below

commit db929f50011273027aad40862a59dc7d1a64c40f
Author: Andreas Veithen <andreas.veit...@gmail.com>
AuthorDate: Mon Sep 16 10:00:42 2024 +0000

    Upgrade to Woodstox 7
---
 .../org/apache/axiom/util/stax/dialect/StAXDialectDetector.java  | 9 +--------
 pom.xml                                                          | 2 +-
 testing/jaxp-testsuite/pom.xml                                   | 5 +++++
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git 
a/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/StAXDialectDetector.java
 
b/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/StAXDialectDetector.java
index e6e79319a..de95e8191 100644
--- 
a/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/StAXDialectDetector.java
+++ 
b/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/StAXDialectDetector.java
@@ -268,14 +268,7 @@ public class StAXDialectDetector {
         
         if (title != null && 
title.toLowerCase(Locale.ENGLISH).contains("woodstox")) {
             Version version = new Version(versionString);
-            switch (version.getComponent(0)) {
-                case 4:
-                case 5:
-                case 6:
-                    return Woodstox4Dialect.INSTANCE;
-                default:
-                    return null;
-            }
+            return version.getComponent(0) >= 4 ? Woodstox4Dialect.INSTANCE : 
null;
         } else if (title != null && title.indexOf("SJSXP") != -1) {
             return new SJSXPDialect(false);
         } else if ("com.bea.core.weblogic.stax".equals(symbolicName)) {
diff --git a/pom.xml b/pom.xml
index e6ec7440f..ba36a30cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -288,7 +288,7 @@
             <dependency>
                 <groupId>com.fasterxml.woodstox</groupId>
                 <artifactId>woodstox-core</artifactId>
-                <version>6.7.0</version>
+                <version>7.0.0</version>
             </dependency>
             <dependency>
                 <groupId>jaxen</groupId>
diff --git a/testing/jaxp-testsuite/pom.xml b/testing/jaxp-testsuite/pom.xml
index d500e6fb4..4862c696b 100644
--- a/testing/jaxp-testsuite/pom.xml
+++ b/testing/jaxp-testsuite/pom.xml
@@ -129,6 +129,11 @@
                                         <artifactId>woodstox-core</artifactId>
                                         <version>5.3.0</version>
                                     </artifact>
+                                    <artifact>
+                                        
<groupId>com.fasterxml.woodstox</groupId>
+                                        <artifactId>woodstox-core</artifactId>
+                                        <version>6.7.0</version>
+                                    </artifact>
                                     <artifact>
                                         
<groupId>com.fasterxml.woodstox</groupId>
                                         <artifactId>woodstox-core</artifactId>