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

Merge pull request #2830 from hapifhir/mb-docker-mac-m1-arm 

Upgrade net.java.dev.jna dependency to support Mac M1 ARM architecture.
This commit is contained in:
michaelabuckley 2021-07-23 16:50:31 -04:00 committed by GitHub
parent 6f7f787813 2539f49662
commit 91bbebad27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/5_5_0/2830-support-mac-arm.yaml Normal file
View File

@ -0,0 +1,3 @@
---
type: add
title: "Upgrade net.java.dev.jna to run docker tests on Mac arm64 M1 machines"

20
pom.xml
View File

@ -822,6 +822,7 @@
<spring_retry_version>1.2.2.RELEASE</spring_retry_version>
<stax2_api_version>3.1.4</stax2_api_version>
<testcontainers_version>1.15.3</testcontainers_version>
<thymeleaf-version>3.0.12.RELEASE</thymeleaf-version>
<woodstox_core_asl_version>4.4.1</woodstox_core_asl_version>
@ -1593,8 +1594,21 @@
<groupId>org.yaml</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<!-- Elastic have repackaged net.java.dev.jna, but we need a newer version to support Mac ARM. Managed below. -->
<groupId>org.elasticsearch</groupId>
<artifactId>jna</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- Upgrade testcontainers and elasticsearch dependency for Mac M1 ARM64 support.
We can delete this once testcontainers and elasticsearch upgrade. -->
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
<version>5.8.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hibernate.search</groupId>
<artifactId>hibernate-search-backend-elasticsearch</artifactId>
@ -1876,19 +1890,19 @@
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
<version>1.15.3</version>
<version>${testcontainers_version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>elasticsearch</artifactId>
<version>1.15.3</version>
<version>${testcontainers_version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>junit-jupiter</artifactId>
<version>1.15.3</version>
<version>${testcontainers_version}</version>
<scope>test</scope>
</dependency>
<dependency>