Skip to content

Commit 2cda452

Browse files
author
bot
committed
Merge branch 'release/v1.26.0'
2 parents 28d058b + 60d084d commit 2cda452

File tree

63 files changed

+3339
-233
lines changed

Some content is hidden

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

63 files changed

+3339
-233
lines changed

.github/ISSUE_TEMPLATE/defect.md

Lines changed: 0 additions & 40 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/defect.yml

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
name: Bug Report
2+
description: Report a bug encountered when working with openEHR_SDK
3+
labels: ["bug"]
4+
body:
5+
- type: checkboxes
6+
attributes:
7+
label: Before reporting an issue
8+
description: Please search to see if the issue is already reported, and try to reproduce the issue on the latest release.
9+
options:
10+
- label: I have searched existing issues
11+
required: true
12+
- label: I have reproduced the issue with the latest release
13+
required: true
14+
- type: textarea
15+
attributes:
16+
label: Environment information
17+
description: |
18+
To help reproducing your problem it is mandatory to give some information on the environment.
19+
20+
If the bug was encountered while working with EHRbase please provide the EHRbase version as well.
21+
You can get an aggregate environment of EHRbase by starting EHRbase and performing a GET request on `%ehrbaseBaseUri%/ehrbase/rest/status`
22+
placeholder: |
23+
- openEHR_SDK version:
24+
- Archie version:
25+
- PostgreSQL version:
26+
- Java Runtime version:
27+
- Operating System version:
28+
validations:
29+
required: true
30+
- type: textarea
31+
attributes:
32+
label: Steps to reproduce
33+
description: Describe the steps that you have taken until the unexpected behavior occurred. Please try to add as many details as possible, and include data and templates as attachments.
34+
validations:
35+
required: true
36+
- type: textarea
37+
attributes:
38+
label: Expected behavior
39+
description: Describe the expected output / behavior.
40+
validations:
41+
required: true
42+
- type: textarea
43+
attributes:
44+
label: Actual result
45+
description: Describe the wrong output / behavior.
46+
validations:
47+
required: true
48+
- type: textarea
49+
attributes:
50+
label: Further information
51+
description: Add additional information, if needed.
52+
validations:
53+
required: false

.github/ISSUE_TEMPLATE/enhancement.md

