Skip to content

Commit 34e1206

Browse files
jdar8jdar
jdar8
and
jdar
authored
version bump (#6824)
* version bump * add lombok deps * noop change * fix list.of() issue * remove unused import * revert local ref prefix changes * add todo comment for list of revert * spotless changes --------- Co-authored-by: jdar <[email protected]>
1 parent e1c4a32 commit 34e1206

File tree

81 files changed

+135
-86
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+135
-86
lines changed

‎hapi-deployable-pom/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>ca.uhn.hapi.fhir</groupId>
77
<artifactId>hapi-fhir</artifactId>
8-
<version>8.1.2-SNAPSHOT</version>
8+
<version>8.1.3-SNAPSHOT</version>
99

1010
<relativePath>../pom.xml</relativePath>
1111
</parent>

‎hapi-fhir-android/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>ca.uhn.hapi.fhir</groupId>
77
<artifactId>hapi-deployable-pom</artifactId>
8-
<version>8.1.2-SNAPSHOT</version>
8+
<version>8.1.3-SNAPSHOT</version>
99

1010
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
1111
</parent>

‎hapi-fhir-base/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>ca.uhn.hapi.fhir</groupId>
77
<artifactId>hapi-deployable-pom</artifactId>
8-
<version>8.1.2-SNAPSHOT</version>
8+
<version>8.1.3-SNAPSHOT</version>
99

1010
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
1111
</parent>

‎hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/ParserState.java‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,9 @@ public void wereBack() {
399399
myErrorHandler.containedResourceWithNoId(null);
400400
} else {
401401
if (!res.getId().isLocal()) {
402-
res.setId(new IdDt(res.getId().getIdPart()));
402+
res.setId(new IdDt('#' + res.getId().getIdPart()));
403+
// TODO rolled back this local ref prefix change
404+
// res.setId(new IdDt(res.getId().getIdPart()));
403405
}
404406
getPreResourceState().getContainedResources().put(res.getId().getValueAsString(), res);
405407
}
@@ -439,7 +441,9 @@ public void wereBack() {
439441
// need an ID to be referred to)
440442
myErrorHandler.containedResourceWithNoId(null);
441443
} else {
442-
res.getIdElement().setValue(res.getIdElement().getIdPart());
444+
res.getIdElement().setValue('#' + res.getIdElement().getIdPart());
445+
// TODO rolled back this local ref prefix change
446+
// res.getIdElement().setValue(res.getIdElement().getIdPart());
443447
getPreResourceState()
444448
.getContainedResources()
445449
.put(res.getIdElement().getValue(), res);
@@ -1238,8 +1242,10 @@ void weaveContainedResources() {
12381242
String ref = nextRef.getReferenceElement().getValue();
12391243
if (isNotBlank(ref)) {
12401244
if (ref.startsWith("#") && ref.length() > 1) {
1241-
String refId = ref.substring(1);
1242-
IBaseResource target = myContainedResources.get(refId);
1245+
IBaseResource target = myContainedResources.get(ref);
1246+
// TODO rolled back this local ref prefix change
1247+
// String refId = ref.substring(1);
1248+
// IBaseResource target = myContainedResources.get(refId);
12431249
if (target != null) {
12441250
ourLog.debug("Resource contains local ref {}", ref);
12451251
nextRef.setResource(target);

‎hapi-fhir-bom/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>ca.uhn.hapi.fhir</groupId>
66
<artifactId>hapi-fhir-bom</artifactId>
7-
<version>8.1.2-SNAPSHOT</version>
7+
<version>8.1.3-SNAPSHOT</version>
88

99
<packaging>pom</packaging>
1010
<name>HAPI FHIR BOM</name>
1111

1212
<parent>
1313
<groupId>ca.uhn.hapi.fhir</groupId>
1414
<artifactId>hapi-deployable-pom</artifactId>
15-
<version>8.1.2-SNAPSHOT</version>
15+
<version>8.1.3-SNAPSHOT</version>
1616

1717
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
1818
</parent>

‎hapi-fhir-checkstyle/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>ca.uhn.hapi.fhir</groupId>
77
<artifactId>hapi-fhir</artifactId>
8-
<version>8.1.2-SNAPSHOT</version>
8+
<version>8.1.3-SNAPSHOT</version>
99

1010
<relativePath>../pom.xml</relativePath>
1111
</parent>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>ca.uhn.hapi.fhir</groupId>
66
<artifactId>hapi-deployable-pom</artifactId>
7-
<version>8.1.2-SNAPSHOT</version>
7+
<version>8.1.3-SNAPSHOT</version>
88

99
<relativePath>../../hapi-deployable-pom/pom.xml</relativePath>
1010
</parent>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>ca.uhn.hapi.fhir</groupId>
88
<artifactId>hapi-fhir-cli</artifactId>
9-
<version>8.1.2-SNAPSHOT</version>
9+
<version>8.1.3-SNAPSHOT</version>
1010

1111
<relativePath>../pom.xml</relativePath>
1212
</parent>

‎hapi-fhir-cli/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>ca.uhn.hapi.fhir</groupId>
77
<artifactId>hapi-fhir</artifactId>
8-
<version>8.1.2-SNAPSHOT</version>
8+
<version>8.1.3-SNAPSHOT</version>
99

1010
<relativePath>../pom.xml</relativePath>
1111
</parent>

‎hapi-fhir-client-apache-http5/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>ca.uhn.hapi.fhir</groupId>
66
<artifactId>hapi-deployable-pom</artifactId>
7-
<version>8.1.2-SNAPSHOT</version>
7+
<version>8.1.3-SNAPSHOT</version>
88

99
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
1010
</parent>

0 commit comments

Comments
 (0)