Skip to content

Commit

Permalink
Merge branch 'release/v2.14.0'
Browse files Browse the repository at this point in the history
bot committed Jul 11, 2024
2 parents 215a3c6 + 856fcab commit bf3730c
Showing 22 changed files with 38 additions and 33 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -50,7 +50,7 @@ jobs:
run: |
curl \
-X POST \
-H "Authorization: token ${{ secrets.PERSONAL_ACCESS_TOKEN }}" \
-H "Authorization: token ${{ secrets.BOT_ACCESS_TOKEN }}" \
-H "Content-Type: application/json" \
https://api.github.com/repos/ehrbase/ehrbase/dispatches \
-d '{"event_type":"build-and-test-postgres"}'
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -17,8 +17,8 @@ jobs:
with:
fetch-depth: 0
# This will be used by git in all further steps
# We need a PERSONAL ACCESS TOKEN so pushes trigger other github actions
token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
# We need a PERSONAL ACCESS TOKEN so pushes trigger other GitHub actions
token: ${{ secrets.BOT_ACCESS_TOKEN }}

- name: Calculate realise version
run: |
@@ -74,7 +74,7 @@ jobs:
then exit 1
fi
env:
GITHUB_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
GITHUB_TOKEN: ${{ secrets.BOT_ACCESS_TOKEN }}

- name: Merge into Main
run: |
@@ -88,7 +88,7 @@ jobs:
run: |
gh release create "v${VERSION}" -t "v${VERSION}" -F CHANGELOG.md -R ${{ github.repository }} --target master
env:
GITHUB_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
GITHUB_TOKEN: ${{ secrets.BOT_ACCESS_TOKEN }}

- name: Merge into dev
run: |
2 changes: 1 addition & 1 deletion .github/workflows/report-sonar-results.yml
Original file line number Diff line number Diff line change
@@ -36,7 +36,7 @@ jobs:
- name: Download - Jacoco Overall Coverage
uses: actions/download-artifact@v4
with:
github-token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
github-token: ${{ secrets.BOT_ACCESS_TOKEN }}
run-id: ${{ github.event.workflow_run.id }} # download artifacts from build and test workflow
pattern: jacoco-coverage-overall # uses artifact of build and test workflow
merge-multiple: true
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -2,6 +2,10 @@

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

## [2.14.0]
### Changed
- Bumped libraries

## [2.13.0]
### Added
### Fixed
@@ -16,7 +20,7 @@ Note: version releases in the 0.x.y range may introduce breaking changes.

