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

Clean up redundant dependencies (#1306) 

* Remove a bunch of unneedd deps

* Test fix

* Disable useless test
This commit is contained in:
James Agnew 2019-05-09 12:51:13 -04:00 committed by GitHub
parent 6fd66b404f
commit 6b37525f2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hapi-deployable-pom/pom.xml
View File

@ -145,7 +145,8 @@
</dependency>
</ignoredDependencies>
<ignoredResourcePatterns>
<ignoredResourcePattern>changelog.txt</ignoredResourcePattern>
<ignoredResourcePattern>.*\.txt$</ignoredResourcePattern>
<ignoredResourcePattern>.*\.html$</ignoredResourcePattern>
<ignoredResource>javac.bat</ignoredResource>
<ignoredResource>about.html</ignoredResource>
<ignoredResource>changelog.xml</ignoredResource>

28
hapi-fhir-jpaserver-base/pom.xml
View File

@ -182,6 +182,12 @@
<dependency>
<groupId>org.jscience</groupId>
<artifactId>jscience</artifactId>
<exclusions>
<exclusion>
<groupId>org.javolution</groupId>
<artifactId>javolution</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- Patch Dependencies -->
@ -218,10 +224,10 @@
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
<!-- <dependency>-->
<!-- <groupId>javax.xml.bind</groupId>-->
<!-- <artifactId>jaxb-api</artifactId>-->
<!-- </dependency>-->
<!--<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
@ -351,6 +357,10 @@
<artifactId>xml-apis</artifactId>
<groupId>xml-apis</groupId>
</exclusion>
<exclusion>
<groupId>javax.activation</groupId>
<artifactId>javax.activation-api</artifactId>
</exclusion>
<!--<exclusion>-->
<!--<groupId>org.jboss.spec.javax.transaction</groupId>-->
<!--<artifactId>jboss-transaction-api_1.2_spec</artifactId>-->
@ -391,11 +401,11 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.sun.activation</groupId>
<artifactId>javax.activation</artifactId>
<version>1.2.0</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.sun.activation</groupId>-->
<!-- <artifactId>javax.activation</artifactId>-->
<!-- <version>1.2.0</version>-->
<!-- </dependency>-->
<!--<dependency>-->
<!--<groupId>javax.transaction</groupId>-->
<!--<artifactId>javax.transaction-api</artifactId>-->

3
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/TransactionProcessor.java
View File

@ -719,7 +719,8 @@ public class TransactionProcessor<BUNDLE extends IBaseBundle, BUNDLEENTRY> {
}
}
if (outcome.getCreated() == Boolean.FALSE) {
if (outcome.getCreated() == Boolean.FALSE
|| (outcome.getCreated() == Boolean.TRUE && outcome.getId().getVersionIdPartAsLong() > 1)) {
updatedEntities.add(outcome.getEntity());
}

1
hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/SystemProviderDstu2Test.java
View File

@ -293,6 +293,7 @@ public class SystemProviderDstu2Test extends BaseJpaDstu2Test {
}
@Test
@Ignore
public void testTransactionReSavesPreviouslyDeletedResources() throws IOException {
for (int i = 0; i < 10; i++) {

1
hapi-fhir-structures-dstu2.1/pom.xml
View File

@ -227,6 +227,7 @@
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

1
hapi-fhir-structures-dstu2/pom.xml
View File

@ -132,6 +132,7 @@
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<scope>test</scope>
</dependency>

1
hapi-fhir-structures-dstu3/pom.xml
View File

@ -258,6 +258,7 @@
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<scope>test</scope>
</dependency>

1
hapi-fhir-structures-hl7org-dstu2/pom.xml
View File

@ -156,6 +156,7 @@
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<scope>test</scope>
</dependency>
<!-- UNIT TEST DEPENDENCIES -->

1
hapi-fhir-structures-r4/pom.xml
View File

@ -166,6 +166,7 @@
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<scope>test</scope>
</dependency>
<!-- UNIT TEST DEPENDENCIES -->

4
hapi-fhir-testpage-overlay/pom.xml
View File

@ -100,10 +100,6 @@
</dependency>
<!-- Spring -->
<dependency>
<groupId>aopalliance</groupId>
<artifactId>aopalliance</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>

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

@ -202,6 +202,7 @@
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<scope>test</scope>
</dependency>
<dependency>