Merge branch 'release/v1.27.0'

.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}}"

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

aql/pom.xml

@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>root</artifactId>
-        <version>1.26.0</version>
+        <version>1.27.0</version>
     </parent>
 
     <artifactId>aql</artifactId>

bom/pom.xml

@@ -8,7 +8,7 @@
 
     <artifactId>bom</artifactId>
     <groupId>org.ehrbase.openehr.sdk</groupId>
-    <version>1.26.0</version>
+    <version>1.27.0</version>
     <packaging>pom</packaging>
 
     <name>openEHR SDK</name>
@@ -39,10 +39,10 @@
 
     <properties>
         <antlr4.version>4.11.1</antlr4.version>
-        <archie.version>3.0.0</archie.version>
+        <archie.version>3.3.0</archie.version>
         <assertj.version>3.19.0</assertj.version>
         <cglib.version>3.3.0</cglib.version>
-        <classgraph.version>4.8.138</classgraph.version>
+        <classgraph.version>4.8.157</classgraph.version>
         <commons-cli.version>1.5.0</commons-cli.version>
         <commons-collections4.version>4.4</commons-collections4.version>
         <commons-lang3.version>3.12.0</commons-lang3.version>
@@ -51,31 +51,31 @@
         <commons-text.version>1.10.0</commons-text.version>
         <ehcache.version>3.9.9</ehcache.version>
         <everit-json-schema.version>1.12.3</everit-json-schema.version>
-        <guava.version>31.0.1-jre</guava.version>
+        <guava.version>31.1-jre</guava.version>
         <gson.version>2.9.0</gson.version>
         <httpclient.version>4.5.13</httpclient.version>
-        <jackson-bom.version>2.14.2</jackson-bom.version>
+        <jackson-bom.version>2.15.0</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>
         <javax-jaxb.version>2.3.1</javax-jaxb.version>
-        <json.version>20220924</json.version>
+        <json.version>20230227</json.version>
         <json-path.version>2.7.0</json-path.version>
         <jsonassert.version>1.5.1</jsonassert.version>
         <junit.version>5.9.2</junit.version>
-        <mockito.version>4.3.1</mockito.version>
+        <mockito.version>4.11.0</mockito.version>
         <slf4j.version>1.7.36</slf4j.version>
         <xmlbeans.version>3.1.0</xmlbeans.version>
         <nexus-staging-maven-plugin.version>1.6.12</nexus-staging-maven-plugin.version>
         <maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
-        <maven-enforcer-plugin.version>3.0.0</maven-enforcer-plugin.version>
+        <maven-enforcer-plugin.version>3.2.1</maven-enforcer-plugin.version>
         <maven-failsafe-plugin.version>2.22.2</maven-failsafe-plugin.version>
         <maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
-        <maven-javadoc-plugin.version>3.3.2</maven-javadoc-plugin.version>
+        <maven-javadoc-plugin.version>3.5.0</maven-javadoc-plugin.version>
         <maven-source-plugin.version>3.2.1</maven-source-plugin.version>
         <maven-surefire-plugin.version>3.0.0</maven-surefire-plugin.version>
-        <jacoco.version>0.8.8</jacoco.version>
-        <threeten-extra.version>1.6.0</threeten-extra.version>
+        <jacoco.version>0.8.9</jacoco.version>
+        <threeten-extra.version>1.7.2</threeten-extra.version>
     </properties>
 
     <distributionManagement>

building/pom.xml

@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>root</artifactId>
-        <version>1.26.0</version>
+        <version>1.27.0</version>
     </parent>
 
     <artifactId>building</artifactId>

client/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>root</artifactId>
-        <version>1.26.0</version>
+        <version>1.27.0</version>
     </parent>
 
     <artifactId>client</artifactId>
@@ -160,7 +160,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
-            <version>5.3.26</version>
+            <version>5.3.27</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

