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 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
parent 53eae9b51f e01aa876c8
commit 4ec909e302
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 53 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
checkstyle_suppressions.xml Normal file
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>

4
org.hl7.fhir.convertors/pom.xml
View File

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

4
org.hl7.fhir.dstu2/pom.xml
View File

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

4
org.hl7.fhir.dstu2016may/pom.xml
View File

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

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

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

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

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

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

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

4
org.hl7.fhir.r5/pom.xml
View File

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

1
org.hl7.fhir.report/pom.xml
View File

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

4
org.hl7.fhir.utilities/pom.xml
View File

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

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

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

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

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

7
pom.xml
View File

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