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

Merge branch 'master' into subscription_cleanup

This commit is contained in:
James Agnew 2018-08-10 09:16:32 -04:00
parent ece0c9defe 64b3b64208
commit 321e71e9a9
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,8 +17,8 @@
<properties>
<features.file>features.xml</features.file>
<pax-logging-version>1.8.6</pax-logging-version>
<felix-framework-version>3.2.2</felix-framework-version>
<pax-logging-version>1.10.1</pax-logging-version>
<felix-framework-version>6.0.0</felix-framework-version>
</properties>
<dependencies>

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

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

2
pom.xml
View File

@ -489,7 +489,7 @@
<!-- Dependency Versions -->
<activation_api_version>1.2.0</activation_api_version>
<apache_karaf_version>4.1.4</apache_karaf_version>
<apache_karaf_version>4.2.0</apache_karaf_version>
<aries_spifly_version>1.0.10</aries_spifly_version>
<caffeine_version>2.6.2</caffeine_version>
<commons_codec_version>1.11</commons_codec_version>