7 0 0 mb (#5678)

* pom bump to 7.0.0 (#5615)

* pom bump to 7.0.0

* add version enum

* fixed feb release name

---------

Co-authored-by: Long Ma <[email protected]>

* Check index existence on raw SQL creation (#5624)

* Add conditional check on index existence before we try again

* Add conditional check on index existence before we try again

* Changelog

* remit

* remit

* debug statements

* 5621 deadlock on caffeine cache when creating a resource with conditional create (#5622)

* Modifying the CacheProvider to avoid doing db I/O within the cache miss value supplier callback.

* Setting the initial capacity of instantiated caches to the cache max size to avoid resizing during operations.

* adding changelog and spotless.

* Fixing typo.

* Addressing comments from code review.

---------

Co-authored-by: peartree <[email protected]>

* Searching with more than one chained Bundle SearchParameter returns incorrect results (#5614)

* Failing test

* fix

* changelog

* Avoiding Exception being thrown on @eventlistener invocation (#5628)

* replaced EventListener annotation with @PreDestroy

* adding changelog

---------

Co-authored-by: peartree <[email protected]>

* simple fix (#5630)

Co-authored-by: Long Ma <[email protected]>

* Incorrect version of auto versioned reference for conditional update with urn id placeholder (#5625)

* Incorrect version from versioned_references.auto_at_paths for conditional update - implementation

* Oracle:  Ensure migrated database still takes large resource text updates (#5629)

* First pass at fix to Oracle HFJ_RES_VER.RES_TEXT_VC migration.

* First stab at agreed upon solution.

* Fix error with 4001 by removing unnecessary annotation.

* Spotless and TODO.

* Remove annotation for good and set length to LONG32.

* Fix copyright year.

* Finalize changelog.

* Remove migration changes.  Fix unit test.

* Fix compile error.

* Log output.

* Refactor resource history code into new ResourceHistoryCalculator.

* Spotless.

* Convert record to POJO.

* Restore pre-17 switch statement.

* Finalize new resource history calculator code and tests.

* Spotless.

* Remove logging.

* Update hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/7_0_0/5633-oracle-hfj-res-ver-clob-migration.yaml

Apply code reviewer suggestion

Co-authored-by: Michael Buckley <[email protected]>

* Code review feedback.

---------

Co-authored-by: Michael Buckley <[email protected]>

* Fix expansion for `ValueSet` with no concepts based on CodeSystem `urn:ietf:bcp:13` (#5638)

* When fetching the mimetype code system, return empty CodeSystem with NOTSUPPORTED content. Update expansion logic to handle this case. Add some test cases.

* Minor change to fix test

* Rename changelog file

* Remove TODOs as they're replaced by reported issue

* Revert accidental change added with TODO removal

* $expunge operation ignoring ExpungeThreadCount setting in certain cases (#5637)

* $expunge operation ignoring ExpungeThreadCount setting in certain cases - implementation

* Fix Measure group id null pointer exception (#5620)

* Update to new version of clinical reasoning, includes a fix for null pointers on Measure group id

* add changelog

---------

Co-authored-by: Justin McKelvy <[email protected]>

* Rule evaluation:  Allow Bundles with PATCH Parameters (#5641)

* Remove parameters clause.

* Finalize changelog.  Add tests.  Finalize implementation.

* Undo changes to this test.

* Revert all changes to FhirQueryRuleImplTest.  Add new RuleImplOpTest.  Ensure that proper nested Bundle is created for test and other fixes.

* Tweak test.

* Use real rule applier in test and remove all mocks.

* Prevent batch2 job execution to stop for empty chunk when last job st… (#5635)

* Prevent batch2 job execution to stop for empty chunk when last job step is a reduction.
Add output to bulk export result even when empty.

* Fix test

* Unimportant change to force fresh build

* Implement review suggestions

---------

Co-authored-by: juan.marchionatto <[email protected]>

* Index review fixes (#5649)

* Don't hold locks while adding indices during upgrade.
* concurrent indexing is non-transactional in PG.

* Fix conditional creates without leading '?' (#5646)

* First commit with failing test.

* More tests and logs.

* More logs

* Try new solution for BaseTransactionProcessor.performIdSubstitutionsInMatchUrl().

* Simplify solution.  Add more tests.

* Changelog.

* javadoc

* Searching for Bundles with read all Bundles permission returns 403 (#5644)

* failing test

* another failing test case

* fix

* changelog

* fix bug

* spotless

* cr

* Fix NullPointerException when performing a system bulk export in the presence of PatientIdPartitionInterceptor. (#5660)

* Serializing changes for sensitive data (#5655)

* Add new senstiive data serializer

* Add new senstiive data serializer

* Add new senstiive data serializer

* Remove dead comments

* Change up the test

* review comments

* wip

* Tighten tests and push annotation down

* Tighten tests and push annotation down

* Changelog

* Add test

* 7.0.1-SNAPSHOT bump

* Error code

* Add method used by CDR

* add version enum

* Fix test

* Rel 7 0 CVE (#5663)

* Bump json-path

* Pin parrson

* Bump elastic

* Bump spring version

* Exclude JDBC

* Descendent fix (#5669)

* Fix "is-a" ValueSet expansion, add "descendent-of" support

* Fixed tests in DSTU3 and R5

* Trigger new build

* Revert "Trigger new build"

This reverts commit 46c672b.

* fix default partition setting on resource (#5617)

* fix default partition setting on resource

* changelog

* Handle DEFAULT partition in rule checker.

* Fix spotless

---------

Co-authored-by: Michael Buckley <[email protected]>
Co-authored-by: James Agnew <[email protected]>

* pom bump, doc add, version enum add (#5616)

Co-authored-by: Long Ma <[email protected]>

* fix default partition setting on resource (#5618)

* fix default partition setting on resource
* Handle DEFAULT partition in rule checker.

Co-authored-by: Ken Stevens <[email protected]>

* Add setting to make broker not use JacksonMessageConverter (#5611)

* Add setting to make broker not use JacksonMessageConverter

* Add changelog

* Implement suggestions

---------

Co-authored-by: juan.marchionatto <[email protected]>

* Fix version

* add changelog, add attribution, remove accidental bring-overs

* add changelog, add attribution, remove accidental bring-overs

* Finish jira section

---------

Co-authored-by: Ole Hedegaard <[email protected]>
Co-authored-by: Ken Stevens <[email protected]>
Co-authored-by: Michael Buckley <[email protected]>
Co-authored-by: James Agnew <[email protected]>
Co-authored-by: longma1 <[email protected]>
Co-authored-by: Long Ma <[email protected]>
Co-authored-by: jmarchionatto <[email protected]>
Co-authored-by: juan.marchionatto <[email protected]>

* fix conflict mistake

* removed test assert that is no longer true:

* version bumpb to 7.1.1

* fix version Enum test

---------

Co-authored-by: Long Ma <[email protected]>
Co-authored-by: Tadgh <[email protected]>
Co-authored-by: Etienne Poirier <[email protected]>
Co-authored-by: peartree <[email protected]>
Co-authored-by: Nathan Doef <[email protected]>
Co-authored-by: volodymyr-korzh <[email protected]>
Co-authored-by: Luke deGruchy <[email protected]>
Co-authored-by: Michael Buckley <[email protected]>
Co-authored-by: Martha Mitran <[email protected]>
Co-authored-by: JP <[email protected]>
Co-authored-by: Justin McKelvy <[email protected]>
Co-authored-by: jmarchionatto <[email protected]>
Co-authored-by: juan.marchionatto <[email protected]>
Co-authored-by: Ole Hedegaard <[email protected]>
Co-authored-by: Ken Stevens <[email protected]>
Co-authored-by: James Agnew <[email protected]>

hapi-deployable-pom/pom.xml

@@ -5,7 +5,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-fhir</artifactId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>7.1.1-SNAPSHOT</version>
 
  <relativePath>../pom.xml</relativePath>
  </parent>

hapi-fhir-android/pom.xml

@@ -5,7 +5,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>7.1.1-SNAPSHOT</version>
 
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>

hapi-fhir-base/pom.xml

@@ -5,7 +5,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>7.1.1-SNAPSHOT</version>
 
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IModelJson.java

@@ -29,4 +29,6 @@
  getterVisibility = JsonAutoDetect.Visibility.NONE,
  isGetterVisibility = JsonAutoDetect.Visibility.NONE,
  setterVisibility = JsonAutoDetect.Visibility.NONE)
-public interface IModelJson {}
+public interface IModelJson {
+ String SENSITIVE_DATA_FILTER_NAME = "sensitiveDataFilter";
+}

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/SensitiveNoDisplay.java

@@ -0,0 +1,34 @@
+/*-
+ * #%L
+ * HAPI FHIR - Core Library
+ * %%
+ * Copyright (C) 2014 - 2024 Smile CDR, Inc.
+ * %%
+ * 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:https://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%
+ */
+package ca.uhn.fhir.model.api.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Annotation to mark a field as sensitive, indicating that it should not
+ * be displayed or serialized by jackson. The only way to serialize an object annotated with this annotation is to use
+ * {@link ca.uhn.fhir.util.JsonUtil}, as it has a registered filter against this annotation.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
+public @interface SensitiveNoDisplay {}

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/valueset/BundleTypeEnum.java

@@ -91,7 +91,7 @@ public String getSystem() {
  /**
  * Returns the enumerated value associated with this code
  */
- public BundleTypeEnum forCode(String theCode) {
+ public static BundleTypeEnum forCode(String theCode) {
  BundleTypeEnum retVal = CODE_TO_ENUM.get(theCode);
  return retVal;
  }

hapi-fhir-base/src/main/java/ca/uhn/fhir/util/AttachmentUtil.java

@@ -24,6 +24,7 @@
 import ca.uhn.fhir.context.BaseRuntimeElementDefinition;
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.context.FhirVersionEnum;
+import ca.uhn.fhir.model.primitive.CodeDt;
 import org.apache.commons.lang3.Validate;
 import org.hl7.fhir.instance.model.api.IBase;
 import org.hl7.fhir.instance.model.api.ICompositeType;
@@ -41,8 +42,8 @@ public static IPrimitiveType<byte[]> getOrCreateData(FhirContext theContext, ICo
  return getOrCreateChild(theContext, theAttachment, "data", "base64Binary");
  }
 
- public static IPrimitiveType<String> getOrCreateContentType(FhirContext theContext, ICompositeType theAttachment) {
- return getOrCreateChild(theContext, theAttachment, "contentType", "string");
+ public static IPrimitiveType<CodeDt> getOrCreateContentType(FhirContext theContext, ICompositeType theAttachment) {
+ return getOrCreateChild(theContext, theAttachment, "contentType", "code");
  }
 
  public static IPrimitiveType<String> getOrCreateUrl(FhirContext theContext, ICompositeType theAttachment) {

hapi-fhir-base/src/main/java/ca/uhn/fhir/util/BundleBuilder.java

@@ -251,10 +251,22 @@ public void addTransactionUpdateIdOnlyEntry(IBaseResource theResource) {
  * @param theResource The resource to create
  */
  public CreateBuilder addTransactionCreateEntry(IBaseResource theResource) {
+ return addTransactionCreateEntry(theResource, null);
+ }
+
+ /**
+ * Adds an entry containing an create (POST) request.
+ * Also sets the Bundle.type value to "transaction" if it is not already set.
+ *
+ * @param theResource The resource to create
+ * @param theFullUrl The fullUrl to attach to the entry. If null, will default to the resource ID.
+ */
+ public CreateBuilder addTransactionCreateEntry(IBaseResource theResource, @Nullable String theFullUrl) {
  setBundleField("type", "transaction");
 
- IBase request =
- addEntryAndReturnRequest(theResource, theResource.getIdElement().getValue());
+ IBase request = addEntryAndReturnRequest(
+ theResource,
+ theFullUrl != null ? theFullUrl : theResource.getIdElement().getValue());
 
  String resourceType = myContext.getResourceType(theResource);
 

hapi-fhir-base/src/main/java/ca/uhn/fhir/util/BundleUtil.java

@@ -26,6 +26,7 @@
 import ca.uhn.fhir.context.RuntimeResourceDefinition;
 import ca.uhn.fhir.i18n.Msg;
 import ca.uhn.fhir.model.primitive.IdDt;
+import ca.uhn.fhir.model.valueset.BundleTypeEnum;
 import ca.uhn.fhir.rest.api.PatchTypeEnum;
 import ca.uhn.fhir.rest.api.RequestTypeEnum;
 import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
@@ -235,6 +236,14 @@ public static String getBundleType(FhirContext theContext, IBaseBundle theBundle
  return null;
  }
 
+ public static BundleTypeEnum getBundleTypeEnum(FhirContext theContext, IBaseBundle theBundle) {
+ String bundleTypeCode = BundleUtil.getBundleType(theContext, theBundle);
+ if (isBlank(bundleTypeCode)) {
+ return null;
+ }
+ return BundleTypeEnum.forCode(bundleTypeCode);
+ }
+
  public static void setBundleType(FhirContext theContext, IBaseBundle theBundle, String theType) {
  RuntimeResourceDefinition def = theContext.getResourceDefinition(theBundle);
  BaseRuntimeChildDefinition entryChild = def.getChildByName("type");

hapi-fhir-base/src/main/java/ca/uhn/fhir/util/JsonUtil.java

@@ -21,15 +21,23 @@
 
 import ca.uhn.fhir.i18n.Msg;
 import ca.uhn.fhir.model.api.IModelJson;
+import ca.uhn.fhir.model.api.annotation.SensitiveNoDisplay;
 import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
 import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.ser.FilterProvider;
+import com.fasterxml.jackson.databind.ser.PropertyWriter;
+import com.fasterxml.jackson.databind.ser.impl.SimpleBeanPropertyFilter;
+import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider;
 import jakarta.annotation.Nonnull;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.StringWriter;
 import java.io.Writer;
 import java.util.List;
@@ -38,15 +46,30 @@ public class JsonUtil {
 
  private static final ObjectMapper ourMapperPrettyPrint;
  private static final ObjectMapper ourMapperNonPrettyPrint;
+ private static final ObjectMapper ourMapperIncludeSensitive;
+
+ public static final SimpleBeanPropertyFilter SIMPLE_BEAN_PROPERTY_FILTER = new SensitiveDataFilter();
+
+ public static final SimpleFilterProvider SENSITIVE_DATA_FILTER_PROVIDER =
+ new SimpleFilterProvider().addFilter(IModelJson.SENSITIVE_DATA_FILTER_NAME, SIMPLE_BEAN_PROPERTY_FILTER);
+ public static final SimpleFilterProvider SHOW_ALL_DATA_FILTER_PROVIDER = new SimpleFilterProvider()
+ .addFilter(IModelJson.SENSITIVE_DATA_FILTER_NAME, SimpleBeanPropertyFilter.serializeAll());
 
  static {
  ourMapperPrettyPrint = new ObjectMapper();
  ourMapperPrettyPrint.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+ ourMapperPrettyPrint.setFilterProvider(SENSITIVE_DATA_FILTER_PROVIDER);
  ourMapperPrettyPrint.enable(SerializationFeature.INDENT_OUTPUT);
 
  ourMapperNonPrettyPrint = new ObjectMapper();
  ourMapperNonPrettyPrint.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+ ourMapperNonPrettyPrint.setFilterProvider(SENSITIVE_DATA_FILTER_PROVIDER);
  ourMapperNonPrettyPrint.disable(SerializationFeature.INDENT_OUTPUT);
+
+ ourMapperIncludeSensitive = new ObjectMapper();
+ ourMapperIncludeSensitive.setFilterProvider(SHOW_ALL_DATA_FILTER_PROVIDER);
+ ourMapperIncludeSensitive.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+ ourMapperIncludeSensitive.disable(SerializationFeature.INDENT_OUTPUT);
  }
 
  /**
@@ -67,6 +90,24 @@ public static <T> T deserialize(@Nonnull String theInput, @Nonnull Class<T> theT
  public static <T> List<T> deserializeList(@Nonnull String theInput, @Nonnull Class<T> theType) throws IOException {
  return ourMapperPrettyPrint.readerForListOf(theType).readValue(theInput);
  }
+ /**
+ * Parse JSON
+ */
+ public static <T> T deserialize(@Nonnull InputStream theInput, @Nonnull Class<T> theType) throws IOException {
+ return ourMapperPrettyPrint.readerFor(theType).readValue(theInput);
+ }
+
+ /**
+ * Includes fields which are annotated with {@link SensitiveNoDisplay}. Currently only meant to be used for serialization
+ * for batch job parameters.
+ */
+ public static String serializeWithSensitiveData(@Nonnull IModelJson theInput) {
+ try {
+ return ourMapperIncludeSensitive.writeValueAsString(theInput);
+ } catch (JsonProcessingException e) {
+ throw new InvalidRequestException(Msg.code(2487) + "Failed to encode " + theInput.getClass(), e);
+ }
+ }
 
  /**
  * Encode JSON
@@ -93,6 +134,10 @@ public static String serialize(@Nonnull Object theInput, boolean thePrettyPrint)
  }
  }
 
+ public FilterProvider getSensitiveDataFilterProvider() {
+ return SENSITIVE_DATA_FILTER_PROVIDER;
+ }
+
  /**
  * Encode JSON
  */
@@ -111,4 +156,26 @@ public static String serializeOrInvalidRequest(IModelJson theJson) {
  throw new InvalidRequestException(Msg.code(1741) + "Failed to encode " + theJson.getClass(), e);
  }
  }
+
+ private static class SensitiveDataFilter extends SimpleBeanPropertyFilter {
+
+ @Override
+ protected boolean include(PropertyWriter writer) {
+ return true; // Default include all except explicitly checked and excluded
+ }
+
+ @Override
+ public void serializeAsField(Object pojo, JsonGenerator gen, SerializerProvider provider, PropertyWriter writer)
+ throws Exception {
+ if (include(writer)) {
+ if (!isFieldSensitive(writer)) {
+ super.serializeAsField(pojo, gen, provider, writer);
+ }
+ }
+ }
+
+ private boolean isFieldSensitive(PropertyWriter writer) {
+ return writer.getAnnotation(SensitiveNoDisplay.class) != null;
+ }
+ }
 }

hapi-fhir-base/src/main/java/ca/uhn/fhir/util/VersionEnum.java

@@ -135,6 +135,8 @@ public enum VersionEnum {
  V6_11_0,
 
  V7_0_0,
+ V7_0_1,
+
  V7_1_0,
  V7_2_0;
 

hapi-fhir-base/src/test/java/ca/uhn/fhir/util/JsonUtilTest.java

@@ -0,0 +1,54 @@
+package ca.uhn.fhir.util;
+
+import ca.uhn.fhir.model.api.IModelJson;
+import ca.uhn.fhir.model.api.annotation.SensitiveNoDisplay;
+import com.fasterxml.jackson.annotation.JsonFilter;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.junit.jupiter.api.Test;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+class JsonUtilTest {
+
+ @JsonFilter(IModelJson.SENSITIVE_DATA_FILTER_NAME)
+ class TestObject implements IModelJson {
+ @JsonProperty("sensitiveField")
+ @SensitiveNoDisplay
+ private String mySensitiveField;
+
+ @JsonProperty(value = "publicField")
+ private String myPublicField;
+
+ public String getPrivateField() {
+ return mySensitiveField;
+ }
+
+ public void setSensitiveField(String thePrivateField) {
+ this.mySensitiveField = thePrivateField;
+ }
+
+ public String getPublicField() {
+ return myPublicField;
+ }
+
+ public void setPublicField(String thePublicField) {
+ this.myPublicField = thePublicField;
+ }
+ }
+
+ @Test
+ public void testSensitiveNoDisplayAnnotationIsHiddenFromBasicSerialization() {
+ TestObject object = new TestObject();
+ object.setPublicField("Public Value!");
+ object.setSensitiveField("Sensitive Value!");
+
+ String sensitiveExcluded = JsonUtil.serializeOrInvalidRequest(object);
+ assertThat(sensitiveExcluded, is(not(containsString("Sensitive Value!"))));
+
+ String sensitiveIncluded = JsonUtil.serializeWithSensitiveData(object);
+ assertThat(sensitiveIncluded, is(containsString("Sensitive Value!")));
+ }
+}

hapi-fhir-base/src/test/java/ca/uhn/fhir/util/VersionEnumTest.java

@@ -29,7 +29,7 @@ public void testCurrentVersionExists() {
  int minor = Integer.parseInt(parts[1]);
  int patch = Integer.parseInt(parts[2]);
 
- if (major >= 6 && minor >= 3) {
+ if ((major == 6 && minor >= 3) || major > 6 ) {
  if (minor % 2 == 1) {
  patch = 0;
  }

hapi-fhir-bom/pom.xml

@@ -4,15 +4,15 @@
  <modelVersion>4.0.0</modelVersion>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-fhir-bom</artifactId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>7.1.1-SNAPSHOT</version>
 
  <packaging>pom</packaging>
  <name>HAPI FHIR BOM</name>
 
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>7.1.1-SNAPSHOT</version>
 
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>

hapi-fhir-checkstyle/pom.xml

@@ -5,7 +5,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-fhir</artifactId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>7.1.1-SNAPSHOT</version>
 
  <relativePath>../pom.xml</relativePath>
  </parent>

hapi-fhir-cli/hapi-fhir-cli-api/pom.xml

@@ -4,7 +4,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>7.1.1-SNAPSHOT</version>
 
  <relativePath>../../hapi-deployable-pom/pom.xml</relativePath>
  </parent>

hapi-fhir-cli/hapi-fhir-cli-app/pom.xml

@@ -6,7 +6,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-fhir-cli</artifactId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>7.1.1-SNAPSHOT</version>
 
  <relativePath>../pom.xml</relativePath>
  </parent>

hapi-fhir-cli/pom.xml

@@ -5,7 +5,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-fhir</artifactId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>7.1.1-SNAPSHOT</version>
 
  <relativePath>../pom.xml</relativePath>
  </parent>

hapi-fhir-client-okhttp/pom.xml

@@ -4,7 +4,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>7.1.1-SNAPSHOT</version>
 
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>