Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/sync num main with develop January 2024 #206

Merged
merged 191 commits into from
Jan 22, 2024
Merged

Feature/sync num main with develop January 2024 #206

merged 191 commits into from
Jan 22, 2024

Conversation

crisdelta
Copy link

@crisdelta crisdelta commented Jan 17, 2024 •
edited
Loading

sync num main with develop January 2024 + update build number to 0.32.x-num and use openEHR sdk 2.5.0

dmitrytulba and others added 30 commits June 5, 2023 12:31
@dmitrytulba
audit
c6d9101
@dmitrytulba
added missing message files
681f4aa
@dmitrytulba
remove datasets
3bc478c
@dmitrytulba
Merge remote-tracking branch 'origin/develop' into feature/CDR-834_mi…
dd2cc68 
…grate_atna
@dmitrytulba
change from ehrId to ehrId set
f8163e0
@dmitrytulba
spotless
a7e6666
@dmitrytulba
rename compositionInterceptor
83243f0
@dmitrytulba
rename compositionInterceptor
68cb54d
@dmitrytulba
cover composition versioned controller
4e1927c
@dmitrytulba
spotless
9e14af4
@dmitrytulba
add contribution
d50f04c
@dmitrytulba
spotless
fcdad0c
@dmitrytulba
Merge remote-tracking branch 'origin/develop' into feature/CDR-834_mi…
38829ef 
…grate_atna
@dmitrytulba
spotless
0f4d712
@dmitrytulba
remove audit properties
3bd8af7
@dmitrytulba
no need location in patient record
805a465
@dependabot
Bump commons-io from 2.12.0 to 2.13.0 (ehrbase#1134)
b25e253 
Bumps commons-io from 2.12.0 to 2.13.0.

---
updated-dependencies:
- dependency-name: commons-io:commons-io
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump maven-failsafe-plugin from 3.1.0 to 3.1.2 (ehrbase#1135)
68562bf 
Bumps [maven-failsafe-plugin](https://github.com/apache/maven-surefire) from 3.1.0 to 3.1.2.
- [Release notes](https://github.com/apache/maven-surefire/releases)
- [Commits](apache/maven-surefire@surefire-3.1.0...surefire-3.1.2)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-failsafe-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump maven-surefire-plugin from 3.1.0 to 3.1.2 (ehrbase#1136)
3e685f1 
Bumps [maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.1.0 to 3.1.2.
- [Release notes](https://github.com/apache/maven-surefire/releases)
- [Commits](apache/maven-surefire@surefire-3.1.0...surefire-3.1.2)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-surefire-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dmitrytulba
spotless
b2c6de8
@dmitrytulba
add deleted patient to message
3040611
@dmitrytulba
Merge remote-tracking branch 'origin/develop' into feature/CDR-834_mi…
9f97f14 
…grate_atna
@dmitrytulba
spotless & cleanup
129ad5c
@vmueller-vg
CDR-907 update to SDK 2.0.0-SNAPSHOT
5ad7f32
@vmueller-vg
CDR-907 refactor base package path for SDK module aql
39c37f4
@vmueller-vg
CDR-907 refactor base package path for SDK module building
f012e7e
@vmueller-vg
CDR-907 Unify packages in the correct modules as far as easily possib…
a689fbb 
…le + new module "generator-commons" + remove module "building"
@vmueller-vg
CDR-907 refactor all SDK package paths to be based on group-id and ar…
9d3a667 
…tifact-id
@vmueller-vg
CDR-907 move some packages to a fitting location
0654159
@vmueller-vg
CDR-907 formatting
771f911
Dmitry and others added 24 commits November 7, 2023 14:21
add url to ehr & ehr status
b03232a
remove unnecessary param
902029f
@vidi42
Merge pull request ehrbase#1211 from ehrbase/feature/CDR-1108_include…
1a30bd4 
…_ehr_id

add url to ehr & ehr status
added url for versioned ehr status & create ehr fix
3fe0e0d
Merge branch 'develop' into feature/CDR-1108_include_ehr_id
8b695d9
@vidi42
Merge pull request ehrbase#1212 from ehrbase/feature/CDR-1108_include…
2036bef 
…_ehr_id

Feature/cdr 1108 include ehr
@dependabot
Bump org.apache.maven.plugins:maven-failsafe-plugin from 3.2.1 to 3.2…
3e70b4d 
….2 (ehrbase#1213)

Bumps [org.apache.maven.plugins:maven-failsafe-plugin](https://github.com/apache/maven-surefire) from 3.2.1 to 3.2.2.
- [Release notes](https://github.com/apache/maven-surefire/releases)
- [Commits](apache/maven-surefire@surefire-3.2.1...surefire-3.2.2)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-failsafe-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump org.apache.maven.plugins:maven-surefire-plugin from 3.2.1 to 3.2…
b88f401 
….2 (ehrbase#1214)

Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.2.1 to 3.2.2.
- [Release notes](https://github.com/apache/maven-surefire/releases)
- [Commits](apache/maven-surefire@surefire-3.2.1...surefire-3.2.2)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-surefire-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump org.apache.commons:commons-lang3 from 3.13.0 to 3.14.0 (ehrbase#…
86aadc5 
…1219)

Bumps org.apache.commons:commons-lang3 from 3.13.0 to 3.14.0.

---
updated-dependencies:
- dependency-name: org.apache.commons:commons-lang3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump io.micrometer:micrometer-registry-prometheus from 1.11.5 to 1.12…
c75a896 
….0 (ehrbase#1217)

Bumps [io.micrometer:micrometer-registry-prometheus](https://github.com/micrometer-metrics/micrometer) from 1.11.5 to 1.12.0.
- [Release notes](https://github.com/micrometer-metrics/micrometer/releases)
- [Commits](micrometer-metrics/micrometer@v1.11.5...v1.12.0)

---
updated-dependencies:
- dependency-name: io.micrometer:micrometer-registry-prometheus
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump org.apache.logging.log4j:log4j-api from 2.21.1 to 2.22.0 (ehrbas…
24bba48 
…e#1216)

Bumps org.apache.logging.log4j:log4j-api from 2.21.1 to 2.22.0.

---
updated-dependencies:
- dependency-name: org.apache.logging.log4j:log4j-api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump actions/setup-java from 3 to 4 (ehrbase#1223)
0fa0bde 
Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3 to 4.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](actions/setup-java@v3...v4)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump commons-io:commons-io from 2.15.0 to 2.15.1 (ehrbase#1222)
7cfa262 
Bumps commons-io:commons-io from 2.15.0 to 2.15.1.

---
updated-dependencies:
- dependency-name: commons-io:commons-io
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump org.postgresql:postgresql from 42.5.3 to 42.7.1 (ehrbase#1230)
0a4bfeb 
Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.5.3 to 42.7.1.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](pgjdbc/pgjdbc@REL42.5.3...REL42.7.1)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump github/codeql-action from 2 to 3 (ehrbase#1229)
9c1cc4e 
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2 to 3.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](github/codeql-action@v2...v3)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump actions/upload-artifact from 3 to 4 (ehrbase#1228)
43b3d94 
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](actions/upload-artifact@v3...v4)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump actions/setup-python from 4 to 5 (ehrbase#1227)
ec7379b 
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 4 to 5.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](actions/setup-python@v4...v5)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump org.codehaus.mojo:versions-maven-plugin from 2.10.0 to 2.16.2 (e…
0d150b6 
…hrbase#1226)

Bumps [org.codehaus.mojo:versions-maven-plugin](https://github.com/mojohaus/versions) from 2.10.0 to 2.16.2.
- [Release notes](https://github.com/mojohaus/versions/releases)
- [Changelog](https://github.com/mojohaus/versions/blob/master/ReleaseNotes.md)
- [Commits](mojohaus/versions@versions-maven-plugin-2.10.0...2.16.2)

---
updated-dependencies:
- dependency-name: org.codehaus.mojo:versions-maven-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump org.jacoco:jacoco-maven-plugin from 0.8.7 to 0.8.11 (ehrbase#1225)
77b0788 
Bumps [org.jacoco:jacoco-maven-plugin](https://github.com/jacoco/jacoco) from 0.8.7 to 0.8.11.
- [Release notes](https://github.com/jacoco/jacoco/releases)
- [Commits](jacoco/jacoco@v0.8.7...v0.8.11)

---
updated-dependencies:
- dependency-name: org.jacoco:jacoco-maven-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@crisdelta
Merge pull request #199 from ehrbase/develop
e581a77 
[pull] develop from ehrbase:develop
@crisdelta
Merge branch 'develop' of https://github.com/NUM-Forschungsdatenplatt…
03b2af3 
…form/ehrbase into feature/sync-num-main-with-develop-january-2024
@crisdelta
fix merge issue
7097cd1
@crisdelta
use openEHR SDK 2.5.0 instead of snapshot
fff2731
@crisdelta
update build number
13d09ac
@crisdelta crisdelta merged commit 628db97 into num-main Jan 22, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@richardbartha richardbartha richardbartha approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@crisdelta @richardbartha @dmitrytulba @vmueller-vg @vidi42 @stefanspiska @vladislavploaia