You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2020/09/02 22:00:08 UTC
[isis] 08/17: ISIS-2222: force woodstox version as transitively
required by isis-testing-integtestsupport-applib
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2222
in repository https://gitbox.apache.org/repos/asf/isis.git
commit ab1f8472b4778e71fe1788b699b2cbd1215f4c5d
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Aug 30 12:41:07 2020 +0100
ISIS-2222: force woodstox version as transitively required by isis-testing-integtestsupport-applib
... for compatibility with cxf-rt-rs-client as used by isis-extensions-command-replay-impl
---
testing/integtestsupport/applib/pom.xml | 57 +++++++++++++++++++++++++++++++++
1 file changed, 57 insertions(+)
diff --git a/testing/integtestsupport/applib/pom.xml b/testing/integtestsupport/applib/pom.xml
index 656d70d..7f89bef 100644
--- a/testing/integtestsupport/applib/pom.xml
+++ b/testing/integtestsupport/applib/pom.xml
@@ -135,6 +135,23 @@
<activation>
<jdk>[11,)</jdk>
</activation>
+
+ <dependencyManagement>
+ <dependencies>
+ <!-- dependency convergence with org.apache.cxf:cxf-core:3.4.0 (used by isis-mappings-jaxrsclient-impl) -->
+ <dependency>
+ <groupId>com.fasterxml.woodstox</groupId>
+ <artifactId>woodstox-core</artifactId>
+ <version>6.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>stax2-api</artifactId>
+ <version>4.2.1</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<!--
These dependencies are required in order to build on jdk11
-->
@@ -149,9 +166,49 @@
<groupId>jakarta.jws</groupId>
<artifactId>jakarta.jws-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-rt</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-rt</artifactId>
+ <version>${jaxws-ri.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-rt</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-rt</artifactId>
+ <version>${jaxws-ri.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.woodstox</groupId>
+ <artifactId>woodstox-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>stax2-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
+ <groupId>com.fasterxml.woodstox</groupId>
+ <artifactId>woodstox-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>stax2-api</artifactId>
+ </dependency>
+
+
+ <dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>