diff --git a/examples/pom.xml b/examples/pom.xml index 8e323c00995..51321460414 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -4,7 +4,7 @@ ca.uhn.hapi.fhir hapi-fhir - 0.9-SNAPSHOT + 0.9 ../pom.xml @@ -17,12 +17,12 @@ ca.uhn.hapi.fhir hapi-fhir-base - 0.9-SNAPSHOT + 0.9 ca.uhn.hapi.fhir hapi-fhir-structures-dstu2 - 0.9-SNAPSHOT + 0.9 javax.servlet diff --git a/hapi-deployable-pom/pom.xml b/hapi-deployable-pom/pom.xml index 004eb91647f..3bd32c30fbb 100644 --- a/hapi-deployable-pom/pom.xml +++ b/hapi-deployable-pom/pom.xml @@ -4,7 +4,7 @@ ca.uhn.hapi.fhir hapi-fhir - 0.9-SNAPSHOT + 0.9 ../pom.xml diff --git a/hapi-fhir-android/dependency-reduced-pom.xml b/hapi-fhir-android/dependency-reduced-pom.xml index 44b2146062e..4736ef5b815 100644 --- a/hapi-fhir-android/dependency-reduced-pom.xml +++ b/hapi-fhir-android/dependency-reduced-pom.xml @@ -3,7 +3,7 @@ hapi-fhir ca.uhn.hapi.fhir - 0.9-SNAPSHOT + 0.9 4.0.0 hapi-fhir-android diff --git a/hapi-fhir-android/pom.xml b/hapi-fhir-android/pom.xml index ce409b3b9da..b35b5818e41 100644 --- a/hapi-fhir-android/pom.xml +++ b/hapi-fhir-android/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-fhir - 0.9-SNAPSHOT + 0.9 ../pom.xml @@ -18,7 +18,7 @@ ca.uhn.hapi.fhir hapi-fhir-base - 0.9-SNAPSHOT + 0.9 org.apache.httpcomponents @@ -37,12 +37,12 @@ ca.uhn.hapi.fhir hapi-fhir-structures-dstu - 0.9-SNAPSHOT + 0.9 ca.uhn.hapi.fhir hapi-fhir-structures-dstu2 - 0.9-SNAPSHOT + 0.9 com.phloc diff --git a/hapi-fhir-android/pom.xml.versionsBackup b/hapi-fhir-android/pom.xml.versionsBackup new file mode 100644 index 00000000000..ce409b3b9da --- /dev/null +++ b/hapi-fhir-android/pom.xml.versionsBackup @@ -0,0 +1,180 @@ + + 4.0.0 + + + ca.uhn.hapi.fhir + hapi-fhir + 0.9-SNAPSHOT + ../pom.xml + + + hapi-fhir-android + jar + + HAPI FHIR - Android + + + + ca.uhn.hapi.fhir + hapi-fhir-base + 0.9-SNAPSHOT + + + org.apache.httpcomponents + httpclient + + + org.apache.httpcomponents + httpcore + + + commons-codec + commons-codec + + + + + ca.uhn.hapi.fhir + hapi-fhir-structures-dstu + 0.9-SNAPSHOT + + + ca.uhn.hapi.fhir + hapi-fhir-structures-dstu2 + 0.9-SNAPSHOT + + + com.phloc + phloc-schematron + ${phloc_schematron_version} + + + com.phloc + phloc-commons + ${phloc_commons_version} + + + org.apache.httpcomponents + httpclient-android + 4.3.5.1 + + + org.slf4j + slf4j-android + ${slf4j_version} + + + + + commons-io + commons-io + ${commons_io_version} + + + + + javax.servlet + javax.servlet-api + ${servlet_api_version} + compile + + + + + junit + junit + ${junit_version} + test + + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + org.apache.maven.plugins + maven-failsafe-plugin + ${maven_failsafe_plugin_version} + + compile+runtime + + ${project.build.directory}/hapi-fhir-android-${project.version}.jar + + + + + + integration-test + verify + + + + + + org.apache.maven.plugins + maven-shade-plugin + 2.3 + + + package + + shade + + + true + + + + commons-codec:commons-codec + commons-io:commons-io + ca.uhn.hapi.fhir:hapi-fhir-base + ca.uhn.hapi.fhir:hapi-fhir-structures-dstu + ca.uhn.hapi.fhir:hapi-fhir-structures-dstu2 + org.glassfish:javax.json + org.codehaus.woodstox:woodstox-core-asl + javax.xml.stream:stax-api + org.codehaus.woodstox:stax2-api + org.slf4j:slf4j* + org.apache.commons:* + org.apache.httpcomponents:* + org.glassfish:javax.json + + + + + javax.xml.stream + ca.uhn.fhir.repackage.javax.xml.stream + + + javax.json + ca.uhn.fhir.repackage.javax.json + + + + + ca.uhn.hapi.fhir:hapi-fhir-base + + ca/uhn/fhir/model/dstu/valueset/** + **/*.java + + + + + + + + + + diff --git a/hapi-fhir-base/pom.xml b/hapi-fhir-base/pom.xml index a6d5201e5f6..5fc6337bf7c 100644 --- a/hapi-fhir-base/pom.xml +++ b/hapi-fhir-base/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 0.9-SNAPSHOT + 0.9 ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/BundleInclusionRule.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/BundleInclusionRule.java index 87f8d46049c..e589abea3ea 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/BundleInclusionRule.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/BundleInclusionRule.java @@ -1,5 +1,25 @@ package ca.uhn.fhir.rest.server; +/* + * #%L + * HAPI FHIR - Core Library + * %% + * Copyright (C) 2014 - 2015 University Health Network + * %% + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * #L% + */ + import ca.uhn.fhir.model.api.Include; import ca.uhn.fhir.util.ResourceReferenceInfo; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/interceptor/ExceptionHandlingInterceptor.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/interceptor/ExceptionHandlingInterceptor.java index 536aa9ba21b..04d949d7f32 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/interceptor/ExceptionHandlingInterceptor.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/interceptor/ExceptionHandlingInterceptor.java @@ -1,5 +1,25 @@ package ca.uhn.fhir.rest.server.interceptor; +/* + * #%L + * HAPI FHIR - Core Library + * %% + * Copyright (C) 2014 - 2015 University Health Network + * %% + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * #L% + */ + import java.io.IOException; import javax.servlet.ServletException; diff --git a/hapi-fhir-base/testmindeps/pom.xml b/hapi-fhir-base/testmindeps/pom.xml index af347da2e34..728f8c0da17 100644 --- a/hapi-fhir-base/testmindeps/pom.xml +++ b/hapi-fhir-base/testmindeps/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-fhir - 0.9-SNAPSHOT + 0.9 ../../pom.xml @@ -40,7 +40,7 @@ ca.uhn.hapi.fhir hapi-fhir-base - 0.9-SNAPSHOT + 0.9 woodstox-core-asl @@ -51,7 +51,7 @@ ca.uhn.hapi.fhir hapi-fhir-structures-dstu - 0.9-SNAPSHOT + 0.9 woodstox-core-asl @@ -62,7 +62,7 @@ ca.uhn.hapi.fhir hapi-fhir-structures-dstu2 - 0.9-SNAPSHOT + 0.9 woodstox-core-asl diff --git a/hapi-fhir-dist/pom.xml b/hapi-fhir-dist/pom.xml index 9dd2bfd1632..9a9d12067e9 100644 --- a/hapi-fhir-dist/pom.xml +++ b/hapi-fhir-dist/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-fhir - 0.9-SNAPSHOT + 0.9 ../pom.xml @@ -18,17 +18,17 @@ ca.uhn.hapi.fhir hapi-fhir-base - 0.9-SNAPSHOT + 0.9 ca.uhn.hapi.fhir hapi-fhir-structures-dstu - 0.9-SNAPSHOT + 0.9 ca.uhn.hapi.fhir - hapi-fhir-structures-dev - 0.9-SNAPSHOT + hapi-fhir-structures-dstu2 + 0.9 ch.qos.logback diff --git a/hapi-fhir-jpaserver-base/pom.xml b/hapi-fhir-jpaserver-base/pom.xml index 61214569e67..e449e2ada0d 100644 --- a/hapi-fhir-jpaserver-base/pom.xml +++ b/hapi-fhir-jpaserver-base/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 0.9-SNAPSHOT + 0.9 ../hapi-deployable-pom/pom.xml @@ -31,7 +31,7 @@ ca.uhn.hapi.fhir hapi-fhir-base - 0.9-SNAPSHOT + 0.9 commons-logging @@ -42,12 +42,12 @@ ca.uhn.hapi.fhir hapi-fhir-structures-dstu - 0.9-SNAPSHOT + 0.9 ca.uhn.hapi.fhir hapi-fhir-structures-dstu2 - 0.9-SNAPSHOT + 0.9 @@ -371,7 +371,7 @@ ca.uhn.hapi.fhir hapi-tinder-plugin - 0.9-SNAPSHOT + 0.9 build_dstu1 @@ -402,12 +402,12 @@ ca.uhn.hapi.fhir hapi-fhir-structures-dstu - 0.9-SNAPSHOT + 0.9 ca.uhn.hapi.fhir hapi-fhir-structures-dstu2 - 0.9-SNAPSHOT + 0.9 diff --git a/hapi-fhir-jpaserver-example/pom.xml b/hapi-fhir-jpaserver-example/pom.xml index b98052fe2c2..85f24bb0699 100644 --- a/hapi-fhir-jpaserver-example/pom.xml +++ b/hapi-fhir-jpaserver-example/pom.xml @@ -38,19 +38,19 @@ ca.uhn.hapi.fhir hapi-fhir-base - 0.9-SNAPSHOT + 0.9 ca.uhn.hapi.fhir hapi-fhir-structures-dstu - 0.9-SNAPSHOT + 0.9 ca.uhn.hapi.fhir hapi-fhir-structures-dstu2 - 0.9-SNAPSHOT + 0.9 ca.uhn.hapi.fhir hapi-fhir-testpage-overlay - 0.9-SNAPSHOT + 0.9 war provided diff --git a/hapi-fhir-jpaserver-example/pom.xml.versionsBackup b/hapi-fhir-jpaserver-example/pom.xml.versionsBackup new file mode 100644 index 00000000000..b98052fe2c2 --- /dev/null +++ b/hapi-fhir-jpaserver-example/pom.xml.versionsBackup @@ -0,0 +1,238 @@ + + 4.0.0 + + + + org.sonatype.oss + oss-parent + 7 + + + ca.uhn.hapi.example + hapi-fhir-jpaserver-example + 0.9-SNAPSHOT + war + + HAPI FHIR JPA Server - Example + + + + oss-snapshots + + true + + https://oss.sonatype.org/content/repositories/snapshots/ + + + + + + + + ca.uhn.hapi.fhir + hapi-fhir-base + 0.9-SNAPSHOT + + + + + ca.uhn.hapi.fhir + hapi-fhir-structures-dstu + 0.9-SNAPSHOT + + + ca.uhn.hapi.fhir + hapi-fhir-structures-dstu2 + 0.9-SNAPSHOT + + + + + ca.uhn.hapi.fhir + hapi-fhir-jpaserver-base + 0.9-SNAPSHOT + + + + + ca.uhn.hapi.fhir + hapi-fhir-testpage-overlay + 0.9-SNAPSHOT + war + provided + + + + + ch.qos.logback + logback-classic + 1.1.2 + + + + + javax.servlet + javax.servlet-api + 3.0.1 + provided + + + + + org.thymeleaf + thymeleaf + 2.1.4.RELEASE + + + + + org.ebaysf.web + cors-filter + 1.0.1 + + + servlet-api + javax.servlet + + + + + + + org.springframework + spring-web + 4.1.3.RELEASE + provided + + + + + org.apache.commons + commons-dbcp2 + 2.0.1 + + + + + org.apache.derby + derby + 10.11.1.1 + + + org.apache.derby + derbynet + 10.11.1.1 + + + org.apache.derby + derbyclient + 10.11.1.1 + + + + + + + + + hapi-fhir-jpaserver-example + + + + + + org.eclipse.jetty + jetty-maven-plugin + 9.1.1.v20140108 + + + /hapi-fhir-jpaserver-example + + + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + 1.6 + 1.6 + + + + + + org.apache.maven.plugins + maven-war-plugin + + + + ca.uhn.hapi.fhir + hapi-fhir-testpage-overlay + + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + false + + + + + + + diff --git a/hapi-fhir-jpaserver-uhnfhirtest/pom.xml b/hapi-fhir-jpaserver-uhnfhirtest/pom.xml index e2b7cbfd7bb..7a482d63add 100644 --- a/hapi-fhir-jpaserver-uhnfhirtest/pom.xml +++ b/hapi-fhir-jpaserver-uhnfhirtest/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-fhir - 0.9-SNAPSHOT + 0.9 ../pom.xml @@ -18,22 +18,22 @@ ca.uhn.hapi.fhir hapi-fhir-jpaserver-base - 0.9-SNAPSHOT + 0.9 ca.uhn.hapi.fhir hapi-fhir-structures-dstu - 0.9-SNAPSHOT + 0.9 ca.uhn.hapi.fhir hapi-fhir-structures-dstu2 - 0.9-SNAPSHOT + 0.9 ca.uhn.hapi.fhir hapi-fhir-testpage-overlay - 0.9-SNAPSHOT + 0.9 war provided diff --git a/hapi-fhir-jpaserver-uhnfhirtest/pom.xml.versionsBackup b/hapi-fhir-jpaserver-uhnfhirtest/pom.xml.versionsBackup new file mode 100644 index 00000000000..e2b7cbfd7bb --- /dev/null +++ b/hapi-fhir-jpaserver-uhnfhirtest/pom.xml.versionsBackup @@ -0,0 +1,239 @@ + + 4.0.0 + + + ca.uhn.hapi.fhir + hapi-fhir + 0.9-SNAPSHOT + ../pom.xml + + + hapi-fhir-jpaserver-uhnfhirtest + war + + HAPI FHIR - fhirtest.uhn.ca Deployable WAR + + + + ca.uhn.hapi.fhir + hapi-fhir-jpaserver-base + 0.9-SNAPSHOT + + + ca.uhn.hapi.fhir + hapi-fhir-structures-dstu + 0.9-SNAPSHOT + + + ca.uhn.hapi.fhir + hapi-fhir-structures-dstu2 + 0.9-SNAPSHOT + + + ca.uhn.hapi.fhir + hapi-fhir-testpage-overlay + 0.9-SNAPSHOT + war + provided + + + + com.phloc + phloc-schematron + ${phloc_schematron_version} + + + com.phloc + phloc-commons + ${phloc_commons_version} + + + + + + org.springframework + spring-web + ${spring_version} + + + + org.hsqldb + hsqldb + 2.3.2 + provided + + + + org.apache.derby + derby + ${derby_version} + + + org.apache.derby + derbynet + ${derby_version} + + + org.apache.derby + derbyclient + ${derby_version} + + + + org.thymeleaf + thymeleaf + ${thymeleaf-version} + + + ch.qos.logback + logback-classic + ${logback_version} + + + org.slf4j + jcl-over-slf4j + ${slf4j_version} + + + org.slf4j + slf4j-api + ${slf4j_version} + + + + com.google.guava + guava + ${guava_version} + + + + javax.servlet + javax.servlet-api + 3.1.0 + provided + + + + + org.eclipse.jetty + jetty-servlets + ${jetty_version} + test + + + org.eclipse.jetty + jetty-webapp + ${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.apache.commons + commons-dbcp2 + 2.0.1 + + + + + org.ebaysf.web + cors-filter + ${ebay_cors_filter_version} + + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.7 + 1.7 + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + + [0.4,) + + + + + + + + + + + + + + + + + org.apache.maven.plugins + maven-war-plugin + + + + ca.uhn.hapi.fhir + hapi-fhir-testpage-overlay + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + hapi-fhir-jpaserver + + + diff --git a/hapi-fhir-structures-dev/pom.xml b/hapi-fhir-structures-dev/pom.xml index 5f219160ff9..d9d5919be83 100644 --- a/hapi-fhir-structures-dev/pom.xml +++ b/hapi-fhir-structures-dev/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 0.9-SNAPSHOT + 0.9 ../hapi-deployable-pom/pom.xml @@ -18,7 +18,7 @@ ca.uhn.hapi.fhir hapi-fhir-base - 0.9-SNAPSHOT + 0.9 @@ -183,7 +183,7 @@ ca.uhn.hapi.fhir hapi-tinder-plugin - 0.9-SNAPSHOT + 0.9 diff --git a/hapi-fhir-structures-dstu/pom.xml b/hapi-fhir-structures-dstu/pom.xml index 2198dff5242..13fb73bc384 100644 --- a/hapi-fhir-structures-dstu/pom.xml +++ b/hapi-fhir-structures-dstu/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 0.9-SNAPSHOT + 0.9 ../hapi-deployable-pom/pom.xml @@ -18,7 +18,7 @@ ca.uhn.hapi.fhir hapi-fhir-base - 0.9-SNAPSHOT + 0.9 @@ -195,7 +195,7 @@ ca.uhn.hapi.fhir hapi-tinder-plugin - 0.9-SNAPSHOT + 0.9 diff --git a/hapi-fhir-structures-dstu2/pom.xml b/hapi-fhir-structures-dstu2/pom.xml index 4524767e7ea..0bcee1394a5 100644 --- a/hapi-fhir-structures-dstu2/pom.xml +++ b/hapi-fhir-structures-dstu2/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 0.9-SNAPSHOT + 0.9 ../hapi-deployable-pom/pom.xml @@ -18,7 +18,7 @@ ca.uhn.hapi.fhir hapi-fhir-base - 0.9-SNAPSHOT + 0.9 @@ -183,7 +183,7 @@ ca.uhn.hapi.fhir hapi-tinder-plugin - 0.9-SNAPSHOT + 0.9 diff --git a/hapi-fhir-testpage-overlay/pom.xml b/hapi-fhir-testpage-overlay/pom.xml index ec2ff14ffbd..9a2df87045a 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.9-SNAPSHOT + 0.9 ../pom.xml @@ -27,28 +27,28 @@ ca.uhn.hapi.fhir hapi-fhir-base - 0.9-SNAPSHOT + 0.9 ca.uhn.hapi.fhir hapi-fhir-jpaserver-base - 0.9-SNAPSHOT + 0.9 ca.uhn.hapi.fhir hapi-fhir-structures-dstu - 0.9-SNAPSHOT + 0.9 ca.uhn.hapi.fhir hapi-fhir-structures-dstu2 - 0.9-SNAPSHOT + 0.9 - + org.thymeleaf thymeleaf diff --git a/hapi-tinder-plugin/pom.xml b/hapi-tinder-plugin/pom.xml index f32293b6a50..cc6a23367fb 100644 --- a/hapi-tinder-plugin/pom.xml +++ b/hapi-tinder-plugin/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-fhir - 0.9-SNAPSHOT + 0.9 ../pom.xml @@ -19,7 +19,7 @@ ca.uhn.hapi.fhir hapi-fhir-base - 0.9-SNAPSHOT + 0.9 hapi-fhir-jpaserver-base hapi-fhir-jpaserver-example restful-server-example diff --git a/restful-server-example-test/pom.xml b/restful-server-example-test/pom.xml index d71174d81d1..05fd0d64571 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.9-SNAPSHOT + 0.9 ../pom.xml @@ -17,12 +17,12 @@ ca.uhn.hapi.fhir hapi-fhir-base - 0.9-SNAPSHOT + 0.9 ca.uhn.hapi.fhir hapi-fhir-structures-dstu - 0.9-SNAPSHOT + 0.9 test diff --git a/restful-server-example/pom.xml b/restful-server-example/pom.xml index 74994fd5057..42fc5d498dc 100644 --- a/restful-server-example/pom.xml +++ b/restful-server-example/pom.xml @@ -35,20 +35,20 @@ ca.uhn.hapi.fhir hapi-fhir-base - 0.9-SNAPSHOT + 0.9 ca.uhn.hapi.fhir hapi-fhir-structures-dstu - 0.9-SNAPSHOT + 0.9 ca.uhn.hapi.fhir hapi-fhir-testpage-overlay - 0.9-SNAPSHOT + 0.9 war provided