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

Merge pull request #1434 from jamesagnew/ks-awaitility-version-bump 

awaitility version bump
This commit is contained in:
Ken Stevens 2019-08-21 15:58:42 -04:00 committed by GitHub
parent 9428430822 37c1ba44fe
commit 7d008b2ee0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -146,7 +146,11 @@
<artifactId>logback-classic</artifactId> <artifactId>logback-classic</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>org.javassist</groupId> <groupId>org.javassist</groupId>
<artifactId>javassist</artifactId> <artifactId>javassist</artifactId>

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

@ -216,6 +216,11 @@
<version>${project.version}</version> <version>${project.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>

4
hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/parser/XmlParserDstu2Test.java
View File

@ -802,7 +802,6 @@ public class XmlParserDstu2Test {
//@formatter:off //@formatter:off
assertThat(enc, stringContainsInOrder("<Patient xmlns=\"http://hl7.org/fhir\">", assertThat(enc, stringContainsInOrder("<Patient xmlns=\"http://hl7.org/fhir\">",
"<meta>",
"<meta>", "<meta>",
"<profile value=\"http://foo/Profile1\"/>", "<profile value=\"http://foo/Profile1\"/>",
"<profile value=\"http://foo/Profile2\"/>", "<profile value=\"http://foo/Profile2\"/>",
@ -817,7 +816,6 @@ public class XmlParserDstu2Test {
"<display value=\"label2\"/>", "<display value=\"label2\"/>",
"</tag>", "</tag>",
"</meta>", "</meta>",
"</meta>",
"<name>", "<name>",
"<family value=\"FAMILY\"/>", "<family value=\"FAMILY\"/>",
"</name>", "</name>",
@ -856,7 +854,6 @@ public class XmlParserDstu2Test {
//@formatter:off //@formatter:off
assertThat(enc, stringContainsInOrder("<Patient xmlns=\"http://hl7.org/fhir\">", assertThat(enc, stringContainsInOrder("<Patient xmlns=\"http://hl7.org/fhir\">",
"<meta>",
"<meta>", "<meta>",
"<tag>", "<tag>",
"<system value=\"scheme1\"/>", "<system value=\"scheme1\"/>",
@ -869,7 +866,6 @@ public class XmlParserDstu2Test {
"<display value=\"label2\"/>", "<display value=\"label2\"/>",
"</tag>", "</tag>",
"</meta>", "</meta>",
"</meta>",
"<name>", "<name>",
"<family value=\"FAMILY\"/>", "<family value=\"FAMILY\"/>",
"</name>", "</name>",

5
hapi-fhir-test-utilities/pom.xml
View File

@ -46,11 +46,6 @@
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
</dependency>
</dependencies> </dependencies>
<build> <build>

16
pom.xml
View File

@ -1062,21 +1062,7 @@
<dependency> <dependency>
<groupId>org.awaitility</groupId> <groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId> <artifactId>awaitility</artifactId>
<version>3.1.6</version> <version>4.0.0-rc1</version>
<exclusions>
<exclusion>
<groupId>org.hamcrest</groupId>
<artifactId>java-hamcrest</artifactId>
</exclusion>
<exclusion>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>