## [2.10.0]
### Added
- Added EHRbase AQL `MeataData` debug execution data ([594](https://github.com/ehrbase/openEHR_SDK/pull/594))
- Added EHRbase AQL `MetaData` debug execution data ([594](https://github.com/ehrbase/openEHR_SDK/pull/594))
### Changed
- OptParser now ignores node_id tags for all RM types that are not subtypes of LOCATABLE ([#596](https://github.com/ehrbase/openEHR_SDK/pull/596))
- Removed OpenEhrClient::getFolder (use directoryCrudEndpoint()::getFolder instead) ([#588](https://github.com/ehrbase/openEHR_SDK/pull/588))
@@ -417,3 +421,4 @@ Note: version releases in the 0.x.y range may introduce breaking changes.
[2.11.0]: https://github.com/ehrbase/openEHR_SDK/compare/v2.10.0...v2.11.0
[2.12.0]: https://github.com/ehrbase/openEHR_SDK/compare/v2.11.0...v2.12.0
[2.13.0]: https://github.com/ehrbase/openEHR_SDK/compare/v2.12.0...v2.13.0
[2.14.0]: https://github.com/ehrbase/openEHR_SDK/compare/v2.13.0...v2.14.0
2 changes: 1 addition & 1 deletion aql/pom.xml
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@
<parent>
<groupId>org.ehrbase.openehr.sdk</groupId>
<artifactId>sdk-parent</artifactId>
<version>2.13.0</version>
<version>2.14.0</version>
</parent>

<artifactId>aql</artifactId>
10 changes: 5 additions & 5 deletions bom/pom.xml
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@

<artifactId>bom</artifactId>
<groupId>org.ehrbase.openehr.sdk</groupId>
<version>2.13.0</version>
<version>2.14.0</version>
<packaging>pom</packaging>

<name>openEHR SDK</name>
@@ -40,7 +40,7 @@
<properties>
<antlr4.version>4.11.1</antlr4.version>
<archie.version>3.3.0</archie.version>
<assertj.version>3.25.3</assertj.version>
<assertj.version>3.26.0</assertj.version>
<cglib.version>3.3.0</cglib.version>
<classgraph.version>4.8.165</classgraph.version>
<commons-cli.version>1.6.0</commons-cli.version>
@@ -54,7 +54,7 @@
<guava.version>32.1.3-jre</guava.version>
<gson.version>2.10.1</gson.version>
<httpclient.version>4.5.14</httpclient.version>
<jackson-bom.version>2.16.0</jackson-bom.version>
<jackson-bom.version>2.17.1</jackson-bom.version>
<javapoet.version>1.13.0</javapoet.version>
<javax-annotation.version>1.3.2</javax-annotation.version>
<javax-cache.version>1.1.1</javax-cache.version>
@@ -71,7 +71,7 @@
<maven-gpg-plugin.version>3.2.4</maven-gpg-plugin.version>
<maven-enforcer-plugin.version>3.4.1</maven-enforcer-plugin.version>
<maven-failsafe-plugin.version>2.22.2</maven-failsafe-plugin.version>
<maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version>
<maven-javadoc-plugin.version>3.7.0</maven-javadoc-plugin.version>
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
<maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
<jacoco.version>0.8.12</jacoco.version>
@@ -362,7 +362,7 @@
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>junit-jupiter</artifactId>
<version>1.19.7</version>
<version>1.19.8</version>
<scope>test</scope>
</dependency>
</dependencies>
2 changes: 1 addition & 1 deletion client/pom.xml
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@
<parent>
<groupId>org.ehrbase.openehr.sdk</groupId>
<artifactId>sdk-parent</artifactId>
<version>2.13.0</version>
<version>2.14.0</version>
</parent>

<artifactId>client</artifactId>
2 changes: 1 addition & 1 deletion example-generator/pom.xml
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
<parent>
<artifactId>sdk-parent</artifactId>
<groupId>org.ehrbase.openehr.sdk</groupId>
<version>2.13.0</version>
<version>2.14.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2 changes: 1 addition & 1 deletion generator-commons/pom.xml
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
<parent>
<groupId>org.ehrbase.openehr.sdk</groupId>
<artifactId>sdk-parent</artifactId>
<version>2.13.0</version>
<version>2.14.0</version>
</parent>

<artifactId>generator-commons</artifactId>
8 changes: 4 additions & 4 deletions generator-maven-plugin/pom.xml
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
<parent>
<artifactId>sdk-parent</artifactId>
<groupId>org.ehrbase.openehr.sdk</groupId>
<version>2.13.0</version>
<version>2.14.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

@@ -26,13 +26,13 @@
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
<version>3.12.0</version>
<version>3.13.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>3.9.6</version>
<version>3.9.7</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -47,7 +47,7 @@
<plugins>
<plugin>
<artifactId>maven-plugin-plugin</artifactId>
<version>3.12.0</version>
<version>3.13.1</version>
<configuration>
<goalPrefix>generator</goalPrefix>
</configuration>
2 changes: 1 addition & 1 deletion generator/pom.xml
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@
<parent>
<groupId>org.ehrbase.openehr.sdk</groupId>
<artifactId>sdk-parent</artifactId>
<version>2.13.0</version>
<version>2.14.0</version>
</parent>

<artifactId>generator</artifactId>
2 changes: 1 addition & 1 deletion opt-1.4/pom.xml
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@
<parent>
<groupId>org.ehrbase.openehr.sdk</groupId>
<artifactId>sdk-parent</artifactId>
<version>2.13.0</version>
<version>2.14.0</version>
</parent>

<artifactId>opt-1.4</artifactId>
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -25,13 +25,13 @@
<parent>
<groupId>org.ehrbase.openehr.sdk</groupId>
<artifactId>bom</artifactId>
<version>2.13.0</version>
<version>2.14.0</version>
<relativePath>./bom/pom.xml</relativePath>
</parent>

<groupId>org.ehrbase.openehr.sdk</groupId>
<artifactId>sdk-parent</artifactId>
<version>2.13.0</version>
<version>2.14.0</version>
<packaging>pom</packaging>
<name>openEHR SDK</name>

2 changes: 1 addition & 1 deletion response-dto/pom.xml
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@
<parent>
<groupId>org.ehrbase.openehr.sdk</groupId>
<artifactId>sdk-parent</artifactId>
<version>2.13.0</version>
<version>2.14.0</version>
</parent>

<artifactId>response-dto</artifactId>
2 changes: 1 addition & 1 deletion serialisation/pom.xml
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@
<parent>
<groupId>org.ehrbase.openehr.sdk</groupId>
<artifactId>sdk-parent</artifactId>
<version>2.13.0</version>
<version>2.14.0</version>
</parent>

<artifactId>serialisation</artifactId>
2 changes: 1 addition & 1 deletion serialisation_conformance_test/pom.xml
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@
<parent>
<groupId>org.ehrbase.openehr.sdk</groupId>
<artifactId>sdk-parent</artifactId>
<version>2.13.0</version>
<version>2.14.0</version>
</parent>

<artifactId>serialisation_conformance_test</artifactId>
2 changes: 1 addition & 1 deletion terminology/pom.xml
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@
<parent>
<groupId>org.ehrbase.openehr.sdk</groupId>
<artifactId>sdk-parent</artifactId>
<version>2.13.0</version>
<version>2.14.0</version>
</parent>

<artifactId>terminology</artifactId>
2 changes: 1 addition & 1 deletion test-coverage/pom.xml
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@
<parent>
<groupId>org.ehrbase.openehr.sdk</groupId>
<artifactId>sdk-parent</artifactId>
<version>2.13.0</version>
<version>2.14.0</version>
</parent>

<artifactId>test-coverage</artifactId>
2 changes: 1 addition & 1 deletion test-data/pom.xml
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@
<parent>
<groupId>org.ehrbase.openehr.sdk</groupId>
<artifactId>sdk-parent</artifactId>
<version>2.13.0</version>
<version>2.14.0</version>
</parent>

<artifactId>test-data</artifactId>
2 changes: 1 addition & 1 deletion util/pom.xml
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@
<parent>
<groupId>org.ehrbase.openehr.sdk</groupId>
<artifactId>sdk-parent</artifactId>
<version>2.13.0</version>
<version>2.14.0</version>
</parent>

<artifactId>util</artifactId>
2 changes: 1 addition & 1 deletion validation/pom.xml
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@
<parent>
<groupId>org.ehrbase.openehr.sdk</groupId>
<artifactId>sdk-parent</artifactId>
<version>2.13.0</version>
<version>2.14.0</version>
</parent>

<artifactId>validation</artifactId>
2 changes: 1 addition & 1 deletion web-template/pom.xml
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@
<parent>
<groupId>org.ehrbase.openehr.sdk</groupId>
<artifactId>sdk-parent</artifactId>
<version>2.13.0</version>
<version>2.14.0</version>
</parent>

<artifactId>web-template</artifactId>

0 comments on commit bf3730c

Please sign in to comment.