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 diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b1508763..209347d46 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ Note: version releases in the 0.x.y range may introduce breaking changes. +## [1.27.0] + ### Changed + - Bump libraries + ## [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 +[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 1e0404c9a..6275e0601 100644 --- a/aql/pom.xml +++ b/aql/pom.xml @@ -25,7 +25,7 @@ org.ehrbase.openehr.sdk root - 1.26.0 + 1.27.0 aql diff --git a/bom/pom.xml b/bom/pom.xml index a2c2a0aba..cdb63f611 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -8,7 +8,7 @@ bom org.ehrbase.openehr.sdk - 1.26.0 + 1.27.0 pom openEHR SDK @@ -39,10 +39,10 @@ 4.11.1 - 3.0.0 + 3.3.0 3.19.0 3.3.0 - 4.8.138 + 4.8.157 1.5.0 4.4 3.12.0 @@ -51,31 +51,31 @@ 1.10.0 3.9.9 1.12.3 - 31.0.1-jre + 31.1-jre 2.9.0 4.5.13 - 2.14.2 + 2.15.0 1.13.0 1.3.2 1.1.1 2.3.1 - 20220924 + 20230227 2.7.0 1.5.1 5.9.2 - 4.3.1 + 4.11.0 1.7.36 3.1.0 1.6.12 3.0.1 - 3.0.0 + 3.2.1 2.22.2 3.0.1 - 3.3.2 + 3.5.0 3.2.1 3.0.0 - 0.8.8 - 1.6.0 + 0.8.9 + 1.7.2 diff --git a/building/pom.xml b/building/pom.xml index 506f4784e..2b33f6826 100644 --- a/building/pom.xml +++ b/building/pom.xml @@ -25,7 +25,7 @@ org.ehrbase.openehr.sdk root - 1.26.0 + 1.27.0 building diff --git a/client/pom.xml b/client/pom.xml index 45f0b9f7a..b210c6b64 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -26,7 +26,7 @@ org.ehrbase.openehr.sdk root - 1.26.0 + 1.27.0 client @@ -160,7 +160,7 @@ org.springframework spring-core - 5.3.26 + 5.3.27 test diff --git a/example-generator/pom.xml b/example-generator/pom.xml index cf9cde573..c82a50fda 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 4.0.0 diff --git a/generator-maven-plugin/pom.xml b/generator-maven-plugin/pom.xml index 527946bb5..57b1abbee 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 4.0.0 @@ -27,13 +27,13 @@ org.apache.maven.plugin-tools maven-plugin-annotations - 3.6.4 + 3.8.1 provided org.apache.maven maven-plugin-api - 3.8.4 + 3.9.1 provided @@ -48,7 +48,7 @@ maven-plugin-plugin - 3.6.4 + 3.8.1 generator @@ -82,7 +82,7 @@ maven-invoker-plugin - 3.2.2 + 3.5.1 ${project.build.directory}/it false diff --git a/generator/pom.xml b/generator/pom.xml index 7df762d09..00db2c0ed 100644 --- a/generator/pom.xml +++ b/generator/pom.xml @@ -25,7 +25,7 @@ org.ehrbase.openehr.sdk root - 1.26.0 + 1.27.0 generator @@ -62,7 +62,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.1.1 + 3.3.0 diff --git a/opt-1.4/pom.xml b/opt-1.4/pom.xml index d315b4645..5fc9a76c8 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 opt-1.4 diff --git a/pom.xml b/pom.xml index 0d295ecd9..12970fdef 100644 --- a/pom.xml +++ b/pom.xml @@ -25,13 +25,13 @@ org.ehrbase.openehr.sdk bom - 1.26.0 + 1.27.0 ./bom/pom.xml org.ehrbase.openehr.sdk root - 1.26.0 + 1.27.0 pom diff --git a/response-dto/pom.xml b/response-dto/pom.xml index 0ba20349d..a902a7a28 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 response-dto diff --git a/serialisation/pom.xml b/serialisation/pom.xml index adc1acec4..12884c2d8 100644 --- a/serialisation/pom.xml +++ b/serialisation/pom.xml @@ -26,7 +26,7 @@ org.ehrbase.openehr.sdk root - 1.26.0 + 1.27.0 serialisation diff --git a/serialisation_conformance_test/pom.xml b/serialisation_conformance_test/pom.xml index 69b21e5ed..ca52afcda 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 serialisation_conformance_test diff --git a/terminology/pom.xml b/terminology/pom.xml index eb3c005b0..14ebfdabf 100644 --- a/terminology/pom.xml +++ b/terminology/pom.xml @@ -26,7 +26,7 @@ org.ehrbase.openehr.sdk root - 1.26.0 + 1.27.0 terminology diff --git a/test-coverage/pom.xml b/test-coverage/pom.xml index de2b6516b..5011f8374 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 test-coverage diff --git a/test-data/pom.xml b/test-data/pom.xml index 196b60eaa..aed527a3c 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 test-data diff --git a/util/pom.xml b/util/pom.xml index 1a241cbac..dfde3b20f 100644 --- a/util/pom.xml +++ b/util/pom.xml @@ -25,7 +25,7 @@ org.ehrbase.openehr.sdk root - 1.26.0 + 1.27.0 util 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"; diff --git a/validation/pom.xml b/validation/pom.xml index 19c274b56..ad59c11a2 100644 --- a/validation/pom.xml +++ b/validation/pom.xml @@ -24,7 +24,7 @@ org.ehrbase.openehr.sdk root - 1.26.0 + 1.27.0 validation @@ -62,7 +62,6 @@ org.threeten threeten-extra - 1.7.0 org.ehrbase.openehr.sdk diff --git a/web-template/pom.xml b/web-template/pom.xml index a63e7817d..6852768f5 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 web-template 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; }