Lines changed: 0 additions & 17 deletions
This file was deleted.
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Enhancement Request
2+
description: Enhancement request for a new / extended functionality of the openEHR_SDK
3+
labels: ["enhancement"]
4+
body:
5+
- type: textarea
6+
attributes:
7+
label: Background
8+
description: Describe the context and intention for this enhancement, such as the benefits and impacts on the user.
9+
validations:
10+
required: true
11+
- type: textarea
12+
attributes:
13+
label: Enhancement
14+
description: Provide specific preconditions, steps, requirements or expectations on theproposed enhancement.
15+
validations:
16+
required: true
17+
- type: input
18+
attributes:
19+
label: Discussion
20+
description: |
21+
If there has been a discussion around the enhancement, provide a link to the discussion.
22+
Please also check for ongoing discussions on the [openEHR discourse](https://discourse.openehr.org/).
23+
- type: textarea
24+
attributes:
25+
label: Further information
26+
description: Add additional information, if needed.
27+
validations:
28+
required: false

.github/ISSUE_TEMPLATE/task.md

Lines changed: 0 additions & 17 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/task.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Task Request
2+
description: A general task, e.g. research or other common work to be done
3+
labels: ["task"]
4+
body:
5+
- type: textarea
6+
attributes:
7+
label: Background
8+
description: Describe the goal of this task, and the expectations or impacts on openEHR_SDK after this task has been completed.
9+
validations:
10+
required: true
11+
- type: textarea
12+
attributes:
13+
label: Task specification
14+
description: Add specific steps or work descriptions with the expected results.
15+
validations:
16+
required: true
17+
- type: input
18+
attributes:
19+
label: Discussion
20+
description: |
21+
If there has been a discussion around the task, provide a link to the discussion.
22+
Please also check for ongoing discussions on the [openEHR discourse](https://discourse.openehr.org/).
23+
- type: textarea
24+
attributes:
25+
label: Further information
26+
description: Add additional information, if needed.
27+
validations:
28+
required: false

.github/dependabot.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# To get started with Dependabot version updates, you'll need to specify which
2+
# package ecosystems to update and where the package manifests are located.
3+
# Please see the documentation for all configuration options:
4+
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
5+
6+
version: 2
7+
updates:
8+
- package-ecosystem: "maven" # See documentation for possible values
9+
directory: "/" # Location of package manifests
10+
schedule:
11+
interval: "weekly"
12+
ignore:
13+
- dependency-name: "*"
14+
update-types: ["version-update:semver-major"]

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22

33
Note: version releases in the 0.x.y range may introduce breaking changes.
44

5+
## [1.26.0]
6+
### Added
7+
- Added client support for managing folders trough contributions ([#427](https://github.com/ehrbase/openEHR_SDK/pull/427))
8+
- update archie to 3.0.0 and antlr4 to 4.11.1 ([#428](https://github.com/ehrbase/openEHR_SDK/pull/428))
9+
### Fixed
10+
- Add workarounds for archie not handling date-time values according to spec when (de-)serializing (affects XML,JSON and Flat) ([#420](https://github.com/ehrbase/openEHR_SDK/pull/420))
11+
512
## [1.25.0]
613
### Added
714
### Changed
@@ -230,3 +237,4 @@ Note: version releases in the 0.x.y range may introduce breaking changes.
230237
[1.23.0]: https://github.com/ehrbase/openEHR_SDK/compare/v1.22.0...v1.23.0
231238
[1.24.0]: https://github.com/ehrbase/openEHR_SDK/compare/v1.23.0...v1.24.0
232239
[1.25.0]: https://github.com/ehrbase/openEHR_SDK/compare/v1.24.0...v1.25.0
240+
[1.26.0]: https://github.com/ehrbase/openEHR_SDK/compare/v1.25.0...v1.26.0

aql/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<parent>
2626
<groupId>org.ehrbase.openehr.sdk</groupId>
2727
<artifactId>root</artifactId>
28-
<version>1.25.0</version>
28+
<version>1.26.0</version>
2929
</parent>
3030

3131
<artifactId>aql</artifactId>

bom/pom.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<artifactId>bom</artifactId>
1010
<groupId>org.ehrbase.openehr.sdk</groupId>
11-
<version>1.25.0</version>
11+
<version>1.26.0</version>
1212
<packaging>pom</packaging>
1313

1414
<name>openEHR SDK</name>
@@ -38,8 +38,8 @@
3838
</developers>
3939

4040
<properties>
41-
<antlr4.version>4.9.3</antlr4.version>
42-
<archie.version>2.1.0</archie.version>
41+
<antlr4.version>4.11.1</antlr4.version>
42+
<archie.version>3.0.0</archie.version>
4343
<assertj.version>3.19.0</assertj.version>
4444
<cglib.version>3.3.0</cglib.version>
4545
<classgraph.version>4.8.138</classgraph.version>
@@ -54,15 +54,15 @@
5454
<guava.version>31.0.1-jre</guava.version>
5555
<gson.version>2.9.0</gson.version>
5656
<httpclient.version>4.5.13</httpclient.version>
57-
<jackson-bom.version>2.13.5</jackson-bom.version>
57+
<jackson-bom.version>2.14.2</jackson-bom.version>
5858
<javapoet.version>1.13.0</javapoet.version>
5959
<javax-annotation.version>1.3.2</javax-annotation.version>
6060
<javax-cache.version>1.1.1</javax-cache.version>
6161
<javax-jaxb.version>2.3.1</javax-jaxb.version>
6262
<json.version>20220924</json.version>
6363
<json-path.version>2.7.0</json-path.version>
64-
<jsonassert.version>1.5.0</jsonassert.version>
65-
<junit.version>5.8.2</junit.version>
64+
<jsonassert.version>1.5.1</jsonassert.version>
65+
<junit.version>5.9.2</junit.version>
6666
<mockito.version>4.3.1</mockito.version>
6767
<slf4j.version>1.7.36</slf4j.version>
6868
<xmlbeans.version>3.1.0</xmlbeans.version>
@@ -73,8 +73,8 @@
7373
<maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
7474
<maven-javadoc-plugin.version>3.3.2</maven-javadoc-plugin.version>
7575
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
76-
<maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
77-
<jacoco.version>0.8.7</jacoco.version>
76+
<maven-surefire-plugin.version>3.0.0</maven-surefire-plugin.version>
77+
<jacoco.version>0.8.8</jacoco.version>
7878
<threeten-extra.version>1.6.0</threeten-extra.version>
7979
</properties>
8080

0 commit comments

Comments
 (0)