You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2020/05/10 20:14:51 UTC
[ws-axiom] branch master updated: Update to Woodstox 6
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 1125d28 Update to Woodstox 6
1125d28 is described below
commit 1125d280f15ae0a7aef0558c7ff000e1cccd8f3f
Author: Andreas Veithen <ve...@apache.org>
AuthorDate: Sun May 10 21:14:35 2020 +0100
Update to Woodstox 6
---
axiom-api/pom.xml | 9 +++++++--
.../axiom/util/stax/dialect/StAXDialectDetector.java | 1 +
implementations/axiom-dom/pom.xml | 4 ++--
implementations/axiom-impl/pom.xml | 4 ++--
.../axiom-impl/src/site/markdown/index.md.vm | 2 +-
pom.xml | 18 ++++--------------
systests/old-tests/pom.xml | 4 ++--
.../test/java/org/apache/axiom/test/FactoryTest.java | 2 +-
.../src/test/java/org/apache/axiom/test/JAXBTest.java | 2 +-
.../org/apache/axiom/test/UsesConstraintsTest.java | 2 +-
systests/wildfly-tests/pom.xml | 2 +-
testing/xml-testsuite/pom.xml | 4 ++--
testing/xml-truth/pom.xml | 4 ++--
13 files changed, 27 insertions(+), 31 deletions(-)
diff --git a/axiom-api/pom.xml b/axiom-api/pom.xml
index 1041d5d..335db6b 100644
--- a/axiom-api/pom.xml
+++ b/axiom-api/pom.xml
@@ -78,8 +78,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>woodstox-core-asl</artifactId>
+ <groupId>com.fasterxml.woodstox</groupId>
+ <artifactId>woodstox-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -219,6 +219,11 @@
<artifactId>woodstox-core</artifactId>
<version>5.0.1</version>
</artifact>
+ <dependency>
+ <groupId>com.fasterxml.woodstox</groupId>
+ <artifactId>woodstox-core</artifactId>
+ <version>6.2.0</version>
+ </dependency>
<artifact>
<groupId>com.sun.xml.stream</groupId>
<artifactId>sjsxp</artifactId>
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 71a5d4a..871972c 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
@@ -275,6 +275,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;
diff --git a/implementations/axiom-dom/pom.xml b/implementations/axiom-dom/pom.xml
index e634224..1340567 100644
--- a/implementations/axiom-dom/pom.xml
+++ b/implementations/axiom-dom/pom.xml
@@ -51,8 +51,8 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>woodstox-core-asl</artifactId>
+ <groupId>com.fasterxml.woodstox</groupId>
+ <artifactId>woodstox-core</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/implementations/axiom-impl/pom.xml b/implementations/axiom-impl/pom.xml
index 92a9fd9..6eaf353 100644
--- a/implementations/axiom-impl/pom.xml
+++ b/implementations/axiom-impl/pom.xml
@@ -45,8 +45,8 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>woodstox-core-asl</artifactId>
+ <groupId>com.fasterxml.woodstox</groupId>
+ <artifactId>woodstox-core</artifactId>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
diff --git a/implementations/axiom-impl/src/site/markdown/index.md.vm b/implementations/axiom-impl/src/site/markdown/index.md.vm
index 77d5979..0667c7b 100644
--- a/implementations/axiom-impl/src/site/markdown/index.md.vm
+++ b/implementations/axiom-impl/src/site/markdown/index.md.vm
@@ -53,7 +53,7 @@ deploy the following bundles:
| ----------------------------- | ------------------------------------------ | -------------------------------------------|
| `org.apache.servicemix.specs` | `org.apache.servicemix.specs.stax-api-1.0` | `org.apache.servicemix.specs.stax-api-1.0` |
| `org.codehaus.woodstox` | `stax2-api` | `stax2-api` |
-| `org.codehaus.woodstox` | `woodstox-core-asl` | `woodstox-core-asl` |
+| `com.fasterxml.woodstox` | `woodstox-core` | `com.fasterxml.woodstox.woodstox-core` |
Note that the `geronimo-stax-api_1.0_spec` bundle doesn't work with Woodstox. See
[here](http://veithen.github.io/2014/10/12/stax-osgi.html) for more information.
diff --git a/pom.xml b/pom.xml
index d43d6f6..766c8d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -303,19 +303,9 @@
<version>1.2</version>
</dependency>
<dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>woodstox-core-asl</artifactId>
- <version>4.2.0</version>
- <exclusions>
- <exclusion>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.xml.stream</groupId>
- <artifactId>stax-api</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>com.fasterxml.woodstox</groupId>
+ <artifactId>woodstox-core</artifactId>
+ <version>6.2.0</version>
</dependency>
<dependency>
<groupId>jaxen</groupId>
@@ -371,7 +361,7 @@
<dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>stax2-api</artifactId>
- <version>3.1.1</version>
+ <version>4.2</version>
<exclusions>
<exclusion>
<groupId>javax.xml.stream</groupId>
diff --git a/systests/old-tests/pom.xml b/systests/old-tests/pom.xml
index a4e6068..ca3443b 100644
--- a/systests/old-tests/pom.xml
+++ b/systests/old-tests/pom.xml
@@ -69,8 +69,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>woodstox-core-asl</artifactId>
+ <groupId>com.fasterxml.woodstox</groupId>
+ <artifactId>woodstox-core</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
diff --git a/systests/osgi-tests/src/test/java/org/apache/axiom/test/FactoryTest.java b/systests/osgi-tests/src/test/java/org/apache/axiom/test/FactoryTest.java
index af9489c..cac92ae 100644
--- a/systests/osgi-tests/src/test/java/org/apache/axiom/test/FactoryTest.java
+++ b/systests/osgi-tests/src/test/java/org/apache/axiom/test/FactoryTest.java
@@ -50,7 +50,7 @@ public class FactoryTest {
return options(
url("link:classpath:org.apache.servicemix.specs.stax-api-1.0.link"),
url("link:classpath:stax2-api.link"),
- url("link:classpath:woodstox-core-asl.link"),
+ url("link:classpath:com.fasterxml.woodstox.woodstox-core.link"),
url("link:classpath:com.sun.activation.javax.activation.link"),
url("link:classpath:org.apache.james.apache-mime4j-core.link"),
url("link:classpath:org.apache.ws.commons.axiom.axiom-api.link"),
diff --git a/systests/osgi-tests/src/test/java/org/apache/axiom/test/JAXBTest.java b/systests/osgi-tests/src/test/java/org/apache/axiom/test/JAXBTest.java
index 348cc5b..e6b5543 100644
--- a/systests/osgi-tests/src/test/java/org/apache/axiom/test/JAXBTest.java
+++ b/systests/osgi-tests/src/test/java/org/apache/axiom/test/JAXBTest.java
@@ -51,7 +51,7 @@ public class JAXBTest {
url("link:classpath:com.sun.activation.javax.activation.link"),
url("link:classpath:org.apache.servicemix.specs.stax-api-1.0.link"),
url("link:classpath:stax2-api.link"),
- url("link:classpath:woodstox-core-asl.link"),
+ url("link:classpath:com.fasterxml.woodstox.woodstox-core.link"),
url("link:classpath:org.apache.james.apache-mime4j-core.link"),
url("link:classpath:org.apache.ws.commons.axiom.axiom-api.link"),
url("link:classpath:org.apache.ws.commons.axiom.axiom-impl.link"),
diff --git a/systests/osgi-tests/src/test/java/org/apache/axiom/test/UsesConstraintsTest.java b/systests/osgi-tests/src/test/java/org/apache/axiom/test/UsesConstraintsTest.java
index b80e587..a57f5cf 100644
--- a/systests/osgi-tests/src/test/java/org/apache/axiom/test/UsesConstraintsTest.java
+++ b/systests/osgi-tests/src/test/java/org/apache/axiom/test/UsesConstraintsTest.java
@@ -104,7 +104,7 @@ public class UsesConstraintsTest {
bundles.add(context.installBundle("link:classpath:META-INF/links/org.ops4j.pax.logging.api.link"));
bundles.add(context.installBundle("link:classpath:org.apache.servicemix.specs.stax-api-1.0.link"));
bundles.add(context.installBundle("link:classpath:stax2-api.link"));
- bundles.add(context.installBundle("link:classpath:woodstox-core-asl.link"));
+ bundles.add(context.installBundle("link:classpath:com.fasterxml.woodstox.woodstox-core.link"));
bundles.add(context.installBundle("link:classpath:com.sun.activation.javax.activation.link"));
bundles.add(context.installBundle("link:classpath:org.apache.james.apache-mime4j-core.link"));
bundles.add(context.installBundle("link:classpath:org.apache.ws.commons.axiom.axiom-api.link"));
diff --git a/systests/wildfly-tests/pom.xml b/systests/wildfly-tests/pom.xml
index 1466bfd..79cf9b7 100644
--- a/systests/wildfly-tests/pom.xml
+++ b/systests/wildfly-tests/pom.xml
@@ -106,7 +106,7 @@
<goal>copy-dependencies</goal>
</goals>
<configuration>
- <includeArtifactIds>axiom-api,axiom-impl,woodstox-core-asl,stax2-api</includeArtifactIds>
+ <includeArtifactIds>axiom-api,axiom-impl,woodstox-core,stax2-api</includeArtifactIds>
<outputDirectory>${project.build.directory}/deps</outputDirectory>
</configuration>
</execution>
diff --git a/testing/xml-testsuite/pom.xml b/testing/xml-testsuite/pom.xml
index 74bc85f..cf67106 100644
--- a/testing/xml-testsuite/pom.xml
+++ b/testing/xml-testsuite/pom.xml
@@ -36,8 +36,8 @@
<dependencies>
<dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>woodstox-core-asl</artifactId>
+ <groupId>com.fasterxml.woodstox</groupId>
+ <artifactId>woodstox-core</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
diff --git a/testing/xml-truth/pom.xml b/testing/xml-truth/pom.xml
index 86eec6a..9f68ed1 100644
--- a/testing/xml-truth/pom.xml
+++ b/testing/xml-truth/pom.xml
@@ -36,8 +36,8 @@
<artifactId>truth</artifactId>
</dependency>
<dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>woodstox-core-asl</artifactId>
+ <groupId>com.fasterxml.woodstox</groupId>
+ <artifactId>woodstox-core</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>