example-generator/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>root</artifactId>
         <groupId>org.ehrbase.openehr.sdk</groupId>
-        <version>1.26.0</version>
+        <version>1.27.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

generator-maven-plugin/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <artifactId>root</artifactId>
     <groupId>org.ehrbase.openehr.sdk</groupId>
-    <version>1.26.0</version>
+    <version>1.27.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -27,13 +27,13 @@
     <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>
       <artifactId>maven-plugin-annotations</artifactId>
-      <version>3.6.4</version>
+      <version>3.8.1</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>3.8.4</version>
+      <version>3.9.1</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -48,7 +48,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-plugin-plugin</artifactId>
-        <version>3.6.4</version>
+        <version>3.8.1</version>
         <configuration>
           <goalPrefix>generator</goalPrefix>
         </configuration>
@@ -82,7 +82,7 @@
         <plugins>
           <plugin>
             <artifactId>maven-invoker-plugin</artifactId>
-            <version>3.2.2</version>
+            <version>3.5.1</version>
             <configuration>
               <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
               <debug>false</debug>

generator/pom.xml

@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>root</artifactId>
-        <version>1.26.0</version>
+        <version>1.27.0</version>
     </parent>
 
     <artifactId>generator</artifactId>
@@ -62,7 +62,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.1.1</version>
+                <version>3.3.0</version>
                 <configuration>
                     <archive>
                         <manifest>

opt-1.4/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>root</artifactId>
-        <version>1.26.0</version>
+        <version>1.27.0</version>
     </parent>
 
     <artifactId>opt-1.4</artifactId>

pom.xml

@@ -25,13 +25,13 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>bom</artifactId>
-        <version>1.26.0</version>
+        <version>1.27.0</version>
         <relativePath>./bom/pom.xml</relativePath>
     </parent>
 
     <groupId>org.ehrbase.openehr.sdk</groupId>
     <artifactId>root</artifactId>
-    <version>1.26.0</version>
+    <version>1.27.0</version>
     <packaging>pom</packaging>
 
 

response-dto/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>root</artifactId>
-        <version>1.26.0</version>
+        <version>1.27.0</version>
     </parent>
 
     <artifactId>response-dto</artifactId>

serialisation/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>root</artifactId>
-        <version>1.26.0</version>
+        <version>1.27.0</version>
     </parent>
 
     <artifactId>serialisation</artifactId>

serialisation_conformance_test/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>root</artifactId>
-        <version>1.26.0</version>
+        <version>1.27.0</version>
     </parent>
 
     <artifactId>serialisation_conformance_test</artifactId>

terminology/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>root</artifactId>
-        <version>1.26.0</version>
+        <version>1.27.0</version>
     </parent>
 
     <artifactId>terminology</artifactId>

test-coverage/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>root</artifactId>
-        <version>1.26.0</version>
+        <version>1.27.0</version>
     </parent>
 
     <artifactId>test-coverage</artifactId>

test-data/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>root</artifactId>
-        <version>1.26.0</version>
+        <version>1.27.0</version>
     </parent>
 
     <artifactId>test-data</artifactId>

util/pom.xml

@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>root</artifactId>
-        <version>1.26.0</version>
+        <version>1.27.0</version>
     </parent>
 
     <artifactId>util</artifactId>

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";

validation/pom.xml

@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>root</artifactId>
-        <version>1.26.0</version>
+        <version>1.27.0</version>
     </parent>
 
     <artifactId>validation</artifactId>
@@ -62,7 +62,6 @@
         <dependency>
             <groupId>org.threeten</groupId>
             <artifactId>threeten-extra</artifactId>
-            <version>1.7.0</version>
         </dependency>
         <dependency>
             <groupId>org.ehrbase.openehr.sdk</groupId>

web-template/pom.xml

@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>root</artifactId>
-        <version>1.26.0</version>
+        <version>1.27.0</version>
     </parent>
 
     <artifactId>web-template</artifactId>