Skip to content

Commit

Permalink
Merge release branch '1.18.0' (#555)
Browse files Browse the repository at this point in the history
* upgrade to spring boot 2.7.18

* use num aql-editor spring boot starter dependency instead of archived ehrbase

* upgrade openEHR SDK to 1.20.0

* num-portal with open ehr sdk 1.22.0

* fix deprecated method

* num-portal with open ehr sdk 1.24.0

* num-portal with open ehr sdk 1.29.0

* use num-aql-editor 1.0.1-rc-6

* NUM-2311 migration to openEher sdk 2.0.0 in progress

* in progres upgrade to openEHR sdk 2.1.0

* fix some tests after upgrade to openEHR SDK 2.1.0

* refactoring and fix some tests

* refactoring

* fix tests

* some tests fixes

* some tests fixes

* some tests fixes

* other fixes

* other fixes

* fix test

* fix cohort integration test

* some cleanup

* refactoring

* upgrade to openEHR SDK 2.5.0

* some dependencies upgrade

* upgrade to openEHR SDK 2.6.0

* NUM-2315 ehrbase admin configs for management endpoint access

* update test

* NUM-2160 upgrade to spring boot 3.1.8

* use latest num-aql-editor-spring-boot-starter 1.0.4

* split exception handling for custom ForbiddenException and AccesDeniedException

* switch to maven repository for openEHR SDK

* cleanup and refactoring deprecated method for handleBindException

* NUM-2160 upgrade to spring boot 3.2.2 and some cleanup

* fix sonar complaints

* use latest num-aql-editor 1.0.5

* Feature/add nightly without sonar (#459)

* Add first github workflow file (nightly)

* update first github workflow triggert by push event

* update first github workflow deactivate int tests and cirlceCi pipline

* update first github workflow remove Int Test folder

* update first github workflow add Int Test folder

* update first github workflow add Int Test again

* update first github workflow schedule job

* update first github workflow schedule job I

* add nightly as github workflow

* disable sonar

* update CI dependencies to fix: Node.js 16 actions are deprecated (#460)

* Feature/nightly analyse (#461)

* temp commit to analyse nightly error

* temp allow int test to fail

* Feature/test_PR_pipeline (#462)

* add PR to develop workflow

* Feature/add pull pipeline (#463)

* bump trivy-action to v0.17.0
* work on trivy action
* pump github/codeql-action
* update PR pipeline

* add dependabot.yml (#464)

* Bump org.owasp:dependency-check-maven from 9.0.8 to 9.0.9

Bumps [org.owasp:dependency-check-maven](https://github.com/jeremylong/DependencyCheck) from 9.0.8 to 9.0.9.
- [Release notes](https://github.com/jeremylong/DependencyCheck/releases)
- [Changelog](https://github.com/jeremylong/DependencyCheck/blob/main/CHANGELOG.md)
- [Commits](jeremylong/DependencyCheck@v9.0.8...v9.0.9)

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

Signed-off-by: dependabot[bot] <[email protected]>

* update pipelines (#473)

* run maven package into docker step (#474)

* run maven package into docker step (#477)

* format workflows (#478)

* Feature/work on pipeline (#480)

* ignore some flaky tests (#481)

* include dependabot PRs into push pipeline (#482)

* fix naming (#483)

* Bump org.postgresql:postgresql from 42.7.1 to 42.7.2 (#472)

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.7.1 to 42.7.2.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](pgjdbc/pgjdbc@REL42.7.1...REL42.7.2)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  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>

* remove sonar cloud (#484)

* Update README.md

* Feature/work on release pipeline (#494)

* start work on release pipeline

* firsts step release pipelines

* update release pipeline

* update release pipeline

* update release version step

* ignore flaky test; remove CircleCI

* Change project structure and pom.xml, and group.id

* Change project structure and pom.xml, and group.id

* Feature/remove vitagroup package structure (#501)

* add numportal in package structure

* Build tagging pipeline (#497)

* Feature/change license (#502)

* changed test data with vitagroup naming to highmed and License

* highmed in License

* Update CardDto.java

* change to HiGHmed

* update to 3.2.4 springboot parent (#503)

* remove dependency checker (#505)

* start pipeline on PR open (#510)

* start pipeline on PR open

* start pipeline on PR open

* start pipeline on PR edit (#513)

* start pipeline on PR edit  (#516)

* start pipeline on PR ready

* change trigger (#519)

* Add configuration properties to disable fTTP and sending of emails (#509)

* Add config to disable fTTP privacy
* Add config to disable sending mails

* Merge release branch '1.18.0' back to develop (#523)

* updated project version to 1.18.0

* updated development version to 1.19.0-SNAPSHOT

---------

Co-authored-by: Github Actions <[email protected]>
Co-authored-by: Github Actions <[email protected]>

* add locel environment files (#527)

* Bump org.jacoco:jacoco-maven-plugin from 0.8.11 to 0.8.12 (#507)

Bumps [org.jacoco:jacoco-maven-plugin](https://github.com/jacoco/jacoco) from 0.8.11 to 0.8.12.
- [Release notes](https://github.com/jacoco/jacoco/releases)
- [Commits](jacoco/jacoco@v0.8.11...v0.8.12)

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

* Bump org.postgresql:postgresql from 42.7.2 to 42.7.3 (#492)

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.7.2 to 42.7.3.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](pgjdbc/pgjdbc@REL42.7.2...REL42.7.3)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  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>

* Bump org.testcontainers:postgresql from 1.19.3 to 1.19.7 (#488)

Bumps [org.testcontainers:postgresql](https://github.com/testcontainers/testcontainers-java) from 1.19.3 to 1.19.7.
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md)
- [Commits](testcontainers/testcontainers-java@1.19.3...1.19.7)

---
updated-dependencies:
- dependency-name: org.testcontainers:postgresql
  dependency-type: direct:development
  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>

* Bump springdoc.version from 2.3.0 to 2.5.0 (#520)

Bumps `springdoc.version` from 2.3.0 to 2.5.0.

Updates `org.springdoc:springdoc-openapi-starter-webmvc-ui` from 2.3.0 to 2.5.0
- [Release notes](https://github.com/springdoc/springdoc-openapi/releases)
- [Changelog](https://github.com/springdoc/springdoc-openapi/blob/main/CHANGELOG.md)
- [Commits](springdoc/springdoc-openapi@v2.3.0...v2.5.0)

Updates `org.springdoc:springdoc-openapi-starter-common` from 2.3.0 to 2.5.0
- [Release notes](https://github.com/springdoc/springdoc-openapi/releases)
- [Changelog](https://github.com/springdoc/springdoc-openapi/blob/main/CHANGELOG.md)
- [Commits](springdoc/springdoc-openapi@v2.3.0...v2.5.0)

---
updated-dependencies:
- dependency-name: org.springdoc:springdoc-openapi-starter-webmvc-ui
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.springdoc:springdoc-openapi-starter-common
  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>

* Bump org.wiremock:wiremock-standalone from 3.2.0 to 3.5.4 (#525)

Bumps [org.wiremock:wiremock-standalone](https://github.com/wiremock/wiremock) from 3.2.0 to 3.5.4.
- [Release notes](https://github.com/wiremock/wiremock/releases)
- [Commits](wiremock/wiremock@3.2.0...3.5.4)

---
updated-dependencies:
- dependency-name: org.wiremock:wiremock-standalone
  dependency-type: direct:development
  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>

* Bump org.springframework.cloud:spring-cloud-dependencies (#521)

Bumps [org.springframework.cloud:spring-cloud-dependencies](https://github.com/spring-cloud/spring-cloud-release) from 2023.0.0 to 2023.0.1.
- [Release notes](https://github.com/spring-cloud/spring-cloud-release/releases)
- [Commits](spring-cloud/spring-cloud-release@v2023.0.0...v2023.0.1)

---
updated-dependencies:
- dependency-name: org.springframework.cloud:spring-cloud-dependencies
  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>

* add isvalid method (#530)

* Update application-deploy.yml: add logging (#531)

* maintenance and openehr-sdk update

* Feature/delete status cake (#539)

* add isvalid method

* delete statuscake

* delete status endpoint

* fixed test

* delete test

* delete announcement path to health website

* endpoint

* endpoint without /

* change whitelisting name for endpoint

* delete classes without uses

* Make the EHR ID path configurable (#542)

* update spring boot parent (#540)

* Feature/fix tests (#545)

* fix unit Test

* remove unused const

* back to spring boot parent 3.2.5 (#546)

* back to spring boot parent 2.5.2

* back to spring boot parent 3.2.5

* Feature/back to parent 2.5.2 (#547)

* back to spring boot parent 2.5.2

* back to spring boot parent 3.2.5

* added /auth

* try (#548)

* override

* Feature/id path branch to fix ehrproperties (#549)

* override

* override

* Feature/id path branch to fix ehrproperties (#550)

* override

* override

* build in the deleted PR

* build in the deleted PR

* Bump org.springframework.cloud:spring-cloud-dependencies (#551)

Bumps [org.springframework.cloud:spring-cloud-dependencies](https://github.com/spring-cloud/spring-cloud-release) from 2023.0.1 to 2023.0.2.
- [Release notes](https://github.com/spring-cloud/spring-cloud-release/releases)
- [Commits](spring-cloud/spring-cloud-release@v2023.0.1...v2023.0.2)

---
updated-dependencies:
- dependency-name: org.springframework.cloud:spring-cloud-dependencies
  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>

* Fix problems with loading resources in JARs (#541)

ClassPathResource.getFile() does not work if the resource cannot be resolved as absolute file path

* replace codex to rdp (#553)

* replace codex to rdp

* Feature/id path branch to fix ehrproperties (#550)

* override

* override

* build in the deleted PR

* build in the deleted PR

* Bump org.springframework.cloud:spring-cloud-dependencies (#551)

Bumps [org.springframework.cloud:spring-cloud-dependencies](https://github.com/spring-cloud/spring-cloud-release) from 2023.0.1 to 2023.0.2.
- [Release notes](https://github.com/spring-cloud/spring-cloud-release/releases)
- [Commits](spring-cloud/spring-cloud-release@v2023.0.1...v2023.0.2)

---
updated-dependencies:
- dependency-name: org.springframework.cloud:spring-cloud-dependencies
  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>

* Fix problems with loading resources in JARs (#541)

ClassPathResource.getFile() does not work if the resource cannot be resolved as absolute file path

* changed shouldSuccessfullyExecutemanagerProject

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Andreas <[email protected]>

* updated project version to 1.18.0

* updated release version to 1.18.0

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: crisdelta <[email protected]>
Co-authored-by: cdeac <[email protected]>
Co-authored-by: mafasva <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: ramueSVA <[email protected]>
Co-authored-by: romanschneidersva <[email protected]>
Co-authored-by: Andreas <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Github Actions <[email protected]>
Co-authored-by: Github Actions <[email protected]>
Co-authored-by: Uwe Janßen <[email protected]>
Co-authored-by: Andreas <[email protected]>
Co-authored-by: rmueller <[email protected]>
  • Loading branch information
13 people authored Jun 4, 2024
1 parent 5ba720e commit 3e0bb2d
Show file tree
Hide file tree
Showing 321 changed files with 3,636 additions and 4,227 deletions.
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

0 comments on commit 3e0bb2d

Please sign in to comment.