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

Merge remote-tracking branch 'origin/master' into kh_2526_Add_Operation_Section_to_Conformance_Statements_resource_section

This commit is contained in:
Kevin Hartmann 2021-04-27 09:29:53 -04:00
parent 3a901a6671 1d054054c7
commit 334ce0e049
3 changed files with 30 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hapi-fhir-base/pom.xml
View File

@ -73,15 +73,13 @@
<!-- JENA Dependencies - Used for Turtle encoding --> <!-- JENA Dependencies - Used for Turtle encoding -->
<dependency> <dependency>
<groupId>org.apache.jena</groupId> <groupId>org.apache.jena</groupId>
<artifactId>apache-jena-libs</artifactId> <artifactId>jena-core</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-arq</artifactId>
<optional>true</optional> <optional>true</optional>
<type>pom</type>
<exclusions>
<exclusion>
<groupId>com.github.jsonld-java</groupId>
<artifactId>jsonld-java</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>

31
hapi-fhir-validation/pom.xml
View File

@ -284,27 +284,24 @@
<artifactId>spring-core</artifactId> <artifactId>spring-core</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>apache-jena-libs</artifactId>
<scope>test</scope>
<type>pom</type>
<exclusions>
<exclusion>
<groupId>com.github.jsonld-java</groupId>
<artifactId>jsonld-java</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency> <dependency>
<groupId>ca.uhn.hapi.fhir</groupId> <groupId>org.apache.jena</groupId>
<artifactId>hapi-fhir-jpaserver-model</artifactId> <artifactId>jena-core</artifactId>
<version>5.4.0-PRE5-SNAPSHOT</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-arq</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-jpaserver-model</artifactId>
<version>5.4.0-PRE8-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<reporting> <reporting>
<plugins> <plugins>

16
pom.xml
View File

@ -1249,12 +1249,16 @@
<artifactId>apache-jena-libs</artifactId> <artifactId>apache-jena-libs</artifactId>
<version>${jena_version}</version> <version>${jena_version}</version>
<type>pom</type> <type>pom</type>
<exclusions> </dependency>
<exclusion> <dependency>
<groupId>com.github.jsonld-java</groupId> <groupId>org.apache.jena</groupId>
<artifactId>jsonld-java</artifactId> <artifactId>jena-core</artifactId>
</exclusion> <version>${jena_version}</version>
</exclusions> </dependency>
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-arq</artifactId>
<version>${jena_version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.lucene</groupId> <groupId>org.apache.lucene</groupId>