diff --git a/hapi-fhir-base/examples/pom.xml b/hapi-fhir-base/examples/pom.xml index db98734220f..9e1e4f4348c 100644 --- a/hapi-fhir-base/examples/pom.xml +++ b/hapi-fhir-base/examples/pom.xml @@ -4,7 +4,7 @@ ca.uhn.hapi.fhir hapi-fhir - 0.6 + 0.7-SNAPSHOT ../../pom.xml @@ -17,7 +17,7 @@ ca.uhn.hapi.fhir hapi-fhir-base - 0.6 + 0.7-SNAPSHOT javax.servlet diff --git a/hapi-fhir-base/pom.xml b/hapi-fhir-base/pom.xml index 98bbb17faad..2d735d6f822 100644 --- a/hapi-fhir-base/pom.xml +++ b/hapi-fhir-base/pom.xml @@ -4,7 +4,7 @@ ca.uhn.hapi.fhir hapi-fhir - 0.6 + 0.7-SNAPSHOT ../pom.xml diff --git a/hapi-fhir-base/src/changes/changes.xml b/hapi-fhir-base/src/changes/changes.xml index dc019742bbe..59ca277db76 100644 --- a/hapi-fhir-base/src/changes/changes.xml +++ b/hapi-fhir-base/src/changes/changes.xml @@ -6,6 +6,11 @@ HAPI FHIR Changelog + + + Documentation update, thanks to Suranga Nath Kasthurirathne of the OpenMRS project. + + + + org.mitre + openid-connect-client + ${mitreid-connect-version} + + + org.springframework.security.oauth + spring-security-oauth2 + 2.0.2.RELEASE + + + + + javax.servlet + javax.servlet-api + ${servlet_api_version} + provided + + + + + junit + junit + ${junit_version} + test + + + ch.qos.logback + logback-classic + ${logback_version} + test + + + + xmlunit + xmlunit + 1.5 + test + + + org.eclipse.jetty + jetty-servlets + ${jetty_version} + test + + + org.eclipse.jetty + jetty-servlet + ${jetty_version} + test + + + org.eclipse.jetty + jetty-server + ${jetty_version} + test + + + org.eclipse.jetty + jetty-servlet + ${jetty_version} + test + + + org.eclipse.jetty + jetty-util + ${jetty_version} + test + + + org.eclipse.jetty + jetty-webapp + ${jetty_version} + test + + + + + org.mockito + mockito-all + ${mockito_version} + test + + + org.hamcrest + hamcrest-all + ${hamcrest_version} + test + + + + + + + + + + + + + + + src/main/resources + true + + + + + diff --git a/hapi-fhir-oauth2/src/test/java/ca/uhn/fhir/rest/server/security/OpenIdConnectBearerTokenServerInterceptorIntegrationTest.java b/hapi-fhir-oauth2/src/test/java/ca/uhn/fhir/rest/server/security/OpenIdConnectBearerTokenServerInterceptorIntegrationTest.java index 68a7175efb6..4807ba7e623 100644 --- a/hapi-fhir-oauth2/src/test/java/ca/uhn/fhir/rest/server/security/OpenIdConnectBearerTokenServerInterceptorIntegrationTest.java +++ b/hapi-fhir-oauth2/src/test/java/ca/uhn/fhir/rest/server/security/OpenIdConnectBearerTokenServerInterceptorIntegrationTest.java @@ -29,7 +29,6 @@ import ca.uhn.fhir.model.dstu.resource.Observation; import ca.uhn.fhir.rest.annotation.Search; import ca.uhn.fhir.rest.server.IResourceProvider; import ca.uhn.fhir.rest.server.RestfulServer; -import ca.uhn.fhir.util.PortUtil; /** * Created by dsotnikov on 2/25/2014. diff --git a/hapi-fhir-oauth2/src/test/java/ca/uhn/fhir/rest/server/security/PortUtil.java b/hapi-fhir-oauth2/src/test/java/ca/uhn/fhir/rest/server/security/PortUtil.java new file mode 100644 index 00000000000..5a56d310f9c --- /dev/null +++ b/hapi-fhir-oauth2/src/test/java/ca/uhn/fhir/rest/server/security/PortUtil.java @@ -0,0 +1,39 @@ +package ca.uhn.fhir.rest.server.security; + +import java.io.IOException; +import java.net.ServerSocket; +import java.util.ArrayList; +import java.util.List; + +/** + * Provides server ports + */ +public class PortUtil { + + private static List ourPorts = new ArrayList(); + + /** + * This is really only used for unit tests but is included in the library so it can be reused across modules. Use with caution. + */ + public static int findFreePort() { + ServerSocket server; + try { + server = new ServerSocket(0); + int port = server.getLocalPort(); + ourPorts.add(port); + server.close(); + Thread.sleep(500); + return port; + } catch (IOException e) { + throw new Error(e); + } catch (InterruptedException e) { + throw new Error(e); + } + } + + public static List list() { + return ourPorts; + } + +} + \ No newline at end of file diff --git a/hapi-fhir-structures-dstu/pom.xml b/hapi-fhir-structures-dstu/pom.xml index f5cad7d43bf..dda39a0f878 100644 --- a/hapi-fhir-structures-dstu/pom.xml +++ b/hapi-fhir-structures-dstu/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-fhir - 0.6 + 0.7-SNAPSHOT ../pom.xml @@ -18,7 +18,7 @@ ca.uhn.hapi.fhir hapi-fhir-base - 0.6 + 0.7-SNAPSHOT @@ -27,7 +27,7 @@ ca.uhn.hapi.fhir hapi-tinder-plugin - 0.6 + 0.7-SNAPSHOT diff --git a/hapi-fhir-testpage-overlay/pom.xml b/hapi-fhir-testpage-overlay/pom.xml index 65775889c7e..be8df6e6989 100644 --- a/hapi-fhir-testpage-overlay/pom.xml +++ b/hapi-fhir-testpage-overlay/pom.xml @@ -4,7 +4,7 @@ ca.uhn.hapi.fhir hapi-fhir - 0.6 + 0.7-SNAPSHOT ../pom.xml @@ -27,7 +27,7 @@ ca.uhn.hapi.fhir hapi-fhir-base - 0.6 + 0.7-SNAPSHOT org.thymeleaf @@ -50,7 +50,7 @@ ca.uhn.hapi.fhir hapi-fhir-jpaserver-test - 0.6 + 0.7-SNAPSHOT test diff --git a/hapi-tinder-plugin/pom.xml b/hapi-tinder-plugin/pom.xml index 0e320641aae..3142ebaf1f0 100644 --- a/hapi-tinder-plugin/pom.xml +++ b/hapi-tinder-plugin/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-fhir - 0.6 + 0.7-SNAPSHOT ../pom.xml @@ -19,7 +19,7 @@ ca.uhn.hapi.fhir hapi-fhir-base - 0.6 + 0.7-SNAPSHOT diff --git a/hapi-tinder-test/pom.xml b/hapi-tinder-test/pom.xml index 71a5c1eea6f..b03354f5be9 100644 --- a/hapi-tinder-test/pom.xml +++ b/hapi-tinder-test/pom.xml @@ -4,7 +4,7 @@ ca.uhn.hapi.fhir hapi-fhir - 0.6 + 0.7-SNAPSHOT ../pom.xml @@ -17,7 +17,7 @@ ca.uhn.hapi.fhir hapi-fhir-base - 0.6 + 0.7-SNAPSHOT @@ -40,7 +40,7 @@ ca.uhn.hapi.fhir hapi-tinder-plugin - 0.6 + 0.7-SNAPSHOT custom-structs diff --git a/pom.xml b/pom.xml index 96d9b94640d..b405e3b41c8 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ ca.uhn.hapi.fhir hapi-fhir pom - 0.6 + 0.7-SNAPSHOT HAPI-FHIR http://hl7api.sourceforge.net/hapi-fhir/ diff --git a/restful-server-example-test/pom.xml b/restful-server-example-test/pom.xml index 2b30ade836c..68e148fbc3e 100644 --- a/restful-server-example-test/pom.xml +++ b/restful-server-example-test/pom.xml @@ -4,7 +4,7 @@ ca.uhn.hapi.fhir hapi-fhir - 0.6-SNAPSHOT + 0.7-SNAPSHOT ../pom.xml @@ -17,7 +17,7 @@ ca.uhn.hapi.fhir hapi-fhir-base - 0.6-SNAPSHOT + 0.7-SNAPSHOT ch.qos.logback diff --git a/restful-server-example-test/pom.xml.versionsBackup b/restful-server-example-test/pom.xml.versionsBackup new file mode 100644 index 00000000000..2b30ade836c --- /dev/null +++ b/restful-server-example-test/pom.xml.versionsBackup @@ -0,0 +1,79 @@ + + 4.0.0 + + + ca.uhn.hapi.fhir + hapi-fhir + 0.6-SNAPSHOT + ../pom.xml + + + restful-server-example-test + jar + + HAPI FHIR Sample RESTful Server - Tests + + + + ca.uhn.hapi.fhir + hapi-fhir-base + 0.6-SNAPSHOT + + + ch.qos.logback + logback-classic + ${logback_version} + true + + + junit + junit + ${junit_version} + test + + + org.eclipse.jetty + jetty-servlets + ${jetty_version} + test + + + org.eclipse.jetty + jetty-servlet + ${jetty_version} + test + + + org.eclipse.jetty + jetty-server + ${jetty_version} + test + + + org.eclipse.jetty + jetty-util + ${jetty_version} + test + + + org.eclipse.jetty + jetty-webapp + ${jetty_version} + test + + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + + + diff --git a/restful-server-example/.settings/org.eclipse.wst.common.component b/restful-server-example/.settings/org.eclipse.wst.common.component index 4465204b7fa..5947ef2be24 100644 --- a/restful-server-example/.settings/org.eclipse.wst.common.component +++ b/restful-server-example/.settings/org.eclipse.wst.common.component @@ -3,7 +3,7 @@ - + uses diff --git a/restful-server-example/pom.xml b/restful-server-example/pom.xml index fe6201a0671..b5938789ce3 100644 --- a/restful-server-example/pom.xml +++ b/restful-server-example/pom.xml @@ -13,7 +13,7 @@ ca.uhn.hapi.example restful-server-example - 0.6 + 0.7 war HAPI FHIR Sample RESTful Server @@ -34,14 +34,14 @@ ca.uhn.hapi.fhir hapi-fhir-base - 0.6 + 0.7-SNAPSHOT ca.uhn.hapi.fhir hapi-fhir-testpage-overlay - 0.6 + 0.7-SNAPSHOT war provided