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.

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

Merge release branch '1.18.0' #555

Merged
merged 103 commits into from
Jun 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
103 commits
Select commit Hold shift + click to select a range
d3fc608
Merge pull request #449 from NUM-Forschungsdatenplattform/release/v1.…
crisdelta Nov 17, 2023
b7ec765
upgrade to spring boot 2.7.18
crisdelta Nov 29, 2023
7c30b52
use num aql-editor spring boot starter dependency instead of archived…
crisdelta Dec 5, 2023
7a2b079
Merge pull request #451 from NUM-Forschungsdatenplattform/feature/num…
crisdelta Dec 5, 2023
b2d2c99
upgrade openEHR SDK to 1.20.0
crisdelta Dec 5, 2023
1fc2d3b
num-portal with open ehr sdk 1.22.0
crisdelta Dec 6, 2023
aeb66be
fix deprecated method
crisdelta Dec 6, 2023
2117145
num-portal with open ehr sdk 1.24.0
crisdelta Dec 6, 2023
12b3e82
num-portal with open ehr sdk 1.29.0
crisdelta Dec 6, 2023
0540daf
use num-aql-editor 1.0.1-rc-6
crisdelta Dec 6, 2023
7f83919
Merge pull request #453 from NUM-Forschungsdatenplattform/feature/NUM…
crisdelta Dec 8, 2023
192f168
NUM-2311 migration to openEher sdk 2.0.0 in progress
crisdelta Dec 13, 2023
dbc02b1
in progres upgrade to openEHR sdk 2.1.0
crisdelta Jan 9, 2024
770ba27
fix some tests after upgrade to openEHR SDK 2.1.0
crisdelta Jan 10, 2024
ba51faf
refactoring and fix some tests
crisdelta Jan 10, 2024
edb4bc5
refactoring
crisdelta Jan 10, 2024
32e5f0c
fix tests
crisdelta Jan 10, 2024
6b2405a
some tests fixes
crisdelta Jan 12, 2024
2947b5e
some tests fixes
crisdelta Jan 12, 2024
e70134e
some tests fixes
crisdelta Jan 12, 2024
247033d
other fixes
crisdelta Jan 12, 2024
af25849
other fixes
crisdelta Jan 12, 2024
1127f0c
fix test
crisdelta Jan 15, 2024
5ad2346
fix cohort integration test
crisdelta Jan 15, 2024
9272a9f
some cleanup
crisdelta Jan 15, 2024
a745002
refactoring
crisdelta Jan 15, 2024
c67e0f2
Merge pull request #454 from NUM-Forschungsdatenplattform/feature/NUM…
crisdelta Jan 16, 2024
13a6242
upgrade to openEHR SDK 2.5.0
crisdelta Jan 16, 2024
2e542b2
some dependencies upgrade
crisdelta Jan 16, 2024
0e27ea0
upgrade to openEHR SDK 2.6.0
crisdelta Jan 22, 2024
b5b3342
Merge pull request #455 from NUM-Forschungsdatenplattform/feature/NUM…
crisdelta Jan 22, 2024
346190a
NUM-2315 ehrbase admin configs for management endpoint access
crisdelta Jan 23, 2024
cd9f415
update test
crisdelta Jan 23, 2024
0eb15f2
Merge pull request #456 from NUM-Forschungsdatenplattform/feature/NUM…
crisdelta Jan 23, 2024
ca1e8f3
NUM-2160 upgrade to spring boot 3.1.8
crisdelta Jan 29, 2024
0517b14
use latest num-aql-editor-spring-boot-starter 1.0.4
crisdelta Jan 30, 2024
f074a62
split exception handling for custom ForbiddenException and AccesDenie…
crisdelta Jan 30, 2024
54fca13
switch to maven repository for openEHR SDK
crisdelta Jan 30, 2024
c6a823b
cleanup and refactoring deprecated method for handleBindException
crisdelta Jan 30, 2024
44daa5b
Merge pull request #457 from NUM-Forschungsdatenplattform/feature/NUM…
crisdelta Jan 30, 2024
97659d3
NUM-2160 upgrade to spring boot 3.2.2 and some cleanup
crisdelta Jan 31, 2024
e379400
fix sonar complaints
crisdelta Jan 31, 2024
b2e8b88
use latest num-aql-editor 1.0.5
crisdelta Jan 31, 2024
01e08aa
Merge pull request #458 from NUM-Forschungsdatenplattform/feature/NUM…
crisdelta Jan 31, 2024
edf25a1
Feature/add nightly without sonar (#459)
mafasva Feb 7, 2024
252813b
update CI dependencies to fix: Node.js 16 actions are deprecated (#460)
mafasva Feb 8, 2024
4bbde93
Feature/nightly analyse (#461)
mafasva Feb 15, 2024
1d9f060
Feature/test_PR_pipeline (#462)
mafasva Feb 15, 2024
82a4a85
Feature/add pull pipeline (#463)
mafasva Feb 19, 2024
d7bf096
add dependabot.yml (#464)
mafasva Feb 20, 2024
6997cf7
Bump org.owasp:dependency-check-maven from 9.0.8 to 9.0.9
dependabot[bot] Feb 20, 2024
98f1acf
Merge pull request #465 from NUM-Forschungsdatenplattform/dependabot/…
mafasva Feb 21, 2024
f1efc5a
update pipelines (#473)
mafasva Feb 21, 2024
acf2319
run maven package into docker step (#474)
mafasva Feb 22, 2024
9b04943
run maven package into docker step (#477)
mafasva Feb 23, 2024
5229160
format workflows (#478)
mafasva Feb 23, 2024
394443d
Feature/work on pipeline (#480)
mafasva Feb 28, 2024
32363cc
ignore some flaky tests (#481)
mafasva Feb 28, 2024
f9f239c
include dependabot PRs into push pipeline (#482)
mafasva Feb 28, 2024
65de941
fix naming (#483)
mafasva Feb 28, 2024
298a41e
Bump org.postgresql:postgresql from 42.7.1 to 42.7.2 (#472)
dependabot[bot] Feb 28, 2024
c139b2e
remove sonar cloud (#484)
ramueSVA Feb 29, 2024
fa6b4e9
Update README.md
romanschneidersva Mar 12, 2024
50e18a6
Merge pull request #489 from NUM-Forschungsdatenplattform/README_update
romanschneidersva Mar 12, 2024
ccc5927
Feature/work on release pipeline (#494)
mafasva Mar 21, 2024
9208b50
Change project structure and pom.xml, and group.id
ramueSVA Apr 2, 2024
01e9ae5
Feature/remove vitagroup package structure (#501)
ramueSVA Apr 2, 2024
e23461d
Build tagging pipeline (#497)
ramueSVA Apr 2, 2024
8eb061f
Feature/change license (#502)
ramueSVA Apr 11, 2024
2e77784
update to 3.2.4 springboot parent (#503)
ramueSVA Apr 11, 2024
4c8c574
remove dependency checker (#505)
ramueSVA Apr 12, 2024
03a190e
start pipeline on PR open (#510)
mafasva Apr 16, 2024
df03d60
start pipeline on PR edit (#513)
mafasva Apr 16, 2024
24d888f
start pipeline on PR edit (#516)
mafasva Apr 16, 2024
7904296
change trigger (#519)
mafasva Apr 17, 2024
e8f8abf
Add configuration properties to disable fTTP and sending of emails (#…
askask Apr 17, 2024
01f666d
Merge release branch '1.18.0' back to develop (#523)
github-actions[bot] Apr 26, 2024
48e6874
add locel environment files (#527)
mafasva Apr 29, 2024
b3619b2
Bump org.jacoco:jacoco-maven-plugin from 0.8.11 to 0.8.12 (#507)
dependabot[bot] May 2, 2024
680f517
Bump org.postgresql:postgresql from 42.7.2 to 42.7.3 (#492)
dependabot[bot] May 2, 2024
f898a29
Bump org.testcontainers:postgresql from 1.19.3 to 1.19.7 (#488)
dependabot[bot] May 2, 2024
40f0447
Bump springdoc.version from 2.3.0 to 2.5.0 (#520)
dependabot[bot] May 2, 2024
7b02a9e
Bump org.wiremock:wiremock-standalone from 3.2.0 to 3.5.4 (#525)
dependabot[bot] May 2, 2024
d0ed9a2
Bump org.springframework.cloud:spring-cloud-dependencies (#521)
dependabot[bot] May 2, 2024
2ff4b5c
add isvalid method (#530)
ramueSVA May 3, 2024
1f61a61
Update application-deploy.yml: add logging (#531)
ujanssen May 7, 2024
2093142
maintenance and openehr-sdk update
ramueSVA May 28, 2024
b5bbc20
Feature/delete status cake (#539)
ramueSVA May 28, 2024
c2f8314
Make the EHR ID path configurable (#542)
askask May 29, 2024
3b292b1
update spring boot parent (#540)
ramueSVA May 29, 2024
66ece3d
Feature/fix tests (#545)
mafasva May 29, 2024
5a68661
back to spring boot parent 3.2.5 (#546)
ramueSVA May 29, 2024
fad1da1
Feature/back to parent 2.5.2 (#547)
ramueSVA May 29, 2024
bd99cbe
try (#548)
ramueSVA May 29, 2024
5f2531c
override
ramueSVA May 29, 2024
6ec7c02
Merge remote-tracking branch 'origin/develop' into develop
ramueSVA May 29, 2024
6e88540
Feature/id path branch to fix ehrproperties (#549)
ramueSVA May 29, 2024
b2ac598
Feature/id path branch to fix ehrproperties (#550)
ramueSVA May 30, 2024
fbba971
Bump org.springframework.cloud:spring-cloud-dependencies (#551)
dependabot[bot] Jun 4, 2024
a9ef4c3
Fix problems with loading resources in JARs (#541)
askask Jun 4, 2024
0644b9c
replace codex to rdp (#553)
ramueSVA Jun 4, 2024
605dfb6
updated project version to 1.18.0
Jun 4, 2024
ed83407
updated release version to 1.18.0
web-flow Jun 4, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
31 changes: 0 additions & 31 deletions .circleci/README.md

This file was deleted.

238 changes: 0 additions & 238 deletions .circleci/config.yml

This file was deleted.

17 changes: 17 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
- package-ecosystem: maven
directory: "/"
schedule:
interval: daily
time: "04:00"
open-pull-requests-limit: 10
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
83 changes: 83 additions & 0 deletions .github/workflows/build-for-development.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
name: Build for development

on:
push:
branches: [ 'feature/**', 'dependabot/**' ]
pull_request_target:
branches: [ develop, main ]
types: [ ready_for_review, closed ]

jobs:
test_and_scan:
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v4
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'temurin'
cache: 'maven'
- name: Run unit tests
run: mvn clean test
- name: Run integration tests
run: mvn verify -P integration-tests
- name: Prepare test results
run: |
mkdir -p ~/test-results/unit-tests/
mkdir -p ~/test-results/integration-tests/
find . -type f -regex ".*/target/surefire-reports/.*xml" -exec cp {} ~/test-results/unit-tests/ \;
find . -type f -regex ".*/target/failsafe-reports/.*xml" -exec cp {} ~/test-results/integration-tests/ \;
- name: Upload test coverage report
uses: actions/upload-artifact@v4
with:
name: test-coverage-report
path: target/site/jacoco-merged-test-coverage-report
- name: Upload unit tests report
uses: actions/upload-artifact@v4
with:
name: unit-tests-report
path: ~/test-results/unit-tests/
- name: Upload integration tests report
uses: actions/upload-artifact@v4
with:
name: integration-tests-report
path: ~/test-results/integration-tests/
- name: Run Trivy vulnerability scanner
uses: aquasecurity/trivy-action@master
with:
scan-type: 'fs'
ignore-unfixed: true
format: 'sarif'
output: 'trivy-results.sarif'
severity: 'CRITICAL,HIGH'
- name: Upload Trivy scan results to GitHub Security tab
uses: github/codeql-action/upload-sarif@v3
with:
sarif_file: 'trivy-results.sarif'

docker:
needs: test_and_scan
if: github.event.pull_request.merged == true

runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'temurin'
cache: 'maven'
- name: Login to docker hub
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
- name: Build and push docker image
run: |
mvn spring-boot:build-image -Dspring-boot.build-image.imageName=${{ secrets.DOCKER_USERNAME }}/num-portal:develop -DskipTests
docker push ${{ secrets.DOCKER_USERNAME }}/num-portal:develop
Loading
Loading