From 5df82f67f7f125dce82d20c41693ca3a909d4593 Mon Sep 17 00:00:00 2001 From: bot Date: Mon, 3 Apr 2023 10:51:24 +0000 Subject: [PATCH 01/23] updated version to 1.27.0-SNAPSHOT --- CHANGELOG.md | 5 +++++ aql/pom.xml | 2 +- bom/pom.xml | 2 +- building/pom.xml | 2 +- client/pom.xml | 2 +- example-generator/pom.xml | 2 +- generator-maven-plugin/pom.xml | 2 +- generator/pom.xml | 2 +- opt-1.4/pom.xml | 2 +- pom.xml | 4 ++-- response-dto/pom.xml | 2 +- serialisation/pom.xml | 2 +- serialisation_conformance_test/pom.xml | 2 +- terminology/pom.xml | 2 +- test-coverage/pom.xml | 2 +- test-data/pom.xml | 2 +- util/pom.xml | 2 +- validation/pom.xml | 2 +- web-template/pom.xml | 2 +- 19 files changed, 24 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b1508763..8828bb740 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ Note: version releases in the 0.x.y range may introduce breaking changes. +## [unreleased] + ### Added + ### Fixed + ## [1.26.0] ### Added - Added client support for managing folders trough contributions ([#427](https://github.com/ehrbase/openEHR_SDK/pull/427)) @@ -238,3 +242,4 @@ Note: version releases in the 0.x.y range may introduce breaking changes. [1.24.0]: https://github.com/ehrbase/openEHR_SDK/compare/v1.23.0...v1.24.0 [1.25.0]: https://github.com/ehrbase/openEHR_SDK/compare/v1.24.0...v1.25.0 [1.26.0]: https://github.com/ehrbase/openEHR_SDK/compare/v1.25.0...v1.26.0 +[unreleased]: https://github.com/ehrbase/openEHR_SDK/compare/v1.26.0...HEAD diff --git a/aql/pom.xml b/aql/pom.xml index 1e0404c9a..2aa2ac5c2 100644 --- a/aql/pom.xml +++ b/aql/pom.xml @@ -25,7 +25,7 @@ org.ehrbase.openehr.sdk root - 1.26.0 + 1.27.0-SNAPSHOT aql diff --git a/bom/pom.xml b/bom/pom.xml index a2c2a0aba..58b2014a6 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -8,7 +8,7 @@ bom org.ehrbase.openehr.sdk - 1.26.0 + 1.27.0-SNAPSHOT pom openEHR SDK diff --git a/building/pom.xml b/building/pom.xml index 506f4784e..17a241b52 100644 --- a/building/pom.xml +++ b/building/pom.xml @@ -25,7 +25,7 @@ org.ehrbase.openehr.sdk root - 1.26.0 + 1.27.0-SNAPSHOT building diff --git a/client/pom.xml b/client/pom.xml index 45f0b9f7a..89fd6892b 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -26,7 +26,7 @@ org.ehrbase.openehr.sdk root - 1.26.0 + 1.27.0-SNAPSHOT client diff --git a/example-generator/pom.xml b/example-generator/pom.xml index cf9cde573..2634ba4c7 100644 --- a/example-generator/pom.xml +++ b/example-generator/pom.xml @@ -5,7 +5,7 @@ root org.ehrbase.openehr.sdk - 1.26.0 + 1.27.0-SNAPSHOT 4.0.0 diff --git a/generator-maven-plugin/pom.xml b/generator-maven-plugin/pom.xml index 527946bb5..44991e60f 100644 --- a/generator-maven-plugin/pom.xml +++ b/generator-maven-plugin/pom.xml @@ -5,7 +5,7 @@ root org.ehrbase.openehr.sdk - 1.26.0 + 1.27.0-SNAPSHOT 4.0.0 diff --git a/generator/pom.xml b/generator/pom.xml index 7df762d09..ce63db6bb 100644 --- a/generator/pom.xml +++ b/generator/pom.xml @@ -25,7 +25,7 @@ org.ehrbase.openehr.sdk root - 1.26.0 + 1.27.0-SNAPSHOT generator diff --git a/opt-1.4/pom.xml b/opt-1.4/pom.xml index d315b4645..e76180fa9 100644 --- a/opt-1.4/pom.xml +++ b/opt-1.4/pom.xml @@ -26,7 +26,7 @@ org.ehrbase.openehr.sdk root - 1.26.0 + 1.27.0-SNAPSHOT opt-1.4 diff --git a/pom.xml b/pom.xml index 0d295ecd9..d0c28dde9 100644 --- a/pom.xml +++ b/pom.xml @@ -25,13 +25,13 @@ org.ehrbase.openehr.sdk bom - 1.26.0 + 1.27.0-SNAPSHOT ./bom/pom.xml org.ehrbase.openehr.sdk root - 1.26.0 + 1.27.0-SNAPSHOT pom diff --git a/response-dto/pom.xml b/response-dto/pom.xml index 0ba20349d..6947fe449 100644 --- a/response-dto/pom.xml +++ b/response-dto/pom.xml @@ -26,7 +26,7 @@ org.ehrbase.openehr.sdk root - 1.26.0 + 1.27.0-SNAPSHOT response-dto diff --git a/serialisation/pom.xml b/serialisation/pom.xml index adc1acec4..51c68cca9 100644 --- a/serialisation/pom.xml +++ b/serialisation/pom.xml @@ -26,7 +26,7 @@ org.ehrbase.openehr.sdk root - 1.26.0 + 1.27.0-SNAPSHOT serialisation diff --git a/serialisation_conformance_test/pom.xml b/serialisation_conformance_test/pom.xml index 69b21e5ed..9e75f8295 100644 --- a/serialisation_conformance_test/pom.xml +++ b/serialisation_conformance_test/pom.xml @@ -26,7 +26,7 @@ org.ehrbase.openehr.sdk root - 1.26.0 + 1.27.0-SNAPSHOT serialisation_conformance_test diff --git a/terminology/pom.xml b/terminology/pom.xml index eb3c005b0..9ee858ae4 100644 --- a/terminology/pom.xml +++ b/terminology/pom.xml @@ -26,7 +26,7 @@ org.ehrbase.openehr.sdk root - 1.26.0 + 1.27.0-SNAPSHOT terminology diff --git a/test-coverage/pom.xml b/test-coverage/pom.xml index de2b6516b..30c562aca 100644 --- a/test-coverage/pom.xml +++ b/test-coverage/pom.xml @@ -8,7 +8,7 @@ org.ehrbase.openehr.sdk root - 1.26.0 + 1.27.0-SNAPSHOT test-coverage diff --git a/test-data/pom.xml b/test-data/pom.xml index 196b60eaa..d2ddff20b 100644 --- a/test-data/pom.xml +++ b/test-data/pom.xml @@ -26,7 +26,7 @@ org.ehrbase.openehr.sdk root - 1.26.0 + 1.27.0-SNAPSHOT test-data diff --git a/util/pom.xml b/util/pom.xml index 1a241cbac..cd717b943 100644 --- a/util/pom.xml +++ b/util/pom.xml @@ -25,7 +25,7 @@ org.ehrbase.openehr.sdk root - 1.26.0 + 1.27.0-SNAPSHOT util diff --git a/validation/pom.xml b/validation/pom.xml index 19c274b56..c3eafc11a 100644 --- a/validation/pom.xml +++ b/validation/pom.xml @@ -24,7 +24,7 @@ org.ehrbase.openehr.sdk root - 1.26.0 + 1.27.0-SNAPSHOT validation diff --git a/web-template/pom.xml b/web-template/pom.xml index a63e7817d..a94b9f52a 100644 --- a/web-template/pom.xml +++ b/web-template/pom.xml @@ -25,7 +25,7 @@ org.ehrbase.openehr.sdk root - 1.26.0 + 1.27.0-SNAPSHOT web-template From 6e1d46ef2622c8c44e979604e36627ddb8a8f91a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 4 Apr 2023 08:11:54 +0200 Subject: [PATCH 02/23] Bump maven-enforcer-plugin from 3.0.0 to 3.2.1 (#441) Bumps [maven-enforcer-plugin](https://github.com/apache/maven-enforcer) from 3.0.0 to 3.2.1. - [Release notes](https://github.com/apache/maven-enforcer/releases) - [Commits](https://github.com/apache/maven-enforcer/compare/enforcer-3.0.0...enforcer-3.2.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-enforcer-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index 58b2014a6..81d171759 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -68,7 +68,7 @@ 3.1.0 1.6.12 3.0.1 - 3.0.0 + 3.2.1 2.22.2 3.0.1 3.3.2 From 6e3cd33c4746429d2a87b26d8879ac9552455804 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 4 Apr 2023 08:12:02 +0200 Subject: [PATCH 03/23] Bump jacoco-maven-plugin from 0.8.8 to 0.8.9 (#439) Bumps [jacoco-maven-plugin](https://github.com/jacoco/jacoco) from 0.8.8 to 0.8.9. - [Release notes](https://github.com/jacoco/jacoco/releases) - [Commits](https://github.com/jacoco/jacoco/compare/v0.8.8...v0.8.9) --- updated-dependencies: - dependency-name: org.jacoco:jacoco-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index 81d171759..f2c9563e8 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -74,7 +74,7 @@ 3.3.2 3.2.1 3.0.0 - 0.8.8 + 0.8.9 1.6.0 From e693e9409f883431ac67945c93fceb085876bca4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 4 Apr 2023 08:12:14 +0200 Subject: [PATCH 04/23] Bump classgraph from 4.8.138 to 4.8.157 (#438) Bumps [classgraph](https://github.com/classgraph/classgraph) from 4.8.138 to 4.8.157. - [Release notes](https://github.com/classgraph/classgraph/releases) - [Commits](https://github.com/classgraph/classgraph/compare/classgraph-4.8.138...classgraph-4.8.157) --- updated-dependencies: - dependency-name: io.github.classgraph:classgraph dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index f2c9563e8..df7d9281c 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -42,7 +42,7 @@ 3.0.0 3.19.0 3.3.0 - 4.8.138 + 4.8.157 1.5.0 4.4 3.12.0 From 0184717c22d1a490a179a89607de6a63b8d8d54a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 4 Apr 2023 08:12:29 +0200 Subject: [PATCH 05/23] Bump maven-plugin-plugin from 3.6.4 to 3.8.1 (#440) Bumps [maven-plugin-plugin](https://github.com/apache/maven-plugin-tools) from 3.6.4 to 3.8.1. - [Release notes](https://github.com/apache/maven-plugin-tools/releases) - [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.6.4...maven-plugin-tools-3.8.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-plugin-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- generator-maven-plugin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generator-maven-plugin/pom.xml b/generator-maven-plugin/pom.xml index 44991e60f..447c459de 100644 --- a/generator-maven-plugin/pom.xml +++ b/generator-maven-plugin/pom.xml @@ -48,7 +48,7 @@ maven-plugin-plugin - 3.6.4 + 3.8.1 generator From bf82c8c2ef9e3174ae29735affea44cd2b46d419 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Apr 2023 08:09:03 +0200 Subject: [PATCH 06/23] Bump maven-invoker-plugin from 3.2.2 to 3.5.1 (#443) Bumps [maven-invoker-plugin](https://github.com/apache/maven-invoker-plugin) from 3.2.2 to 3.5.1. - [Release notes](https://github.com/apache/maven-invoker-plugin/releases) - [Commits](https://github.com/apache/maven-invoker-plugin/compare/maven-invoker-plugin-3.2.2...maven-invoker-plugin-3.5.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-invoker-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- generator-maven-plugin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generator-maven-plugin/pom.xml b/generator-maven-plugin/pom.xml index 447c459de..9aa9390fb 100644 --- a/generator-maven-plugin/pom.xml +++ b/generator-maven-plugin/pom.xml @@ -82,7 +82,7 @@ maven-invoker-plugin - 3.2.2 + 3.5.1 ${project.build.directory}/it false From a9e7a032c6d32653ae640a99d3dbd0c0319b6c23 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Apr 2023 09:16:23 +0200 Subject: [PATCH 07/23] Bump threeten-extra from 1.6.0 to 1.7.2 (#445) * Bump threeten-extra from 1.6.0 to 1.7.2 Bumps [threeten-extra](https://github.com/ThreeTen/threeten-extra) from 1.6.0 to 1.7.2. - [Release notes](https://github.com/ThreeTen/threeten-extra/releases) - [Commits](https://github.com/ThreeTen/threeten-extra/compare/v1.6.0...v1.7.2) --- updated-dependencies: - dependency-name: org.threeten:threeten-extra dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * remove explizit version --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: stefanspiska --- bom/pom.xml | 2 +- validation/pom.xml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/bom/pom.xml b/bom/pom.xml index df7d9281c..104d180be 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -75,7 +75,7 @@ 3.2.1 3.0.0 0.8.9 - 1.6.0 + 1.7.2 diff --git a/validation/pom.xml b/validation/pom.xml index c3eafc11a..a2b7aa3b3 100644 --- a/validation/pom.xml +++ b/validation/pom.xml @@ -62,7 +62,6 @@ org.threeten threeten-extra - 1.7.0 org.ehrbase.openehr.sdk From fe1c45b8885bd240fa05693544b0800d8f6842e7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Apr 2023 09:31:17 +0200 Subject: [PATCH 08/23] Bump maven-plugin-api from 3.8.4 to 3.9.1 (#442) Bumps [maven-plugin-api](https://github.com/apache/maven) from 3.8.4 to 3.9.1. - [Release notes](https://github.com/apache/maven/releases) - [Commits](https://github.com/apache/maven/compare/maven-3.8.4...maven-3.9.1) --- updated-dependencies: - dependency-name: org.apache.maven:maven-plugin-api dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- generator-maven-plugin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generator-maven-plugin/pom.xml b/generator-maven-plugin/pom.xml index 9aa9390fb..d14b679dc 100644 --- a/generator-maven-plugin/pom.xml +++ b/generator-maven-plugin/pom.xml @@ -33,7 +33,7 @@ org.apache.maven maven-plugin-api - 3.8.4 + 3.9.1 provided From f6a6ee3bd2d551d8345520cb6c7cdd912be146ca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 14 Apr 2023 20:56:52 +0200 Subject: [PATCH 09/23] Bump json from 20220924 to 20230227 in /bom (#446) Bumps [json](https://github.com/douglascrockford/JSON-java) from 20220924 to 20230227. - [Release notes](https://github.com/douglascrockford/JSON-java/releases) - [Changelog](https://github.com/stleary/JSON-java/blob/master/docs/RELEASES.md) - [Commits](https://github.com/douglascrockford/JSON-java/commits) --- updated-dependencies: - dependency-name: org.json:json dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index 104d180be..b2546cfb9 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -59,7 +59,7 @@ 1.3.2 1.1.1 2.3.1 - 20220924 + 20230227 2.7.0 1.5.1 5.9.2 From 14b12da0872a1677e3f57c39f12899e7dad68dc1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 18 Apr 2023 09:31:51 +0200 Subject: [PATCH 10/23] Bump maven-plugin-annotations from 3.6.4 to 3.8.1 (#448) Bumps [maven-plugin-annotations](https://github.com/apache/maven-plugin-tools) from 3.6.4 to 3.8.1. - [Release notes](https://github.com/apache/maven-plugin-tools/releases) - [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.6.4...maven-plugin-tools-3.8.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugin-tools:maven-plugin-annotations dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- generator-maven-plugin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generator-maven-plugin/pom.xml b/generator-maven-plugin/pom.xml index d14b679dc..a9cda6178 100644 --- a/generator-maven-plugin/pom.xml +++ b/generator-maven-plugin/pom.xml @@ -27,7 +27,7 @@ org.apache.maven.plugin-tools maven-plugin-annotations - 3.6.4 + 3.8.1 provided From fe68dfe46f92e771b749514786d5d6840d9bb6c3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 18 Apr 2023 09:32:08 +0200 Subject: [PATCH 11/23] Bump mockito-core from 4.3.1 to 4.11.0 (#449) Bumps [mockito-core](https://github.com/mockito/mockito) from 4.3.1 to 4.11.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.3.1...v4.11.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index b2546cfb9..ee74ba03e 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -63,7 +63,7 @@ 2.7.0 1.5.1 5.9.2 - 4.3.1 + 4.11.0 1.7.36 3.1.0 1.6.12 From 896c32cbd3afec893c6835e76cd6ca878bdffd01 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 18 Apr 2023 09:32:22 +0200 Subject: [PATCH 12/23] Bump spring-core from 5.3.26 to 5.3.27 in /client (#447) Bumps [spring-core](https://github.com/spring-projects/spring-framework) from 5.3.26 to 5.3.27. - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.26...v5.3.27) --- updated-dependencies: - dependency-name: org.springframework:spring-core dependency-type: direct:development ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- client/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/pom.xml b/client/pom.xml index 89fd6892b..837a1a643 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -160,7 +160,7 @@ org.springframework spring-core - 5.3.26 + 5.3.27 test From 897f955c50e3d57019161e861d9f1f8502b96771 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 18 Apr 2023 09:32:36 +0200 Subject: [PATCH 13/23] Bump maven-javadoc-plugin from 3.3.2 to 3.5.0 (#450) Bumps [maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.3.2 to 3.5.0. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.3.2...maven-javadoc-plugin-3.5.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index ee74ba03e..aaba0b495 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -71,7 +71,7 @@ 3.2.1 2.22.2 3.0.1 - 3.3.2 + 3.5.0 3.2.1 3.0.0 0.8.9 From e2069ae6af0144b9d89e51bfeb6c9cc5a1887d77 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 18 Apr 2023 14:03:58 +0300 Subject: [PATCH 14/23] Add CodeQL GitHub action (#451) --- .github/workflows/codeql.yml | 76 ++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 .github/workflows/codeql.yml diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml new file mode 100644 index 000000000..a79104203 --- /dev/null +++ b/.github/workflows/codeql.yml @@ -0,0 +1,76 @@ +# For most projects, this workflow file will not need changing; you simply need +# to commit it to your repository. +# +# You may wish to alter this file to override the set of languages analyzed, +# or to provide custom queries or build logic. +# +# ******** NOTE ******** +# We have attempted to detect the languages in your repository. Please check +# the `language` matrix defined below to confirm you have the correct set of +# supported CodeQL languages. +# +name: "CodeQL" + +on: + push: + branches: [ "develop" ] + pull_request: + # The branches below must be a subset of the branches above + branches: [ "develop" ] + schedule: + - cron: '43 18 * * 1' + +jobs: + analyze: + name: Analyze + runs-on: ubuntu-latest + permissions: + actions: read + contents: read + security-events: write + + strategy: + fail-fast: false + matrix: + language: [ 'java' ] + # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ] + # Use only 'java' to analyze code written in Java, Kotlin or both + # Use only 'javascript' to analyze code written in JavaScript, TypeScript or both + # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v2 + with: + languages: ${{ matrix.language }} + # If you wish to specify custom queries, you can do so here or in a config file. + # By default, queries listed here will override any specified in a config file. + # Prefix the list here with "+" to use these queries and those in the config file. + + # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs + # queries: security-extended,security-and-quality + + + # Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java). + # If this step fails, then you should remove it and run the build manually (see below) + - name: Autobuild + uses: github/codeql-action/autobuild@v2 + + # ℹī¸ Command-line programs to run using the OS shell. + # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun + + # If the Autobuild fails above, remove it and uncomment the following three lines. + # modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance. + + # - run: | + # echo "Run, Build Application using script" + # ./location_of_script_within_repo/buildscript.sh + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v2 + with: + category: "/language:${{matrix.language}}" \ No newline at end of file From 9b80d86c371120987c2e8b78822afb5f386c5188 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 25 Apr 2023 07:10:13 +0200 Subject: [PATCH 15/23] Bump archie.version from 3.0.0 to 3.2.0 (#453) Bumps `archie.version` from 3.0.0 to 3.2.0. Updates `archie-utils` from 3.0.0 to 3.2.0 - [Release notes](https://github.com/openEHR/archie/releases) - [Commits](https://github.com/openEHR/archie/compare/v3.0.0...v3.2.0) Updates `openehr-rm` from 3.0.0 to 3.2.0 - [Release notes](https://github.com/openEHR/archie/releases) - [Commits](https://github.com/openEHR/archie/compare/v3.0.0...v3.2.0) Updates `test-rm` from 3.0.0 to 3.2.0 - [Release notes](https://github.com/openEHR/archie/releases) - [Commits](https://github.com/openEHR/archie/compare/v3.0.0...v3.2.0) Updates `tools` from 3.0.0 to 3.2.0 - [Release notes](https://github.com/openEHR/archie/releases) - [Commits](https://github.com/openEHR/archie/compare/v3.0.0...v3.2.0) --- updated-dependencies: - dependency-name: com.nedap.healthcare.archie:archie-utils dependency-type: direct:development update-type: version-update:semver-minor - dependency-name: com.nedap.healthcare.archie:openehr-rm dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.nedap.healthcare.archie:test-rm dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.nedap.healthcare.archie:tools dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index aaba0b495..62c3b505c 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -39,7 +39,7 @@ 4.11.1 - 3.0.0 + 3.2.0 3.19.0 3.3.0 4.8.157 From be9047ab9e7cd18c7986ef1167a897400ccac47e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 25 Apr 2023 07:11:31 +0200 Subject: [PATCH 16/23] Bump jackson-bom from 2.14.2 to 2.15.0 (#454) Bumps [jackson-bom](https://github.com/FasterXML/jackson-bom) from 2.14.2 to 2.15.0. - [Release notes](https://github.com/FasterXML/jackson-bom/releases) - [Commits](https://github.com/FasterXML/jackson-bom/compare/jackson-bom-2.14.2...jackson-bom-2.15.0) --- updated-dependencies: - dependency-name: com.fasterxml.jackson:jackson-bom dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index 62c3b505c..4bc65dc39 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -54,7 +54,7 @@ 31.0.1-jre 2.9.0 4.5.13 - 2.14.2 + 2.15.0 1.13.0 1.3.2 1.1.1 From 7cc42b000cb24f6a64b8986bf88f7e25af72a12d Mon Sep 17 00:00:00 2001 From: "vinzenz.mueller" Date: Wed, 3 May 2023 12:47:25 +0200 Subject: [PATCH 17/23] Bump aarchie to 3.3.0 as 3.2.0 contains sever issues --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index 4bc65dc39..7545c1b1b 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -39,7 +39,7 @@ 4.11.1 - 3.2.0 + 3.3.0 3.19.0 3.3.0 4.8.157 From 9ef4bae6c0c3e9baf40c941108850e12193c636a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 May 2023 15:04:58 +0200 Subject: [PATCH 18/23] Bump maven-jar-plugin from 3.1.1 to 3.3.0 (#457) Bumps [maven-jar-plugin](https://github.com/apache/maven-jar-plugin) from 3.1.1 to 3.3.0. - [Release notes](https://github.com/apache/maven-jar-plugin/releases) - [Commits](https://github.com/apache/maven-jar-plugin/compare/maven-jar-plugin-3.1.1...maven-jar-plugin-3.3.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-jar-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- generator/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generator/pom.xml b/generator/pom.xml index ce63db6bb..7e66ad1da 100644 --- a/generator/pom.xml +++ b/generator/pom.xml @@ -62,7 +62,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.1.1 + 3.3.0 From 6a4c95c8f9a2186ed42e8e052dc399f35874ae4f Mon Sep 17 00:00:00 2001 From: "vinzenz.mueller" Date: Wed, 10 May 2023 20:26:57 +0200 Subject: [PATCH 19/23] Add RmConstants.EHR --- util/src/main/java/org/ehrbase/util/rmconstants/RmConstants.java | 1 + 1 file changed, 1 insertion(+) diff --git a/util/src/main/java/org/ehrbase/util/rmconstants/RmConstants.java b/util/src/main/java/org/ehrbase/util/rmconstants/RmConstants.java index de108ab53..176b7df1d 100644 --- a/util/src/main/java/org/ehrbase/util/rmconstants/RmConstants.java +++ b/util/src/main/java/org/ehrbase/util/rmconstants/RmConstants.java @@ -36,6 +36,7 @@ private RmConstants() {} public static final String RM_OBJECT = "RM_OBJECT"; + public static final String EHR = "EHR"; public static final String COMPOSITION = "COMPOSITION"; public static final String SECTION = "SECTION"; public static final String OBSERVATION = "OBSERVATION"; From 1b942849e93838ff8832882af902013f7b484a3d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 May 2023 08:14:01 +0200 Subject: [PATCH 20/23] Bump guava from 31.0.1-jre to 31.1-jre (#460) Bumps [guava](https://github.com/google/guava) from 31.0.1-jre to 31.1-jre. - [Release notes](https://github.com/google/guava/releases) - [Commits](https://github.com/google/guava/commits) --- updated-dependencies: - dependency-name: com.google.guava:guava dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index 7545c1b1b..9698380e7 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -51,7 +51,7 @@ 1.10.0 3.9.9 1.12.3 - 31.0.1-jre + 31.1-jre 2.9.0 4.5.13 2.15.0 From 7153028a88618f103e5592cb8edf5bcc7b5263b3 Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 18 May 2023 13:41:01 +0300 Subject: [PATCH 21/23] Update CHANGELOG.md Added changelog --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8828bb740..80e84e657 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,8 +3,8 @@ Note: version releases in the 0.x.y range may introduce breaking changes. ## [unreleased] - ### Added - ### Fixed + ### Changed + - Bump libraries ## [1.26.0] ### Added From 03dfd7aac3a53004dd9b1336eb3880616a3b57c6 Mon Sep 17 00:00:00 2001 From: HolgerReiseVSys <61463838+HolgerReiseVSys@users.noreply.github.com> Date: Mon, 22 May 2023 11:11:37 +0200 Subject: [PATCH 22/23] performance improvement WebTemplateNode::findMatching (#459) --- .../org/ehrbase/webtemplate/model/WebTemplateNode.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/web-template/src/main/java/org/ehrbase/webtemplate/model/WebTemplateNode.java b/web-template/src/main/java/org/ehrbase/webtemplate/model/WebTemplateNode.java index 397767865..7453a0d9e 100644 --- a/web-template/src/main/java/org/ehrbase/webtemplate/model/WebTemplateNode.java +++ b/web-template/src/main/java/org/ehrbase/webtemplate/model/WebTemplateNode.java @@ -285,14 +285,14 @@ public boolean isRelativePathNameDependent(WebTemplateNode child) { } public List findMatching(Predicate filter) { + return streamMatching(filter).collect(Collectors.toList()); + } - List matching = children.stream() - .map(c -> c.findMatching(filter)) - .flatMap(List::stream) - .collect(Collectors.toList()); + public Stream streamMatching(Predicate filter) { + Stream matching = children.stream().flatMap(c -> c.streamMatching(filter)); if (filter.test(this)) { - matching.add(this); + matching = Stream.concat(matching, Stream.of(this)); } return matching; } From 545c6b64bc2a5afe46df49c1183f89a42393c2c0 Mon Sep 17 00:00:00 2001 From: bot Date: Mon, 22 May 2023 10:09:13 +0000 Subject: [PATCH 23/23] release 1.27.0: updated version to 1.27.0 --- CHANGELOG.md | 4 ++-- aql/pom.xml | 2 +- bom/pom.xml | 2 +- building/pom.xml | 2 +- client/pom.xml | 2 +- example-generator/pom.xml | 2 +- generator-maven-plugin/pom.xml | 2 +- generator/pom.xml | 2 +- opt-1.4/pom.xml | 2 +- pom.xml | 4 ++-- response-dto/pom.xml | 2 +- serialisation/pom.xml | 2 +- serialisation_conformance_test/pom.xml | 2 +- terminology/pom.xml | 2 +- test-coverage/pom.xml | 2 +- test-data/pom.xml | 2 +- util/pom.xml | 2 +- validation/pom.xml | 2 +- web-template/pom.xml | 2 +- 19 files changed, 21 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 80e84e657..209347d46 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ Note: version releases in the 0.x.y range may introduce breaking changes. -## [unreleased] +## [1.27.0] ### Changed - Bump libraries @@ -242,4 +242,4 @@ Note: version releases in the 0.x.y range may introduce breaking changes. [1.24.0]: https://github.com/ehrbase/openEHR_SDK/compare/v1.23.0...v1.24.0 [1.25.0]: https://github.com/ehrbase/openEHR_SDK/compare/v1.24.0...v1.25.0 [1.26.0]: https://github.com/ehrbase/openEHR_SDK/compare/v1.25.0...v1.26.0 -[unreleased]: https://github.com/ehrbase/openEHR_SDK/compare/v1.26.0...HEAD +[1.27.0]: https://github.com/ehrbase/openEHR_SDK/compare/v1.26.0...v1.27.0 diff --git a/aql/pom.xml b/aql/pom.xml index 2aa2ac5c2..6275e0601 100644 --- a/aql/pom.xml +++ b/aql/pom.xml @@ -25,7 +25,7 @@ org.ehrbase.openehr.sdk root - 1.27.0-SNAPSHOT + 1.27.0 aql diff --git a/bom/pom.xml b/bom/pom.xml index 9698380e7..cdb63f611 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -8,7 +8,7 @@ bom org.ehrbase.openehr.sdk - 1.27.0-SNAPSHOT + 1.27.0 pom openEHR SDK diff --git a/building/pom.xml b/building/pom.xml index 17a241b52..2b33f6826 100644 --- a/building/pom.xml +++ b/building/pom.xml @@ -25,7 +25,7 @@ org.ehrbase.openehr.sdk root - 1.27.0-SNAPSHOT + 1.27.0 building diff --git a/client/pom.xml b/client/pom.xml index 837a1a643..b210c6b64 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -26,7 +26,7 @@ org.ehrbase.openehr.sdk root - 1.27.0-SNAPSHOT + 1.27.0 client diff --git a/example-generator/pom.xml b/example-generator/pom.xml index 2634ba4c7..c82a50fda 100644 --- a/example-generator/pom.xml +++ b/example-generator/pom.xml @@ -5,7 +5,7 @@ root org.ehrbase.openehr.sdk - 1.27.0-SNAPSHOT + 1.27.0 4.0.0 diff --git a/generator-maven-plugin/pom.xml b/generator-maven-plugin/pom.xml index a9cda6178..57b1abbee 100644 --- a/generator-maven-plugin/pom.xml +++ b/generator-maven-plugin/pom.xml @@ -5,7 +5,7 @@ root org.ehrbase.openehr.sdk - 1.27.0-SNAPSHOT + 1.27.0 4.0.0 diff --git a/generator/pom.xml b/generator/pom.xml index 7e66ad1da..00db2c0ed 100644 --- a/generator/pom.xml +++ b/generator/pom.xml @@ -25,7 +25,7 @@ org.ehrbase.openehr.sdk root - 1.27.0-SNAPSHOT + 1.27.0 generator diff --git a/opt-1.4/pom.xml b/opt-1.4/pom.xml index e76180fa9..5fc9a76c8 100644 --- a/opt-1.4/pom.xml +++ b/opt-1.4/pom.xml @@ -26,7 +26,7 @@ org.ehrbase.openehr.sdk root - 1.27.0-SNAPSHOT + 1.27.0 opt-1.4 diff --git a/pom.xml b/pom.xml index d0c28dde9..12970fdef 100644 --- a/pom.xml +++ b/pom.xml @@ -25,13 +25,13 @@ org.ehrbase.openehr.sdk bom - 1.27.0-SNAPSHOT + 1.27.0 ./bom/pom.xml org.ehrbase.openehr.sdk root - 1.27.0-SNAPSHOT + 1.27.0 pom diff --git a/response-dto/pom.xml b/response-dto/pom.xml index 6947fe449..a902a7a28 100644 --- a/response-dto/pom.xml +++ b/response-dto/pom.xml @@ -26,7 +26,7 @@ org.ehrbase.openehr.sdk root - 1.27.0-SNAPSHOT + 1.27.0 response-dto diff --git a/serialisation/pom.xml b/serialisation/pom.xml index 51c68cca9..12884c2d8 100644 --- a/serialisation/pom.xml +++ b/serialisation/pom.xml @@ -26,7 +26,7 @@ org.ehrbase.openehr.sdk root - 1.27.0-SNAPSHOT + 1.27.0 serialisation diff --git a/serialisation_conformance_test/pom.xml b/serialisation_conformance_test/pom.xml index 9e75f8295..ca52afcda 100644 --- a/serialisation_conformance_test/pom.xml +++ b/serialisation_conformance_test/pom.xml @@ -26,7 +26,7 @@ org.ehrbase.openehr.sdk root - 1.27.0-SNAPSHOT + 1.27.0 serialisation_conformance_test diff --git a/terminology/pom.xml b/terminology/pom.xml index 9ee858ae4..14ebfdabf 100644 --- a/terminology/pom.xml +++ b/terminology/pom.xml @@ -26,7 +26,7 @@ org.ehrbase.openehr.sdk root - 1.27.0-SNAPSHOT + 1.27.0 terminology diff --git a/test-coverage/pom.xml b/test-coverage/pom.xml index 30c562aca..5011f8374 100644 --- a/test-coverage/pom.xml +++ b/test-coverage/pom.xml @@ -8,7 +8,7 @@ org.ehrbase.openehr.sdk root - 1.27.0-SNAPSHOT + 1.27.0 test-coverage diff --git a/test-data/pom.xml b/test-data/pom.xml index d2ddff20b..aed527a3c 100644 --- a/test-data/pom.xml +++ b/test-data/pom.xml @@ -26,7 +26,7 @@ org.ehrbase.openehr.sdk root - 1.27.0-SNAPSHOT + 1.27.0 test-data diff --git a/util/pom.xml b/util/pom.xml index cd717b943..dfde3b20f 100644 --- a/util/pom.xml +++ b/util/pom.xml @@ -25,7 +25,7 @@ org.ehrbase.openehr.sdk root - 1.27.0-SNAPSHOT + 1.27.0 util diff --git a/validation/pom.xml b/validation/pom.xml index a2b7aa3b3..ad59c11a2 100644 --- a/validation/pom.xml +++ b/validation/pom.xml @@ -24,7 +24,7 @@ org.ehrbase.openehr.sdk root - 1.27.0-SNAPSHOT + 1.27.0 validation diff --git a/web-template/pom.xml b/web-template/pom.xml index a94b9f52a..6852768f5 100644 --- a/web-template/pom.xml +++ b/web-template/pom.xml @@ -25,7 +25,7 @@ org.ehrbase.openehr.sdk root - 1.27.0-SNAPSHOT + 1.27.0 web-template