[ws-axiom] branch 1.2.x updated: AXIOM-503: Partial cherry-pick of 1125d28

[ve...@apache.org]

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

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


The following commit(s) were added to refs/heads/1.2.x by this push:
     new 647477a  AXIOM-503: Partial cherry-pick of 1125d28
647477a is described below

commit 647477a1afd1b6af3b06fda6396b91d907ea5a25
Author: Andreas Veithen <ve...@apache.org>
AuthorDate: Sun May 10 21:14:35 2020 +0100

    AXIOM-503: Partial cherry-pick of 1125d28
    
    This commit just cherry-picks the StAX dialect detector update to
    support Woodstox 6. Because of an incompatible change in stax2-api, it's
    not possible to run the dialect detector tests for Woodstox 6 and
    previous versions.
---
 .../java/org/apache/axiom/util/stax/dialect/StAXDialectDetector.java     | 1 +
 1 file changed, 1 insertion(+)

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 83270f9..660844b 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
@@ -274,6 +274,7 @@ public class StAXDialectDetector {
                     return new Woodstox4Dialect(version.getComponent(1) == 0 && version.getComponent(2) < 11
                             || version.getComponent(1) == 1 && version.getComponent(2) < 3);
                 case 5:
+                case 6:
                     return new Woodstox4Dialect(false);
                 default:
                     return null;