From d27aad487edd44890feb4ca0c5f5fc3692e5725d Mon Sep 17 00:00:00 2001
From: James Agnew
Date: Tue, 30 Aug 2016 10:50:04 -0400
Subject: [PATCH] Bump to 2.0 release
---
examples/pom.xml | 16 +++----
hapi-deployable-pom/pom.xml | 2 +-
hapi-fhir-android/pom.xml | 10 ++---
hapi-fhir-base-example-embedded-ws/pom.xml | 2 +-
hapi-fhir-base-test-mindeps-client/pom.xml | 8 ++--
hapi-fhir-base-test-mindeps-server/pom.xml | 8 ++--
hapi-fhir-base/pom.xml | 2 +-
hapi-fhir-cli/hapi-fhir-cli-app/pom.xml | 22 ++++-----
hapi-fhir-cli/hapi-fhir-cli-jpaserver/pom.xml | 14 +++---
hapi-fhir-cli/pom.xml | 2 +-
hapi-fhir-client-okhttp/pom.xml | 17 +++----
.../okhttp/client/OkHttpRestfulClient.java | 6 +--
.../client/OkHttpRestfulClientFactory.java | 6 +--
.../okhttp/client/OkHttpRestfulRequest.java | 6 +--
.../okhttp/client/OkHttpRestfulResponse.java | 6 +--
.../uhn/fhir/okhttp/utils/UrlStringUtils.java | 8 ++--
hapi-fhir-dist/pom.xml | 20 ++++-----
hapi-fhir-jacoco/pom.xml | 20 ++++-----
hapi-fhir-jaxrsserver-base/pom.xml | 8 ++--
hapi-fhir-jaxrsserver-example/pom.xml | 4 +-
hapi-fhir-jpaserver-base/pom.xml | 26 +++++------
hapi-fhir-jpaserver-example/pom.xml | 14 +++---
hapi-fhir-jpaserver-uhnfhirtest/pom.xml | 14 +++---
hapi-fhir-osgi-core/pom.xml | 16 +++----
hapi-fhir-structures-dstu/pom.xml | 6 +--
hapi-fhir-structures-dstu2/pom.xml | 8 ++--
hapi-fhir-structures-dstu3/pom.xml | 6 +--
hapi-fhir-structures-hl7org-dstu2/pom.xml | 6 +--
hapi-fhir-testpage-overlay/pom.xml | 12 ++---
hapi-fhir-validation-resources-dstu2/pom.xml | 2 +-
hapi-fhir-validation-resources-dstu3/pom.xml | 4 +-
hapi-tinder-plugin/pom.xml | 6 +--
hapi-tinder-test/pom.xml | 16 +++----
pom.xml | 2 +-
restful-server-example-test/pom.xml | 6 +--
restful-server-example/pom.xml | 10 ++---
src/changes/changes.xml | 2 +-
src/site/xdoc/index.xml | 45 +++++++++++++++++++
38 files changed, 217 insertions(+), 171 deletions(-)
diff --git a/examples/pom.xml b/examples/pom.xml
index 0d709625e7f..305c386b6e4 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
hapi-fhir
- 2.0-SNAPSHOT
+ 2.0
../pom.xml
@@ -18,32 +18,32 @@
ca.uhn.hapi.fhir
hapi-fhir-base
- 2.0-SNAPSHOT
+ 2.0
ca.uhn.hapi.fhir
hapi-fhir-structures-dstu2
- 2.0-SNAPSHOT
+ 2.0
ca.uhn.hapi.fhir
hapi-fhir-structures-dstu3
- 2.0-SNAPSHOT
+ 2.0
ca.uhn.hapi.fhir
hapi-fhir-structures-hl7org-dstu2
- 2.0-SNAPSHOT
+ 2.0
ca.uhn.hapi.fhir
hapi-fhir-validation-resources-dstu2
- 2.0-SNAPSHOT
+ 2.0
ca.uhn.hapi.fhir
hapi-fhir-jaxrsserver-base
- 2.0-SNAPSHOT
+ 2.0
javax.servlet
@@ -54,7 +54,7 @@
ca.uhn.hapi.fhir
hapi-fhir-jaxrsserver-base
- 2.0-SNAPSHOT
+ 2.0
javax.ws.rs
diff --git a/hapi-deployable-pom/pom.xml b/hapi-deployable-pom/pom.xml
index d12e3ba7d8a..7b7e3be12b0 100644
--- a/hapi-deployable-pom/pom.xml
+++ b/hapi-deployable-pom/pom.xml
@@ -4,7 +4,7 @@
ca.uhn.hapi.fhir
hapi-fhir
- 2.0-SNAPSHOT
+ 2.0
../pom.xml
diff --git a/hapi-fhir-android/pom.xml b/hapi-fhir-android/pom.xml
index a1757b4d76e..704857f1a1d 100644
--- a/hapi-fhir-android/pom.xml
+++ b/hapi-fhir-android/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
hapi-fhir
- 2.0-SNAPSHOT
+ 2.0
../pom.xml
@@ -29,7 +29,7 @@
ca.uhn.hapi.fhir
hapi-fhir-base
- 2.0-SNAPSHOT
+ 2.0
commons-codec
@@ -44,19 +44,19 @@
ca.uhn.hapi.fhir
hapi-fhir-structures-dstu
- 2.0-SNAPSHOT
+ 2.0
true
ca.uhn.hapi.fhir
hapi-fhir-structures-dstu2
- 2.0-SNAPSHOT
+ 2.0
true
ca.uhn.hapi.fhir
hapi-fhir-structures-dstu3
- 2.0-SNAPSHOT
+ 2.0
true
diff --git a/hapi-fhir-base-example-embedded-ws/pom.xml b/hapi-fhir-base-example-embedded-ws/pom.xml
index 47bfeb845d0..fe950756e32 100644
--- a/hapi-fhir-base-example-embedded-ws/pom.xml
+++ b/hapi-fhir-base-example-embedded-ws/pom.xml
@@ -4,7 +4,7 @@
ca.uhn.hapi.fhir
hapi-fhir
- 2.0-SNAPSHOT
+ 2.0
jar
diff --git a/hapi-fhir-base-test-mindeps-client/pom.xml b/hapi-fhir-base-test-mindeps-client/pom.xml
index 37d9b05d461..0d52ab704f7 100644
--- a/hapi-fhir-base-test-mindeps-client/pom.xml
+++ b/hapi-fhir-base-test-mindeps-client/pom.xml
@@ -4,7 +4,7 @@
ca.uhn.hapi.fhir
hapi-fhir
- 2.0-SNAPSHOT
+ 2.0
../pom.xml
@@ -41,7 +41,7 @@
ca.uhn.hapi.fhir
hapi-fhir-base
- 2.0-SNAPSHOT
+ 2.0
woodstox-core-asl
@@ -56,7 +56,7 @@
ca.uhn.hapi.fhir
hapi-fhir-structures-dstu
- 2.0-SNAPSHOT
+ 2.0
woodstox-core-asl
@@ -67,7 +67,7 @@
ca.uhn.hapi.fhir
hapi-fhir-structures-dstu2
- 2.0-SNAPSHOT
+ 2.0
woodstox-core-asl
diff --git a/hapi-fhir-base-test-mindeps-server/pom.xml b/hapi-fhir-base-test-mindeps-server/pom.xml
index fcbc9b14bd2..d0f94594e90 100644
--- a/hapi-fhir-base-test-mindeps-server/pom.xml
+++ b/hapi-fhir-base-test-mindeps-server/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
hapi-fhir
- 2.0-SNAPSHOT
+ 2.0
../pom.xml
@@ -59,7 +59,7 @@
ca.uhn.hapi.fhir
hapi-fhir-base
- 2.0-SNAPSHOT
+ 2.0
woodstox-core-asl
@@ -74,7 +74,7 @@
ca.uhn.hapi.fhir
hapi-fhir-structures-dstu
- 2.0-SNAPSHOT
+ 2.0
woodstox-core-asl
@@ -85,7 +85,7 @@
ca.uhn.hapi.fhir
hapi-fhir-structures-dstu2
- 2.0-SNAPSHOT
+ 2.0
woodstox-core-asl
diff --git a/hapi-fhir-base/pom.xml b/hapi-fhir-base/pom.xml
index a2203f10d09..96227b96504 100644
--- a/hapi-fhir-base/pom.xml
+++ b/hapi-fhir-base/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 2.0-SNAPSHOT
+ 2.0
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-cli/hapi-fhir-cli-app/pom.xml b/hapi-fhir-cli/hapi-fhir-cli-app/pom.xml
index f9f5d1e4245..57c5999b245 100644
--- a/hapi-fhir-cli/hapi-fhir-cli-app/pom.xml
+++ b/hapi-fhir-cli/hapi-fhir-cli-app/pom.xml
@@ -6,7 +6,7 @@
ca.uhn.hapi.fhir
hapi-fhir-cli
- 2.0-SNAPSHOT
+ 2.0
../pom.xml
@@ -21,57 +21,57 @@
ca.uhn.hapi.fhir
hapi-fhir-base
- 2.0-SNAPSHOT
+ 2.0
ca.uhn.hapi.fhir
hapi-fhir-cli-jpaserver
- 2.0-SNAPSHOT
+ 2.0
war
ca.uhn.hapi.fhir
hapi-fhir-cli-jpaserver
- 2.0-SNAPSHOT
+ 2.0
jar
classes
ca.uhn.hapi.fhir
hapi-fhir-testpage-overlay
- 2.0-SNAPSHOT
+ 2.0
classes
ca.uhn.hapi.fhir
hapi-fhir-structures-dstu
- 2.0-SNAPSHOT
+ 2.0
ca.uhn.hapi.fhir
hapi-fhir-structures-dstu2
- 2.0-SNAPSHOT
+ 2.0
ca.uhn.hapi.fhir
hapi-fhir-structures-dstu3
- 2.0-SNAPSHOT
+ 2.0
ca.uhn.hapi.fhir
hapi-fhir-structures-hl7org-dstu2
- 2.0-SNAPSHOT
+ 2.0
ca.uhn.hapi.fhir
hapi-fhir-validation-resources-dstu2
- 2.0-SNAPSHOT
+ 2.0
ca.uhn.hapi.fhir
hapi-fhir-validation-resources-dstu3
- 2.0-SNAPSHOT
+ 2.0
diff --git a/hapi-fhir-cli/hapi-fhir-cli-jpaserver/pom.xml b/hapi-fhir-cli/hapi-fhir-cli-jpaserver/pom.xml
index e1c1d890cc7..aa2ff3cec96 100644
--- a/hapi-fhir-cli/hapi-fhir-cli-jpaserver/pom.xml
+++ b/hapi-fhir-cli/hapi-fhir-cli-jpaserver/pom.xml
@@ -6,7 +6,7 @@
ca.uhn.hapi.fhir
hapi-fhir-cli
- 2.0-SNAPSHOT
+ 2.0
../pom.xml
@@ -21,7 +21,7 @@
ca.uhn.hapi.fhir
hapi-fhir-base
- 2.0-SNAPSHOT
+ 2.0
provided
@@ -29,33 +29,33 @@
ca.uhn.hapi.fhir
hapi-fhir-structures-dstu
- 2.0-SNAPSHOT
+ 2.0
ca.uhn.hapi.fhir
hapi-fhir-structures-dstu2
- 2.0-SNAPSHOT
+ 2.0
ca.uhn.hapi.fhir
hapi-fhir-jpaserver-base
- 2.0-SNAPSHOT
+ 2.0
ca.uhn.hapi.fhir
hapi-fhir-testpage-overlay
- 2.0-SNAPSHOT
+ 2.0
war
provided
ca.uhn.hapi.fhir
hapi-fhir-testpage-overlay
- 2.0-SNAPSHOT
+ 2.0
classes
provided
diff --git a/hapi-fhir-cli/pom.xml b/hapi-fhir-cli/pom.xml
index 1567dda2a37..6031feddcca 100644
--- a/hapi-fhir-cli/pom.xml
+++ b/hapi-fhir-cli/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
hapi-fhir
- 2.0-SNAPSHOT
+ 2.0
../pom.xml
diff --git a/hapi-fhir-client-okhttp/pom.xml b/hapi-fhir-client-okhttp/pom.xml
index e3b9185e283..a781ed6b921 100644
--- a/hapi-fhir-client-okhttp/pom.xml
+++ b/hapi-fhir-client-okhttp/pom.xml
@@ -1,11 +1,12 @@
-
- hapi-fhir
- ca.uhn.hapi.fhir
- 2.0-SNAPSHOT
-
4.0.0
+
+ ca.uhn.hapi.fhir
+ hapi-deployable-pom
+ 2.0
+ ../hapi-deployable-pom/pom.xml
+
hapi-fhir-client-okhttp
jar
@@ -17,7 +18,7 @@
ca.uhn.hapi.fhir
hapi-fhir-base
- 2.0-SNAPSHOT
+ 2.0
commons-logging
@@ -37,12 +38,12 @@
ca.uhn.hapi.fhir
hapi-fhir-structures-dstu2
- 2.0-SNAPSHOT
+ 2.0
ca.uhn.hapi.fhir
hapi-fhir-structures-dstu3
- 2.0-SNAPSHOT
+ 2.0
diff --git a/hapi-fhir-client-okhttp/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulClient.java b/hapi-fhir-client-okhttp/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulClient.java
index 7862eaa8ae9..029884cac4b 100644
--- a/hapi-fhir-client-okhttp/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulClient.java
+++ b/hapi-fhir-client-okhttp/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulClient.java
@@ -2,16 +2,16 @@ package ca.uhn.fhir.okhttp.client;
/*
* #%L
- * HAPI FHIR - Core Library
+ * HAPI FHIR OkHttp Client
* %%
* Copyright (C) 2014 - 2016 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.
diff --git a/hapi-fhir-client-okhttp/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulClientFactory.java b/hapi-fhir-client-okhttp/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulClientFactory.java
index 4ed2168c79c..53671c27259 100644
--- a/hapi-fhir-client-okhttp/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulClientFactory.java
+++ b/hapi-fhir-client-okhttp/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulClientFactory.java
@@ -2,16 +2,16 @@ package ca.uhn.fhir.okhttp.client;
/*
* #%L
- * HAPI FHIR - Core Library
+ * HAPI FHIR OkHttp Client
* %%
* Copyright (C) 2014 - 2016 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.
diff --git a/hapi-fhir-client-okhttp/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulRequest.java b/hapi-fhir-client-okhttp/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulRequest.java
index 6d3bb20eae7..cbd8a589346 100644
--- a/hapi-fhir-client-okhttp/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulRequest.java
+++ b/hapi-fhir-client-okhttp/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulRequest.java
@@ -2,16 +2,16 @@ package ca.uhn.fhir.okhttp.client;
/*
* #%L
- * HAPI FHIR - Core Library
+ * HAPI FHIR OkHttp Client
* %%
* Copyright (C) 2014 - 2016 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.
diff --git a/hapi-fhir-client-okhttp/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulResponse.java b/hapi-fhir-client-okhttp/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulResponse.java
index aba0e540b6a..059f4b37de9 100644
--- a/hapi-fhir-client-okhttp/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulResponse.java
+++ b/hapi-fhir-client-okhttp/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulResponse.java
@@ -2,16 +2,16 @@ package ca.uhn.fhir.okhttp.client;
/*
* #%L
- * HAPI FHIR - Core Library
+ * HAPI FHIR OkHttp Client
* %%
* Copyright (C) 2014 - 2016 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.
diff --git a/hapi-fhir-client-okhttp/src/main/java/ca/uhn/fhir/okhttp/utils/UrlStringUtils.java b/hapi-fhir-client-okhttp/src/main/java/ca/uhn/fhir/okhttp/utils/UrlStringUtils.java
index 4c96595345a..27981e8ee3c 100644
--- a/hapi-fhir-client-okhttp/src/main/java/ca/uhn/fhir/okhttp/utils/UrlStringUtils.java
+++ b/hapi-fhir-client-okhttp/src/main/java/ca/uhn/fhir/okhttp/utils/UrlStringUtils.java
@@ -2,16 +2,16 @@ package ca.uhn.fhir.okhttp.utils;
/*
* #%L
- * HAPI FHIR - Core Library
+ * HAPI FHIR OkHttp Client
* %%
* Copyright (C) 2014 - 2016 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.
@@ -41,4 +41,4 @@ public class UrlStringUtils {
return sb.length() > 0 && sb.charAt(sb.length() - 1) == c;
}
-}
\ No newline at end of file
+}
diff --git a/hapi-fhir-dist/pom.xml b/hapi-fhir-dist/pom.xml
index 7d4c95e7f43..50cf7bf4c86 100644
--- a/hapi-fhir-dist/pom.xml
+++ b/hapi-fhir-dist/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
hapi-fhir
- 2.0-SNAPSHOT
+ 2.0
../pom.xml
@@ -18,49 +18,49 @@
ca.uhn.hapi.fhir
hapi-fhir-base
- 2.0-SNAPSHOT
+ 2.0
ca.uhn.hapi.fhir
hapi-fhir-structures-dstu
- 2.0-SNAPSHOT
+ 2.0
ca.uhn.hapi.fhir
hapi-fhir-structures-dstu2
- 2.0-SNAPSHOT
+ 2.0
ca.uhn.hapi.fhir
hapi-fhir-structures-hl7org-dstu2
- 2.0-SNAPSHOT
+ 2.0
ca.uhn.hapi.fhir
hapi-fhir-structures-dstu3
- 2.0-SNAPSHOT
+ 2.0
ca.uhn.hapi.fhir
hapi-fhir-validation-resources-dstu2
- 2.0-SNAPSHOT
+ 2.0
ca.uhn.hapi.fhir
hapi-fhir-validation-resources-dstu3
- 2.0-SNAPSHOT
+ 2.0
ca.uhn.hapi.fhir
hapi-fhir-cli-app
- 2.0-SNAPSHOT
+ 2.0
provided
ca.uhn.hapi.fhir
hapi-fhir-android
- 2.0-SNAPSHOT
+ 2.0
provided
diff --git a/hapi-fhir-jacoco/pom.xml b/hapi-fhir-jacoco/pom.xml
index 0c7e578a671..71f59038c35 100644
--- a/hapi-fhir-jacoco/pom.xml
+++ b/hapi-fhir-jacoco/pom.xml
@@ -6,7 +6,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 2.0-SNAPSHOT
+ 2.0
../hapi-deployable-pom/pom.xml
@@ -19,47 +19,47 @@
ca.uhn.hapi.fhir
hapi-fhir-base
- 2.0-SNAPSHOT
+ 2.0
ca.uhn.hapi.fhir
hapi-fhir-structures-dstu
- 2.0-SNAPSHOT
+ 2.0
ca.uhn.hapi.fhir
hapi-fhir-structures-dstu2
- 2.0-SNAPSHOT
+ 2.0
ca.uhn.hapi.fhir
hapi-fhir-structures-dstu3
- 2.0-SNAPSHOT
+ 2.0
ca.uhn.hapi.fhir
hapi-fhir-structures-hl7org-dstu2
- 2.0-SNAPSHOT
+ 2.0
ca.uhn.hapi.fhir
hapi-fhir-validation-resources-dstu2
- 2.0-SNAPSHOT
+ 2.0
ca.uhn.hapi.fhir
hapi-fhir-validation-resources-dstu3
- 2.0-SNAPSHOT
+ 2.0
ca.uhn.hapi.fhir
hapi-fhir-jpaserver-base
- 2.0-SNAPSHOT
+ 2.0
ca.uhn.hapi.fhir
hapi-fhir-client-okhttp
- 2.0-SNAPSHOT
+ 2.0
diff --git a/hapi-fhir-jaxrsserver-base/pom.xml b/hapi-fhir-jaxrsserver-base/pom.xml
index e094d1698aa..67ee66f41e9 100644
--- a/hapi-fhir-jaxrsserver-base/pom.xml
+++ b/hapi-fhir-jaxrsserver-base/pom.xml
@@ -4,7 +4,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 2.0-SNAPSHOT
+ 2.0
../hapi-deployable-pom/pom.xml
@@ -18,7 +18,7 @@
ca.uhn.hapi.fhir
hapi-fhir-base
- 2.0-SNAPSHOT
+ 2.0
commons-logging
@@ -38,12 +38,12 @@
ca.uhn.hapi.fhir
hapi-fhir-structures-dstu2
- 2.0-SNAPSHOT
+ 2.0
ca.uhn.hapi.fhir
hapi-fhir-structures-dstu3
- 2.0-SNAPSHOT
+ 2.0
diff --git a/hapi-fhir-jaxrsserver-example/pom.xml b/hapi-fhir-jaxrsserver-example/pom.xml
index a8812128102..85bf2544b2d 100644
--- a/hapi-fhir-jaxrsserver-example/pom.xml
+++ b/hapi-fhir-jaxrsserver-example/pom.xml
@@ -6,7 +6,7 @@
ca.uhn.hapi.fhir
hapi-fhir
- 2.0-SNAPSHOT
+ 2.0
../pom.xml
@@ -31,7 +31,7 @@
ca.uhn.hapi.fhir
hapi-fhir-jaxrsserver-base
- 2.0-SNAPSHOT
+ 2.0
diff --git a/hapi-fhir-jpaserver-base/pom.xml b/hapi-fhir-jpaserver-base/pom.xml
index 139efc11ada..5eaa1a5c9c9 100644
--- a/hapi-fhir-jpaserver-base/pom.xml
+++ b/hapi-fhir-jpaserver-base/pom.xml
@@ -4,7 +4,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 2.0-SNAPSHOT
+ 2.0
../hapi-deployable-pom/pom.xml
@@ -23,7 +23,7 @@
ca.uhn.hapi.fhir
hapi-fhir-base
- 2.0-SNAPSHOT
+ 2.0
commons-logging
@@ -34,32 +34,32 @@
ca.uhn.hapi.fhir
hapi-fhir-structures-dstu
- 2.0-SNAPSHOT
+ 2.0
ca.uhn.hapi.fhir
hapi-fhir-structures-dstu2
- 2.0-SNAPSHOT
+ 2.0
ca.uhn.hapi.fhir
hapi-fhir-structures-dstu3
- 2.0-SNAPSHOT
+ 2.0
ca.uhn.hapi.fhir
hapi-fhir-structures-hl7org-dstu2
- 2.0-SNAPSHOT
+ 2.0
ca.uhn.hapi.fhir
hapi-fhir-validation-resources-dstu2
- 2.0-SNAPSHOT
+ 2.0
ca.uhn.hapi.fhir
hapi-fhir-validation-resources-dstu3
- 2.0-SNAPSHOT
+ 2.0
@@ -356,7 +356,7 @@
ca.uhn.hapi.fhir
hapi-tinder-plugin
- 2.0-SNAPSHOT
+ 2.0
build_dstu1
@@ -408,22 +408,22 @@
ca.uhn.hapi.fhir
hapi-fhir-structures-dstu
- 2.0-SNAPSHOT
+ 2.0
ca.uhn.hapi.fhir
hapi-fhir-structures-dstu2
- 2.0-SNAPSHOT
+ 2.0
ca.uhn.hapi.fhir
hapi-fhir-structures-dstu3
- 2.0-SNAPSHOT
+ 2.0
ca.uhn.hapi.fhir
hapi-fhir-validation-resources-dstu3
- 2.0-SNAPSHOT
+ 2.0
diff --git a/hapi-fhir-jpaserver-example/pom.xml b/hapi-fhir-jpaserver-example/pom.xml
index 14be7e138e6..7feb695aa21 100644
--- a/hapi-fhir-jpaserver-example/pom.xml
+++ b/hapi-fhir-jpaserver-example/pom.xml
@@ -10,7 +10,7 @@
ca.uhn.hapi.fhir
hapi-fhir
- 2.0-SNAPSHOT
+ 2.0
../pom.xml
@@ -35,40 +35,40 @@
ca.uhn.hapi.fhir
hapi-fhir-base
- 2.0-SNAPSHOT
+ 2.0
ca.uhn.hapi.fhir
hapi-fhir-structures-dstu
- 2.0-SNAPSHOT
+ 2.0
ca.uhn.hapi.fhir
hapi-fhir-structures-dstu2
- 2.0-SNAPSHOT
+ 2.0
ca.uhn.hapi.fhir
hapi-fhir-jpaserver-base
- 2.0-SNAPSHOT
+ 2.0
ca.uhn.hapi.fhir
hapi-fhir-testpage-overlay
- 2.0-SNAPSHOT
+ 2.0
war
provided
ca.uhn.hapi.fhir
hapi-fhir-testpage-overlay
- 2.0-SNAPSHOT
+ 2.0
classes
provided
diff --git a/hapi-fhir-jpaserver-uhnfhirtest/pom.xml b/hapi-fhir-jpaserver-uhnfhirtest/pom.xml
index b78f0146e5b..09139a63463 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
- 2.0-SNAPSHOT
+ 2.0
../pom.xml
@@ -18,34 +18,34 @@
ca.uhn.hapi.fhir
hapi-fhir-jpaserver-base
- 2.0-SNAPSHOT
+ 2.0
ca.uhn.hapi.fhir
hapi-fhir-structures-dstu
- 2.0-SNAPSHOT
+ 2.0
ca.uhn.hapi.fhir
hapi-fhir-structures-dstu2
- 2.0-SNAPSHOT
+ 2.0
ca.uhn.hapi.fhir
hapi-fhir-structures-hl7org-dstu2
- 2.0-SNAPSHOT
+ 2.0
ca.uhn.hapi.fhir
hapi-fhir-testpage-overlay
- 2.0-SNAPSHOT
+ 2.0
war
provided
ca.uhn.hapi.fhir
hapi-fhir-testpage-overlay
- 2.0-SNAPSHOT
+ 2.0
classes
provided
diff --git a/hapi-fhir-osgi-core/pom.xml b/hapi-fhir-osgi-core/pom.xml
index 099025958cf..6e2253952b5 100644
--- a/hapi-fhir-osgi-core/pom.xml
+++ b/hapi-fhir-osgi-core/pom.xml
@@ -4,7 +4,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 2.0-SNAPSHOT
+ 2.0
../hapi-deployable-pom/pom.xml
@@ -19,37 +19,37 @@
ca.uhn.hapi.fhir
hapi-fhir-base
- 2.0-SNAPSHOT
+ 2.0
ca.uhn.hapi.fhir
hapi-fhir-structures-dstu
- 2.0-SNAPSHOT
+ 2.0
ca.uhn.hapi.fhir
hapi-fhir-structures-dstu2
- 2.0-SNAPSHOT
+ 2.0
ca.uhn.hapi.fhir
hapi-fhir-structures-hl7org-dstu2
- 2.0-SNAPSHOT
+ 2.0
ca.uhn.hapi.fhir
hapi-fhir-structures-dstu3
- 2.0-SNAPSHOT
+ 2.0
ca.uhn.hapi.fhir
hapi-fhir-validation-resources-dstu2
- 2.0-SNAPSHOT
+ 2.0
ca.uhn.hapi.fhir
hapi-fhir-validation-resources-dstu3
- 2.0-SNAPSHOT
+ 2.0
diff --git a/hapi-fhir-structures-dstu/pom.xml b/hapi-fhir-structures-dstu/pom.xml
index 994594b2b2e..ea997665b7f 100644
--- a/hapi-fhir-structures-dstu/pom.xml
+++ b/hapi-fhir-structures-dstu/pom.xml
@@ -4,7 +4,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 2.0-SNAPSHOT
+ 2.0
../hapi-deployable-pom/pom.xml
@@ -17,7 +17,7 @@
ca.uhn.hapi.fhir
hapi-fhir-base
- 2.0-SNAPSHOT
+ 2.0
diff --git a/hapi-fhir-validation-resources-dstu2/pom.xml b/hapi-fhir-validation-resources-dstu2/pom.xml
index fbb6ce9ed55..13be79be59d 100644
--- a/hapi-fhir-validation-resources-dstu2/pom.xml
+++ b/hapi-fhir-validation-resources-dstu2/pom.xml
@@ -4,7 +4,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 2.0-SNAPSHOT
+ 2.0
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-validation-resources-dstu3/pom.xml b/hapi-fhir-validation-resources-dstu3/pom.xml
index 7827cbb09ad..727b7626f70 100644
--- a/hapi-fhir-validation-resources-dstu3/pom.xml
+++ b/hapi-fhir-validation-resources-dstu3/pom.xml
@@ -4,7 +4,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 2.0-SNAPSHOT
+ 2.0
../hapi-deployable-pom/pom.xml
@@ -17,7 +17,7 @@
ca.uhn.hapi.fhir
hapi-fhir-base
- 2.0-SNAPSHOT
+ 2.0
ch.qos.logback
diff --git a/hapi-tinder-plugin/pom.xml b/hapi-tinder-plugin/pom.xml
index fe979afd347..21771cafbce 100644
--- a/hapi-tinder-plugin/pom.xml
+++ b/hapi-tinder-plugin/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
hapi-fhir
- 2.0-SNAPSHOT
+ 2.0
../pom.xml
@@ -19,7 +19,7 @@
ca.uhn.hapi.fhir
hapi-fhir-base
- 2.0-SNAPSHOT
+ 2.0
ca.uhn.hapi.fhir
hapi-fhir-structures-dstu2
- 2.0-SNAPSHOT
+ 2.0
ca.uhn.hapi.fhir
hapi-fhir-testpage-overlay
- 2.0-SNAPSHOT
+ 2.0
war
provided
ca.uhn.hapi.fhir
hapi-fhir-testpage-overlay
- 2.0-SNAPSHOT
+ 2.0
classes
provided
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 9a664935044..bad54ef15f9 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -6,7 +6,7 @@
HAPI FHIR Changelog
-
+
JSON parsing in HAPI FHIR has been switched from using JSR353 (javax.json) to
using Google Gson. For this reason we are bumping the major release number to
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index da050de4c42..08f408fcf48 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -60,6 +60,51 @@
+
+ August 30, 2016 - HAPI FHIR 2.0 Released -
+ The next release of HAPI has now been uploaded to the Maven repos and
+ GitHub's releases section.
+
+
+ This release brings several primary changes:
+
+ -
+ The JSON parser used by HAPI's parser module has been switched
+ from JSR353/JSONP to
+ Google GSON. This
+ should be an invisible change for most users (the only thing that
+ broke for us was that a few extra spaces are inserted in pretty-printed
+ encoding and this broke some overly sensitive unit tests). Gson is
+ a much more active project than JSONP and should be better
+ supported in the future.
+
+ -
+ STU3 definitions have been updated to the FHIR 1.6.0
+ 2016 September Ballot Candidate definitions
+ (aka the 2016 Baltimore Connectathon version).
+
+ -
+ Content-Types emitted by the library have been updated to use
+ the new content type strings proposed for use as of STU3 (when using
+ HAPI in STU3 mode). E.g.
application/fhir+xml
insead
+ of the previous application/xml+fhir
+
+
+
+
+ This release also brings a number of bugfixes and also quite a few enhancements.
+ As always, the changelog has the full list
+ of changes in this version. Among the enhancements in this release are:
+
+
+ As always, we welcome new contributions and contributors! Please feel free to get
+ in touch if you are interested in getting involved with HAPI but don't know
+ where to start.
+
+
+ - James Agnew
+
+
July 7, 2016 - HAPI FHIR 1.6 Released -
The next release of HAPI has now been uploaded to the Maven repos and