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

Merge pull request #734 from hapifhir/dotasek-fix-validationservicetest-java17 

Bump mockito and bytebuddy versions for Java 17 compatibility
This commit is contained in:
Grahame Grieve 2022-02-11 07:47:35 +11:00 committed by GitHub
parent 9f2d9f9dac 37c1e7e720
commit a0b9c76365
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 18 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
org.hl7.fhir.dstu3/pom.xml
View File

@ -52,11 +52,6 @@
</dependency>
<!-- HTTP Client -->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>

7
org.hl7.fhir.r4/pom.xml
View File

@ -104,13 +104,6 @@
<optional>true</optional>
</dependency>
<!-- HTTP Client -->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<optional>true</optional>
</dependency>
<!-- Test dependencies -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>

5
org.hl7.fhir.r4b/pom.xml
View File

@ -58,11 +58,6 @@
</dependency>
<!-- HTTP Client -->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>

6
org.hl7.fhir.validation.cli/pom.xml
View File

@ -76,7 +76,7 @@
<goal>unpack-dependencies</goal>
</goals>
<configuration>
<excludes>**/module-info.class</excludes>
<excludes>**/module-info.class,META-INF/*.SF,META-INF/*.DSA,META-INF/*.RSA</excludes>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>true</overWriteSnapshots>
@ -121,7 +121,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.2.1</version>
<version>1.6.0</version>
<executions>
<execution>
<id>default-cli</id>
@ -134,7 +134,7 @@
<workingDirectory>/tmp</workingDirectory>
<arguments>
<argument>-jar</argument>
<argument>${basedir}/target/org.hl7.fhir.validation.cli-${project.version}.jar</argument>
<argument>${project.basedir}/target/org.hl7.fhir.validation.cli-${project.version}.jar</argument>
</arguments>
</configuration>
</execution>

12
org.hl7.fhir.validation/pom.xml
View File

@ -217,7 +217,12 @@
<version>${junit_jupiter_version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
<optional>true</optional>
<scope>test</scope>
</dependency>
<!-- End to end -->
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
@ -245,11 +250,6 @@
<goals>
<goal>test</goal>
</goals>
<configuration>
<excludes combine.children="override">
<exclude>org/hl7/fhir/validation/cli/services/ValidationServiceTest.java</exclude>
</excludes>
</configuration>
</execution>
</executions>
</plugin>

11
pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-deployable-pom</artifactId>
<version>5.1.0</version>
<version>5.4.0</version>
</parent>
<!--
@ -18,7 +18,7 @@
<packaging>pom</packaging>
<properties>
<hapi_fhir_version>5.1.0</hapi_fhir_version>
<hapi_fhir_version>5.4.0</hapi_fhir_version>
<validator_test_case_version>1.1.88</validator_test_case_version>
<junit_jupiter_version>5.7.1</junit_jupiter_version>
<junit_platform_launcher_version>1.7.1</junit_platform_launcher_version>
@ -27,6 +27,7 @@
<jacoco_version>0.8.7</jacoco_version>
<info_cqframework_version>1.5.1</info_cqframework_version>
<lombok_version>1.18.22</lombok_version>
<byte_buddy_version>1.10.21</byte_buddy_version>
</properties>
<name>HL7 Core Artifacts</name>
@ -139,6 +140,12 @@
<version>${junit_jupiter_version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
<version>${byte_buddy_version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>