honeymoose/hapi-fhir
1
0
Fork 0
mirror of https://github.com/hapifhir/hapi-fhir.git synced 2025-03-09 14:33:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Karaf related fixes for jdk11

Browse Source
This commit is contained in:
jpoth 2018-12-14 17:11:28 +01:00 committed by James Agnew
parent 3109a269b3
commit cda84c4b3a
4 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
osgi/hapi-fhir-karaf-features/pom.xml
View File

@ -17,8 +17,12 @@
<properties> <properties>
<features.file>features.xml</features.file> <features.file>features.xml</features.file>
<pax-logging-version>1.8.6</pax-logging-version> <pax_logging_version>1.10.1</pax_logging_version>
<felix-framework-version>3.2.2</felix-framework-version> <felix_framework_version>3.2.2</felix_framework_version>
<osgi_version>6.0.0</osgi_version>
<configadmin_version>1.9.10</configadmin_version>
<aries_blueprint_api_version>1.0.1</aries_blueprint_api_version>
<aries_blueprint_core_version>1.10.1</aries_blueprint_core_version>
</properties> </properties>
<dependencies> <dependencies>
@ -87,43 +91,43 @@
<dependency> <dependency>
<groupId>org.osgi</groupId> <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId> <artifactId>org.osgi.core</artifactId>
<version>4.3.1</version> <version>${osgi_version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.ops4j.pax.logging</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-api</artifactId> <artifactId>pax-logging-api</artifactId>
<version>${pax-logging-version}</version> <version>${pax_logging_version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.ops4j.pax.logging</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-service</artifactId> <artifactId>pax-logging-service</artifactId>
<version>${pax-logging-version}</version> <version>${pax_logging_version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId> <artifactId>org.apache.felix.framework</artifactId>
<version>${felix-framework-version}</version> <version>${felix_framework_version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId> <artifactId>org.apache.felix.configadmin</artifactId>
<version>1.8.8</version> <version>${configadmin_version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.aries.blueprint</groupId> <groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.api</artifactId> <artifactId>org.apache.aries.blueprint.api</artifactId>
<version>1.0.1</version> <version>${aries_blueprint_api_version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.aries.blueprint</groupId> <groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId> <artifactId>org.apache.aries.blueprint.core</artifactId>
<version>1.0.1</version> <version>${aries_blueprint_core_version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

2
osgi/hapi-fhir-karaf-integration-tests/pom.xml
View File

@ -33,7 +33,7 @@
</description> </description>
<properties> <properties>
<pax.exam.version>4.12.0</pax.exam.version> <pax.exam.version>4.13.1</pax.exam.version>
</properties> </properties>
<dependencies> <dependencies>

5
osgi/hapi-fhir-karaf-integration-tests/src/test/java/ca/uhn/fhir/tests/integration/karaf/dstu3/Dstu3XmlParserTest.java
View File

@ -74,6 +74,7 @@ import org.hl7.fhir.dstu3.model.SimpleQuantity;
import org.hl7.fhir.dstu3.model.StringType; import org.hl7.fhir.dstu3.model.StringType;
import org.hl7.fhir.dstu3.model.UriType; import org.hl7.fhir.dstu3.model.UriType;
import org.hl7.fhir.dstu3.model.ValueSet; import org.hl7.fhir.dstu3.model.ValueSet;
import org.hl7.fhir.exceptions.FHIRFormatError;
import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.instance.model.api.IBaseResource;
import org.hl7.fhir.instance.model.api.IIdType; import org.hl7.fhir.instance.model.api.IIdType;
import org.junit.Assert; import org.junit.Assert;
@ -3196,8 +3197,8 @@ public class Dstu3XmlParserTest {
try { try {
ourCtx.newXmlParser().parseResource(Patient.class, input); ourCtx.newXmlParser().parseResource(Patient.class, input);
fail(); fail();
} catch (DataFormatException e) { } catch (FHIRFormatError e) {
assertThat(e.toString(), containsString("Undeclared general entity")); assertThat(e.toString(), containsString("unable to parse character reference "));
} }
} }

8
pom.xml
View File

@ -503,13 +503,13 @@
<!-- Dependency Versions --> <!-- Dependency Versions -->
<activation_api_version>1.2.0</activation_api_version> <activation_api_version>1.2.0</activation_api_version>
<apache_karaf_version>4.1.6</apache_karaf_version> <apache_karaf_version>4.2.2-SNAPSHOT</apache_karaf_version>
<aries_spifly_version>1.0.10</aries_spifly_version> <aries_spifly_version>1.2</aries_spifly_version>
<caffeine_version>2.6.2</caffeine_version> <caffeine_version>2.6.2</caffeine_version>
<commons_codec_version>1.11</commons_codec_version> <commons_codec_version>1.11</commons_codec_version>
<commons_text_version>1.4</commons_text_version> <commons_text_version>1.6</commons_text_version>
<commons_io_version>2.6</commons_io_version> <commons_io_version>2.6</commons_io_version>
<commons_lang3_version>3.8</commons_lang3_version> <commons_lang3_version>3.8.1</commons_lang3_version>
<derby_version>10.14.2.0</derby_version> <derby_version>10.14.2.0</derby_version>
<error_prone_annotations_version>2.0.18</error_prone_annotations_version> <error_prone_annotations_version>2.0.18</error_prone_annotations_version>
<guava_version>25.0-jre</guava_version> <guava_version>25.0-jre</guava_version>