honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bump woodstox version (#2199)

This commit is contained in:
James Agnew 2020-11-27 19:49:06 -05:00 committed by GitHub
parent b85fd42ead
commit 1e5def260c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 58 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hapi-fhir-android/pom.xml
View File

@ -36,8 +36,8 @@
<artifactId>commons-codec</artifactId> <artifactId>commons-codec</artifactId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<groupId>org.codehaus.woodstox</groupId> <groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core-asl</artifactId> <artifactId>woodstox-core</artifactId>
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
@ -79,11 +79,6 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>woodstox-core-asl</artifactId>
<optional>true</optional>
</dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-android</artifactId> <artifactId>slf4j-android</artifactId>

4
hapi-fhir-base/pom.xml
View File

@ -26,8 +26,8 @@
<!-- XML --> <!-- XML -->
<dependency> <dependency>
<groupId>org.codehaus.woodstox</groupId> <groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core-asl</artifactId> <artifactId>woodstox-core</artifactId>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>

10
hapi-fhir-client-okhttp/pom.xml
View File

@ -59,11 +59,11 @@
</dependency> </dependency>
<!-- Unit test dependencies --> <!-- Unit test dependencies -->
<dependency> <dependency>
<groupId>org.codehaus.woodstox</groupId> <groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core-asl</artifactId> <artifactId>woodstox-core</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>

1
hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/5_3_0/changes.yaml
View File

@ -4,5 +4,6 @@
title: "The version of a few dependencies have been bumped to the latest versions title: "The version of a few dependencies have been bumped to the latest versions
(dependent HAPI modules listed in brackets): (dependent HAPI modules listed in brackets):
<ul> <ul>
<li>Woodstox (XML FHIR Parser): 4.4.1 -&gt; 6.2.3 (Note that the Maven groupId has changed from <code>org.codehaus.woodstox</code> to <code>com.fasterxml.woodstox</code> and the Maven artifactId has changed from <code>woodstox-core-asl</code> to <code>woodstox-core</code> for this library)</li>
<li>Jetty (JPA Starter): 9.4.30.v20200611 -&gt; 9.4.34.v20201102</li> <li>Jetty (JPA Starter): 9.4.30.v20200611 -&gt; 9.4.34.v20201102</li>
</ul>" </ul>"

10
hapi-fhir-jaxrsserver-base/pom.xml
View File

@ -94,11 +94,11 @@
</dependency> </dependency>
<!-- Unit test dependencies --> <!-- Unit test dependencies -->
<dependency> <dependency>
<groupId>org.codehaus.woodstox</groupId> <groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core-asl</artifactId> <artifactId>woodstox-core</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>

4
hapi-fhir-jpaserver-base/pom.xml
View File

@ -35,8 +35,8 @@
--> -->
<dependency> <dependency>
<groupId>org.codehaus.woodstox</groupId> <groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core-asl</artifactId> <artifactId>woodstox-core</artifactId>
</dependency> </dependency>
<dependency> <dependency>

10
hapi-fhir-structures-dstu2.1/pom.xml
View File

@ -40,11 +40,11 @@
<!-- <!--
Test dependencies on other optional parts of HAPI Test dependencies on other optional parts of HAPI
--> -->
<dependency> <dependency>
<groupId>org.codehaus.woodstox</groupId> <groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core-asl</artifactId> <artifactId>woodstox-core</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>ca.uhn.hapi.fhir</groupId> <groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-validation-resources-dstu2.1</artifactId> <artifactId>hapi-fhir-validation-resources-dstu2.1</artifactId>

10
hapi-fhir-structures-dstu2/pom.xml
View File

@ -23,11 +23,11 @@
<!-- <!--
Test dependencies on other optional parts of HAPI Test dependencies on other optional parts of HAPI
--> -->
<dependency> <dependency>
<groupId>org.codehaus.woodstox</groupId> <groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core-asl</artifactId> <artifactId>woodstox-core</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>ca.uhn.hapi.fhir</groupId> <groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-validation-resources-dstu2</artifactId> <artifactId>hapi-fhir-validation-resources-dstu2</artifactId>

8
hapi-fhir-structures-dstu3/pom.xml
View File

@ -131,11 +131,11 @@
<version>${project.version}</version> <version>${project.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.woodstox</groupId> <groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core-asl</artifactId> <artifactId>woodstox-core</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>ca.uhn.hapi.fhir</groupId> <groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-client</artifactId> <artifactId>hapi-fhir-client</artifactId>

10
hapi-fhir-structures-hl7org-dstu2/pom.xml
View File

@ -34,11 +34,11 @@
<!-- <!--
Test dependencies on other optional parts of HAPI Test dependencies on other optional parts of HAPI
--> -->
<dependency> <dependency>
<groupId>org.codehaus.woodstox</groupId> <groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core-asl</artifactId> <artifactId>woodstox-core</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>ca.uhn.hapi.fhir</groupId> <groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-validation-resources-dstu2</artifactId> <artifactId>hapi-fhir-validation-resources-dstu2</artifactId>

4
hapi-fhir-structures-r4/pom.xml
View File

@ -51,8 +51,8 @@
Optional dependencies from RI codebase Optional dependencies from RI codebase
--> -->
<dependency> <dependency>
<groupId>org.codehaus.woodstox</groupId> <groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core-asl</artifactId> <artifactId>woodstox-core</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>

4
hapi-fhir-structures-r5/pom.xml
View File

@ -47,8 +47,8 @@
Optional dependencies from RI codebase Optional dependencies from RI codebase
--> -->
<dependency> <dependency>
<groupId>org.codehaus.woodstox</groupId> <groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core-asl</artifactId> <artifactId>woodstox-core</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>

10
hapi-fhir-validation/pom.xml
View File

@ -183,11 +183,11 @@
</dependency> </dependency>
<!-- Test Deps --> <!-- Test Deps -->
<dependency> <dependency>
<groupId>org.codehaus.woodstox</groupId> <groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core-asl</artifactId> <artifactId>woodstox-core</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>ca.uhn.hapi.fhir</groupId> <groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-server</artifactId> <artifactId>hapi-fhir-server</artifactId>

6
pom.xml
View File

@ -1249,9 +1249,9 @@
<version>3.1.0</version> <version>3.1.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.woodstox</groupId> <groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core-asl</artifactId> <artifactId>woodstox-core</artifactId>
<version>${woodstox_core_asl_version}</version> <version>6.2.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.ebaysf.web</groupId> <groupId>org.ebaysf.web</groupId>

8
tests/hapi-fhir-base-test-mindeps-client/pom.xml
View File

@ -53,8 +53,8 @@
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<artifactId>woodstox-core-asl</artifactId> <groupId>com.fasterxml.woodstox</groupId>
<groupId>org.codehaus.woodstox</groupId> <artifactId>woodstox-core</artifactId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
@ -79,8 +79,8 @@
<version>${project.version}</version> <version>${project.version}</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<artifactId>woodstox-core-asl</artifactId> <groupId>com.fasterxml.woodstox</groupId>
<groupId>org.codehaus.woodstox</groupId> <artifactId>woodstox-core</artifactId>
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>

12
tests/hapi-fhir-base-test-mindeps-server/pom.xml
View File

@ -56,8 +56,8 @@
<version>${project.version}</version> <version>${project.version}</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<artifactId>woodstox-core-asl</artifactId> <groupId>com.fasterxml.woodstox</groupId>
<groupId>org.codehaus.woodstox</groupId> <artifactId>woodstox-core</artifactId>
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
@ -67,8 +67,8 @@
<version>${project.version}</version> <version>${project.version}</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<artifactId>woodstox-core-asl</artifactId> <groupId>com.fasterxml.woodstox</groupId>
<groupId>org.codehaus.woodstox</groupId> <artifactId>woodstox-core</artifactId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<groupId>ca.uhn.hapi.fhir</groupId> <groupId>ca.uhn.hapi.fhir</groupId>
@ -87,8 +87,8 @@
<version>${project.version}</version> <version>${project.version}</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<artifactId>woodstox-core-asl</artifactId> <groupId>com.fasterxml.woodstox</groupId>
<groupId>org.codehaus.woodstox</groupId> <artifactId>woodstox-core</artifactId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<groupId>ca.uhn.hapi.fhir</groupId> <groupId>ca.uhn.hapi.fhir</groupId>