Merge branch 'master' into gg-202304-r6-support

This commit is contained in:
Grahame Grieve 2023-04-28 10:50:28 +10:00 committed by GitHub
commit 4ec909e302
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 53 additions and 3 deletions

View File

@ -0,0 +1,8 @@
<?xml version="1.0"?>
<!DOCTYPE suppressions PUBLIC
"-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
"https://checkstyle.org/dtds/suppressions_1_2.dtd">
<suppressions>
</suppressions>

View File

@ -12,6 +12,10 @@
<artifactId>org.hl7.fhir.convertors</artifactId>
<packaging>bundle</packaging>
<properties>
<checkstyle_config_location>${project.parent.basedir}</checkstyle_config_location>
</properties>
<dependencies>
<!-- Commons -->

View File

@ -12,6 +12,10 @@
<artifactId>org.hl7.fhir.dstu2</artifactId>
<packaging>bundle</packaging>
<properties>
<checkstyle_config_location>${project.parent.basedir}</checkstyle_config_location>
</properties>
<dependencies>
<!-- HAPI Dependencies -->

View File

@ -12,6 +12,10 @@
<artifactId>org.hl7.fhir.dstu2016may</artifactId>
<packaging>bundle</packaging>
<properties>
<checkstyle_config_location>${project.parent.basedir}</checkstyle_config_location>
</properties>
<dependencies>
<!-- HAPI Dependencies -->

View File

@ -12,6 +12,10 @@
<artifactId>org.hl7.fhir.dstu3</artifactId>
<packaging>bundle</packaging>
<properties>
<checkstyle_config_location>${project.parent.basedir}</checkstyle_config_location>
</properties>
<dependencies>
<!-- HAPI Dependencies -->

View File

@ -12,6 +12,10 @@
<artifactId>org.hl7.fhir.r4</artifactId>
<packaging>bundle</packaging>
<properties>
<checkstyle_config_location>${project.parent.basedir}</checkstyle_config_location>
</properties>
<dependencies>
<!-- HAPI Dependencies -->

View File

@ -12,6 +12,10 @@
<artifactId>org.hl7.fhir.r4b</artifactId>
<packaging>bundle</packaging>
<properties>
<checkstyle_config_location>${project.parent.basedir}</checkstyle_config_location>
</properties>
<dependencies>
<!-- HAPI Dependencies -->
<dependency>

View File

@ -12,6 +12,10 @@
<artifactId>org.hl7.fhir.r5</artifactId>
<packaging>bundle</packaging>
<properties>
<checkstyle_config_location>${project.parent.basedir}</checkstyle_config_location>
</properties>
<dependencies>
<!-- HAPI Dependencies -->
<dependency>

View File

@ -16,6 +16,7 @@
<properties>
<maven.deploy.skip>true</maven.deploy.skip>
<checkstyle_config_location>${project.parent.basedir}</checkstyle_config_location>
</properties>
<dependencies>

View File

@ -12,6 +12,10 @@
<artifactId>org.hl7.fhir.utilities</artifactId>
<packaging>bundle</packaging>
<properties>
<checkstyle_config_location>${project.parent.basedir}</checkstyle_config_location>
</properties>
<dependencies>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>

View File

@ -12,6 +12,10 @@
<artifactId>org.hl7.fhir.validation.cli</artifactId>
<packaging>jar</packaging>
<properties>
<checkstyle_config_location>${project.parent.basedir}</checkstyle_config_location>
</properties>
<dependencies>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>

View File

@ -12,6 +12,10 @@
<artifactId>org.hl7.fhir.validation</artifactId>
<packaging>bundle</packaging>
<properties>
<checkstyle_config_location>${project.parent.basedir}</checkstyle_config_location>
</properties>
<dependencies>
<!-- HAPI Dependencies -->

View File

@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-deployable-pom</artifactId>
<version>6.2.1</version>
<version>6.4.1</version>
</parent>
<!--
@ -18,7 +18,7 @@
<packaging>pom</packaging>
<properties>
<hapi_fhir_version>6.2.1</hapi_fhir_version>
<hapi_fhir_version>6.4.1</hapi_fhir_version>
<validator_test_case_version>1.3.1-SNAPSHOT</validator_test_case_version>
<jackson_version>2.14.0</jackson_version>
<junit_jupiter_version>5.9.2</junit_jupiter_version>
@ -39,6 +39,7 @@
<maven.compiler.testSource>11</maven.compiler.testSource>
<maven.compiler.testTarget>11</maven.compiler.testTarget>
<maven-jar-plugin.version>3.2.2</maven-jar-plugin.version>
<checkstyle_config_location>${project.basedir}</checkstyle_config_location>
</properties>
<name>HL7 Core Artifacts</name>
@ -192,7 +193,7 @@
<enableRulesSummary>true</enableRulesSummary>
<enableSeveritySummary>true</enableSeveritySummary>
<consoleOutput>true</consoleOutput>
<configLocation>${project.basedir}/../checkstyle.xml</configLocation>
<configLocation>${checkstyle_config_location}/checkstyle.xml</configLocation>
</configuration>
</execution>
</executions>