From f079fa4349cf095a037963f05cc9e4e0f468c48c Mon Sep 17 00:00:00 2001 From: Lubos Racansky Date: Wed, 21 Feb 2024 13:41:17 +0100 Subject: [PATCH 01/20] Fix #1012: Set release version to 1.7.0 --- enrollment-server-api-model/pom.xml | 2 +- enrollment-server-onboarding-adapter-mock/pom.xml | 2 +- enrollment-server-onboarding-api-model/pom.xml | 2 +- enrollment-server-onboarding-api/pom.xml | 2 +- enrollment-server-onboarding-common/pom.xml | 2 +- enrollment-server-onboarding-domain-model/pom.xml | 2 +- enrollment-server-onboarding-provider-innovatrics/pom.xml | 2 +- enrollment-server-onboarding-provider-iproov/pom.xml | 2 +- enrollment-server-onboarding-provider-zenid/pom.xml | 2 +- enrollment-server-onboarding/pom.xml | 2 +- enrollment-server/pom.xml | 2 +- mtoken-model/pom.xml | 2 +- pom.xml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/enrollment-server-api-model/pom.xml b/enrollment-server-api-model/pom.xml index ec7badbe..18c368b4 100644 --- a/enrollment-server-api-model/pom.xml +++ b/enrollment-server-api-model/pom.xml @@ -30,7 +30,7 @@ com.wultra.security enrollment-server-parent - 1.7.0-SNAPSHOT + 1.7.0 diff --git a/enrollment-server-onboarding-adapter-mock/pom.xml b/enrollment-server-onboarding-adapter-mock/pom.xml index b80b2924..1ed13fcb 100644 --- a/enrollment-server-onboarding-adapter-mock/pom.xml +++ b/enrollment-server-onboarding-adapter-mock/pom.xml @@ -24,7 +24,7 @@ com.wultra.security enrollment-server-parent - 1.7.0-SNAPSHOT + 1.7.0 enrollment-server-onboarding-adapter-mock diff --git a/enrollment-server-onboarding-api-model/pom.xml b/enrollment-server-onboarding-api-model/pom.xml index fcc57e0b..3f532b6b 100644 --- a/enrollment-server-onboarding-api-model/pom.xml +++ b/enrollment-server-onboarding-api-model/pom.xml @@ -7,7 +7,7 @@ com.wultra.security enrollment-server-parent - 1.7.0-SNAPSHOT + 1.7.0 enrollment-server-onboarding-api-model diff --git a/enrollment-server-onboarding-api/pom.xml b/enrollment-server-onboarding-api/pom.xml index 40396bfc..05397e10 100644 --- a/enrollment-server-onboarding-api/pom.xml +++ b/enrollment-server-onboarding-api/pom.xml @@ -25,7 +25,7 @@ com.wultra.security enrollment-server-parent - 1.7.0-SNAPSHOT + 1.7.0 com.wultra.security diff --git a/enrollment-server-onboarding-common/pom.xml b/enrollment-server-onboarding-common/pom.xml index 2cc80fe4..99f9e0cf 100644 --- a/enrollment-server-onboarding-common/pom.xml +++ b/enrollment-server-onboarding-common/pom.xml @@ -24,7 +24,7 @@ com.wultra.security enrollment-server-parent - 1.7.0-SNAPSHOT + 1.7.0 enrollment-server-onboarding-common diff --git a/enrollment-server-onboarding-domain-model/pom.xml b/enrollment-server-onboarding-domain-model/pom.xml index 2f5edb9e..90dac5e3 100644 --- a/enrollment-server-onboarding-domain-model/pom.xml +++ b/enrollment-server-onboarding-domain-model/pom.xml @@ -30,7 +30,7 @@ com.wultra.security enrollment-server-parent - 1.7.0-SNAPSHOT + 1.7.0 diff --git a/enrollment-server-onboarding-provider-innovatrics/pom.xml b/enrollment-server-onboarding-provider-innovatrics/pom.xml index 629a295f..ac6c4029 100644 --- a/enrollment-server-onboarding-provider-innovatrics/pom.xml +++ b/enrollment-server-onboarding-provider-innovatrics/pom.xml @@ -25,7 +25,7 @@ com.wultra.security enrollment-server-parent - 1.7.0-SNAPSHOT + 1.7.0 com.wultra.security diff --git a/enrollment-server-onboarding-provider-iproov/pom.xml b/enrollment-server-onboarding-provider-iproov/pom.xml index b7cbfe87..4cf14598 100644 --- a/enrollment-server-onboarding-provider-iproov/pom.xml +++ b/enrollment-server-onboarding-provider-iproov/pom.xml @@ -25,7 +25,7 @@ com.wultra.security enrollment-server-parent - 1.7.0-SNAPSHOT + 1.7.0 com.wultra.security diff --git a/enrollment-server-onboarding-provider-zenid/pom.xml b/enrollment-server-onboarding-provider-zenid/pom.xml index 80f1bb3d..4cfed495 100644 --- a/enrollment-server-onboarding-provider-zenid/pom.xml +++ b/enrollment-server-onboarding-provider-zenid/pom.xml @@ -25,7 +25,7 @@ com.wultra.security enrollment-server-parent - 1.7.0-SNAPSHOT + 1.7.0 com.wultra.security diff --git a/enrollment-server-onboarding/pom.xml b/enrollment-server-onboarding/pom.xml index faca05b8..76dc977b 100644 --- a/enrollment-server-onboarding/pom.xml +++ b/enrollment-server-onboarding/pom.xml @@ -29,7 +29,7 @@ com.wultra.security enrollment-server-parent - 1.7.0-SNAPSHOT + 1.7.0 diff --git a/enrollment-server/pom.xml b/enrollment-server/pom.xml index fae82f69..8352dcbe 100644 --- a/enrollment-server/pom.xml +++ b/enrollment-server/pom.xml @@ -30,7 +30,7 @@ com.wultra.security enrollment-server-parent - 1.7.0-SNAPSHOT + 1.7.0 diff --git a/mtoken-model/pom.xml b/mtoken-model/pom.xml index 369b2419..d895f43a 100644 --- a/mtoken-model/pom.xml +++ b/mtoken-model/pom.xml @@ -26,7 +26,7 @@ com.wultra.security enrollment-server-parent - 1.7.0-SNAPSHOT + 1.7.0 diff --git a/pom.xml b/pom.xml index d3e00637..55d75100 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ com.wultra.security enrollment-server-parent - 1.7.0-SNAPSHOT + 1.7.0 pom From 93c665c45017fa273b08c79550da309797212006 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Apr 2024 06:06:58 +0000 Subject: [PATCH 02/20] Bump org.springdoc:springdoc-openapi-starter-webmvc-ui Bumps [org.springdoc:springdoc-openapi-starter-webmvc-ui](https://github.com/springdoc/springdoc-openapi) from 2.4.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](https://github.com/springdoc/springdoc-openapi/compare/v2.4.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 ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e85db731..c1f58aef 100644 --- a/pom.xml +++ b/pom.xml @@ -93,7 +93,7 @@ 5.12.0 4.0.0 2.2.21 - 2.4.0 + 2.5.0 1.4.4 1.9.0-SNAPSHOT From b723ce77fb35aeed0b99be1cf6cbea58d1be0d69 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Apr 2024 02:39:32 +0000 Subject: [PATCH 03/20] Bump org.bouncycastle:bcprov-jdk18on from 1.77 to 1.78 Bumps [org.bouncycastle:bcprov-jdk18on](https://github.com/bcgit/bc-java) from 1.77 to 1.78. - [Changelog](https://github.com/bcgit/bc-java/blob/main/docs/releasenotes.html) - [Commits](https://github.com/bcgit/bc-java/commits) --- updated-dependencies: - dependency-name: org.bouncycastle:bcprov-jdk18on dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c1f58aef..010ac4e7 100644 --- a/pom.xml +++ b/pom.xml @@ -101,7 +101,7 @@ 1.7.0-SNAPSHOT 1.7.0-SNAPSHOT - 1.77 + 1.78 7.4 From 16a98e653d5bcd8543504d914cf871446d40ddaa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Apr 2024 02:39:56 +0000 Subject: [PATCH 04/20] Bump net.javacrumbs.shedlock:shedlock-bom from 5.12.0 to 5.13.0 Bumps [net.javacrumbs.shedlock:shedlock-bom](https://github.com/lukas-krecan/ShedLock) from 5.12.0 to 5.13.0. - [Commits](https://github.com/lukas-krecan/ShedLock/compare/shedlock-parent-5.12.0...shedlock-parent-5.13.0) --- updated-dependencies: - dependency-name: net.javacrumbs.shedlock:shedlock-bom dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c1f58aef..25b78df5 100644 --- a/pom.xml +++ b/pom.xml @@ -90,7 +90,7 @@ 7.4.0 - 5.12.0 + 5.13.0 4.0.0 2.2.21 2.5.0 From aad9b292261627f404e6ad73731f127ea1b26c93 Mon Sep 17 00:00:00 2001 From: Lubos Racansky Date: Wed, 21 Feb 2024 13:44:38 +0100 Subject: [PATCH 05/20] Fix #1014: Update Wultra dependencies --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 25b78df5..8d3db32b 100644 --- a/pom.xml +++ b/pom.xml @@ -96,10 +96,10 @@ 2.5.0 1.4.4 - 1.9.0-SNAPSHOT - 1.7.0-SNAPSHOT - 1.7.0-SNAPSHOT - 1.7.0-SNAPSHOT + 1.9.0 + 1.7.0 + 1.7.0 + 1.7.0 1.77 7.4 From cab7f3183dde0a05e4ddfe6805d682b5116dd704 Mon Sep 17 00:00:00 2001 From: Lubos Racansky Date: Tue, 9 Apr 2024 12:40:05 +0200 Subject: [PATCH 06/20] Fix #1013: Set develop version to 1.8.0-SNAPSHOT --- enrollment-server-api-model/pom.xml | 2 +- enrollment-server-onboarding-adapter-mock/pom.xml | 2 +- enrollment-server-onboarding-api-model/pom.xml | 2 +- enrollment-server-onboarding-api/pom.xml | 2 +- enrollment-server-onboarding-common/pom.xml | 2 +- enrollment-server-onboarding-domain-model/pom.xml | 2 +- .../pom.xml | 2 +- enrollment-server-onboarding-provider-iproov/pom.xml | 2 +- enrollment-server-onboarding-provider-zenid/pom.xml | 2 +- enrollment-server-onboarding/pom.xml | 2 +- enrollment-server/pom.xml | 2 +- mtoken-model/pom.xml | 2 +- pom.xml | 10 +++++----- 13 files changed, 17 insertions(+), 17 deletions(-) diff --git a/enrollment-server-api-model/pom.xml b/enrollment-server-api-model/pom.xml index 18c368b4..4b024f8c 100644 --- a/enrollment-server-api-model/pom.xml +++ b/enrollment-server-api-model/pom.xml @@ -30,7 +30,7 @@ com.wultra.security enrollment-server-parent - 1.7.0 + 1.8.0-SNAPSHOT diff --git a/enrollment-server-onboarding-adapter-mock/pom.xml b/enrollment-server-onboarding-adapter-mock/pom.xml index 1ed13fcb..9c7580e5 100644 --- a/enrollment-server-onboarding-adapter-mock/pom.xml +++ b/enrollment-server-onboarding-adapter-mock/pom.xml @@ -24,7 +24,7 @@ com.wultra.security enrollment-server-parent - 1.7.0 + 1.8.0-SNAPSHOT enrollment-server-onboarding-adapter-mock diff --git a/enrollment-server-onboarding-api-model/pom.xml b/enrollment-server-onboarding-api-model/pom.xml index 3f532b6b..e6f51a2b 100644 --- a/enrollment-server-onboarding-api-model/pom.xml +++ b/enrollment-server-onboarding-api-model/pom.xml @@ -7,7 +7,7 @@ com.wultra.security enrollment-server-parent - 1.7.0 + 1.8.0-SNAPSHOT enrollment-server-onboarding-api-model diff --git a/enrollment-server-onboarding-api/pom.xml b/enrollment-server-onboarding-api/pom.xml index 05397e10..a5d57ccf 100644 --- a/enrollment-server-onboarding-api/pom.xml +++ b/enrollment-server-onboarding-api/pom.xml @@ -25,7 +25,7 @@ com.wultra.security enrollment-server-parent - 1.7.0 + 1.8.0-SNAPSHOT com.wultra.security diff --git a/enrollment-server-onboarding-common/pom.xml b/enrollment-server-onboarding-common/pom.xml index 99f9e0cf..483ccc9c 100644 --- a/enrollment-server-onboarding-common/pom.xml +++ b/enrollment-server-onboarding-common/pom.xml @@ -24,7 +24,7 @@ com.wultra.security enrollment-server-parent - 1.7.0 + 1.8.0-SNAPSHOT enrollment-server-onboarding-common diff --git a/enrollment-server-onboarding-domain-model/pom.xml b/enrollment-server-onboarding-domain-model/pom.xml index 90dac5e3..170d0dc1 100644 --- a/enrollment-server-onboarding-domain-model/pom.xml +++ b/enrollment-server-onboarding-domain-model/pom.xml @@ -30,7 +30,7 @@ com.wultra.security enrollment-server-parent - 1.7.0 + 1.8.0-SNAPSHOT diff --git a/enrollment-server-onboarding-provider-innovatrics/pom.xml b/enrollment-server-onboarding-provider-innovatrics/pom.xml index ac6c4029..b42cca33 100644 --- a/enrollment-server-onboarding-provider-innovatrics/pom.xml +++ b/enrollment-server-onboarding-provider-innovatrics/pom.xml @@ -25,7 +25,7 @@ com.wultra.security enrollment-server-parent - 1.7.0 + 1.8.0-SNAPSHOT com.wultra.security diff --git a/enrollment-server-onboarding-provider-iproov/pom.xml b/enrollment-server-onboarding-provider-iproov/pom.xml index 4cf14598..50c7f388 100644 --- a/enrollment-server-onboarding-provider-iproov/pom.xml +++ b/enrollment-server-onboarding-provider-iproov/pom.xml @@ -25,7 +25,7 @@ com.wultra.security enrollment-server-parent - 1.7.0 + 1.8.0-SNAPSHOT com.wultra.security diff --git a/enrollment-server-onboarding-provider-zenid/pom.xml b/enrollment-server-onboarding-provider-zenid/pom.xml index 4cfed495..e77100fc 100644 --- a/enrollment-server-onboarding-provider-zenid/pom.xml +++ b/enrollment-server-onboarding-provider-zenid/pom.xml @@ -25,7 +25,7 @@ com.wultra.security enrollment-server-parent - 1.7.0 + 1.8.0-SNAPSHOT com.wultra.security diff --git a/enrollment-server-onboarding/pom.xml b/enrollment-server-onboarding/pom.xml index 4ca7e8b2..64b7a97f 100644 --- a/enrollment-server-onboarding/pom.xml +++ b/enrollment-server-onboarding/pom.xml @@ -29,7 +29,7 @@ com.wultra.security enrollment-server-parent - 1.7.0 + 1.8.0-SNAPSHOT diff --git a/enrollment-server/pom.xml b/enrollment-server/pom.xml index b4967106..55d3845d 100644 --- a/enrollment-server/pom.xml +++ b/enrollment-server/pom.xml @@ -30,7 +30,7 @@ com.wultra.security enrollment-server-parent - 1.7.0 + 1.8.0-SNAPSHOT diff --git a/mtoken-model/pom.xml b/mtoken-model/pom.xml index d895f43a..8bd5bd94 100644 --- a/mtoken-model/pom.xml +++ b/mtoken-model/pom.xml @@ -26,7 +26,7 @@ com.wultra.security enrollment-server-parent - 1.7.0 + 1.8.0-SNAPSHOT diff --git a/pom.xml b/pom.xml index e06f5658..53afc187 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ com.wultra.security enrollment-server-parent - 1.7.0 + 1.8.0-SNAPSHOT pom @@ -96,10 +96,10 @@ 2.5.0 1.4.4 - 1.9.0 - 1.7.0 - 1.7.0 - 1.7.0 + 1.10.0-SNAPSHOT + 1.8.0-SNAPSHOT + 1.8.0-SNAPSHOT + 1.8.0-SNAPSHOT 1.77 7.4 From cd37314260889680ea15c80029a706bc37c89f25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Ra=C4=8Dansk=C3=BD?= Date: Fri, 12 Apr 2024 07:48:11 +0200 Subject: [PATCH 07/20] Fix #1047: Documentation for Monitoring and Observability not Rendered Correctly (#1048) * Fix #1047: Documentation for Monitoring and Observability not Rendered Correctly --- docs/Configuration-Properties.md | 2 ++ docs/onboarding/Configuration-Properties.md | 2 ++ 2 files changed, 4 insertions(+) diff --git a/docs/Configuration-Properties.md b/docs/Configuration-Properties.md index 47b9b455..af3040ed 100644 --- a/docs/Configuration-Properties.md +++ b/docs/Configuration-Properties.md @@ -68,8 +68,10 @@ logging.pattern.console=%clr(%d{${LOG_DATEFORMAT_PATTERN:yyyy-MM-dd HH:mm:ss.SSS ## Monitoring and Observability + | Property | Default | Note | |-------------------------------------------|---------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | `management.tracing.sampling.probability` | `1.0` | Specifies the proportion of requests that are sampled for tracing. A value of 1.0 means that 100% of requests are sampled, while a value of 0 effectively disables tracing. | + The WAR file includes the `micrometer-registry-prometheus` dependency. Discuss its configuration with the [Spring Boot documentation](https://docs.spring.io/spring-boot/docs/3.1.x/reference/html/actuator.html#actuator.metrics). diff --git a/docs/onboarding/Configuration-Properties.md b/docs/onboarding/Configuration-Properties.md index 3f1881e6..d236dd43 100644 --- a/docs/onboarding/Configuration-Properties.md +++ b/docs/onboarding/Configuration-Properties.md @@ -169,8 +169,10 @@ logging.pattern.console=%clr(%d{${LOG_DATEFORMAT_PATTERN:yyyy-MM-dd HH:mm:ss.SSS ## Monitoring and Observability + | Property | Default | Note | |-------------------------------------------|---------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | `management.tracing.sampling.probability` | `1.0` | Specifies the proportion of requests that are sampled for tracing. A value of 1.0 means that 100% of requests are sampled, while a value of 0 effectively disables tracing. | + The WAR file includes the `micrometer-registry-prometheus` dependency. Discuss its configuration with the [Spring Boot documentation](https://docs.spring.io/spring-boot/docs/3.1.x/reference/html/actuator.html#actuator.metrics). From 46bae3cf3cb368b41cb182debb0a0c1837d86698 Mon Sep 17 00:00:00 2001 From: Lubos Racansky Date: Mon, 15 Apr 2024 14:57:01 +0200 Subject: [PATCH 08/20] Disable CodeQL GitHub Action on pull requests --- .github/workflows/codeql-analysis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index ae5e8ae7..f1c659fc 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -4,9 +4,6 @@ on: workflow_dispatch: push: branches: [ 'develop', 'main', 'releases/**' ] - pull_request: - # The branches below must be a subset of the branches above - branches: [ 'develop', 'main', 'releases/**' ] schedule: - cron: '0 2 * * 4' From 91ec89bcf9f56bfa6fdfea23f141fbd1b3c98e12 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Apr 2024 02:38:04 +0000 Subject: [PATCH 09/20] Bump org.springframework.boot:spring-boot-starter-parent Bumps [org.springframework.boot:spring-boot-starter-parent](https://github.com/spring-projects/spring-boot) from 3.2.4 to 3.2.5. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.2.4...v3.2.5) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-starter-parent dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 62709a7b..3aba902a 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.4 + 3.2.5 From d43f9fcf19719a3f98dfe2ea84566a810e0d6f0a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Apr 2024 02:38:17 +0000 Subject: [PATCH 10/20] Bump org.openapitools:openapi-generator-maven-plugin from 7.4.0 to 7.5.0 Bumps org.openapitools:openapi-generator-maven-plugin from 7.4.0 to 7.5.0. --- updated-dependencies: - dependency-name: org.openapitools:openapi-generator-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 62709a7b..32fe66b9 100644 --- a/pom.xml +++ b/pom.xml @@ -88,7 +88,7 @@ - 7.4.0 + 7.5.0 5.13.0 4.0.0 From 6cb25f4f9c48693ffa59d370d8c212243cd67b4e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Apr 2024 02:38:42 +0000 Subject: [PATCH 11/20] Bump org.bouncycastle:bcprov-jdk18on from 1.78 to 1.78.1 Bumps [org.bouncycastle:bcprov-jdk18on](https://github.com/bcgit/bc-java) from 1.78 to 1.78.1. - [Changelog](https://github.com/bcgit/bc-java/blob/main/docs/releasenotes.html) - [Commits](https://github.com/bcgit/bc-java/commits) --- updated-dependencies: - dependency-name: org.bouncycastle:bcprov-jdk18on dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 62709a7b..4f404ec9 100644 --- a/pom.xml +++ b/pom.xml @@ -101,7 +101,7 @@ 1.8.0-SNAPSHOT 1.8.0-SNAPSHOT - 1.78 + 1.78.1 7.4 From c38ca4024fc8329c5d0be387a81d959e2be42c73 Mon Sep 17 00:00:00 2001 From: Lubos Racansky Date: Fri, 26 Apr 2024 17:48:08 +0200 Subject: [PATCH 12/20] Fix #1057: Improve WildFly documentation and configuration --- docs/Deploying-Wildfly.md | 18 ++++++++---------- docs/onboarding/Deploying-Wildfly.md | 18 ++++++++---------- enrollment-server-onboarding/pom.xml | 13 ------------- .../src/main/resources/application.properties | 3 +++ .../WEB-INF/jboss-deployment-structure.xml | 7 +------ enrollment-server/pom.xml | 13 ------------- .../src/main/resources/application.properties | 4 +++- .../WEB-INF/jboss-deployment-structure.xml | 7 +------ 8 files changed, 24 insertions(+), 59 deletions(-) diff --git a/docs/Deploying-Wildfly.md b/docs/Deploying-Wildfly.md index 8ae428d3..6f1e8098 100644 --- a/docs/Deploying-Wildfly.md +++ b/docs/Deploying-Wildfly.md @@ -6,18 +6,13 @@ Enrollment Server contains the following configuration in `jboss-deployment-stru ``` - + - - - - - @@ -85,6 +80,9 @@ Use the `logback.xml` file to configure logging, for example: The `application-ext.properties` file is used to override default configuration properties, for example: ``` +# Database Configuration +spring.datasource.jndi-name=java:/jdbc/powerauth + # PowerAuth Client configuration powerauth.service.url=https://[host]:[port]/powerauth-java-server/rest @@ -92,8 +90,8 @@ powerauth.service.url=https://[host]:[port]/powerauth-java-server/rest powerauth.push.service.url=https://[host]:[port]/powerauth-push-server ``` -Enrollment Server Spring application uses the `ext` Spring profile which activates overriding of default properties by `application-ext.properties`. +Mind that you should specify `spring.datasource.jndi-name` to use the application server datasource (its declaration is out of the scope of this guideline). +When configure `spring.datasource.url`, the hikari connection pool is used. +Spring Boot running on WildFly or JBoos initializes [JtaTransactionManager](https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/transaction/jta/JtaTransactionManager.html). -### Bouncy Castle Installation - -Since Enrollment Server in version `1.1.x`, installing the Bouncy Castle into Wildfy Server is no longer required. The latest version is bundled with the app and cryptographic primitives should work out of the box. +Enrollment Server Spring application uses the `ext` Spring profile which activates overriding of default properties by `application-ext.properties`. diff --git a/docs/onboarding/Deploying-Wildfly.md b/docs/onboarding/Deploying-Wildfly.md index b2653251..0fbd94e3 100644 --- a/docs/onboarding/Deploying-Wildfly.md +++ b/docs/onboarding/Deploying-Wildfly.md @@ -6,18 +6,13 @@ Enrollment Server contains the following configuration in `jboss-deployment-stru ``` - + - - - - - @@ -85,6 +80,9 @@ Use the `logback.xml` file to configure logging, for example: The `application-ext.properties` file is used to override default configuration properties, for example: ``` +# Database Configuration +spring.datasource.jndi-name=java:/jdbc/powerauth + # PowerAuth Client configuration powerauth.service.url=https://[host]:[port]/powerauth-java-server/rest @@ -92,8 +90,8 @@ powerauth.service.url=https://[host]:[port]/powerauth-java-server/rest powerauth.push.service.url=https://[host]:[port]/powerauth-push-server ``` -Onboarding Server Spring application uses the `ext` Spring profile which activates overriding of default properties by `application-ext.properties`. +Mind that you should specify `spring.datasource.jndi-name` to use the application server datasource (its declaration is out of the scope of this guideline). +When configure `spring.datasource.url`, the hikari connection pool is used. +Spring Boot running on WildFly or JBoos initializes [JtaTransactionManager](https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/transaction/jta/JtaTransactionManager.html). -### Bouncy Castle Installation - -Installing the Bouncy Castle into Wildfy Server is not required. The latest version is bundled with the app and cryptographic primitives should work out of the box. +Onboarding Server Spring application uses the `ext` Spring profile which activates overriding of default properties by `application-ext.properties`. diff --git a/enrollment-server-onboarding/pom.xml b/enrollment-server-onboarding/pom.xml index 64b7a97f..aeaaa64c 100644 --- a/enrollment-server-onboarding/pom.xml +++ b/enrollment-server-onboarding/pom.xml @@ -224,19 +224,6 @@ - - org.apache.maven.plugins - maven-war-plugin - - - - src/main/webapp/WEB-INF - WEB-INF - true - - - - diff --git a/enrollment-server-onboarding/src/main/resources/application.properties b/enrollment-server-onboarding/src/main/resources/application.properties index e937a6ae..36f0267b 100644 --- a/enrollment-server-onboarding/src/main/resources/application.properties +++ b/enrollment-server-onboarding/src/main/resources/application.properties @@ -213,3 +213,6 @@ management.tracing.sampling.probability=1.0 #management.endpoints.web.exposure.include=health, prometheus #management.endpoint.prometheus.enabled=true #management.prometheus.metrics.export.enabled=true + +spring.autoconfigure.exclude=\ + org.springframework.boot.actuate.autoconfigure.metrics.jersey.JerseyServerMetricsAutoConfiguration diff --git a/enrollment-server-onboarding/src/main/webapp/WEB-INF/jboss-deployment-structure.xml b/enrollment-server-onboarding/src/main/webapp/WEB-INF/jboss-deployment-structure.xml index ed6a86c0..2fa01230 100644 --- a/enrollment-server-onboarding/src/main/webapp/WEB-INF/jboss-deployment-structure.xml +++ b/enrollment-server-onboarding/src/main/webapp/WEB-INF/jboss-deployment-structure.xml @@ -1,16 +1,11 @@ - + - - - - - diff --git a/enrollment-server/pom.xml b/enrollment-server/pom.xml index 55d3845d..8a14c040 100644 --- a/enrollment-server/pom.xml +++ b/enrollment-server/pom.xml @@ -202,19 +202,6 @@ - - org.apache.maven.plugins - maven-war-plugin - - - - src/main/webapp/WEB-INF - WEB-INF - true - - - - diff --git a/enrollment-server/src/main/resources/application.properties b/enrollment-server/src/main/resources/application.properties index 195eaa2b..9ffb211b 100644 --- a/enrollment-server/src/main/resources/application.properties +++ b/enrollment-server/src/main/resources/application.properties @@ -104,4 +104,6 @@ management.tracing.sampling.probability=1.0 #management.endpoint.prometheus.enabled=true #management.prometheus.metrics.export.enabled=true -spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.security.servlet.UserDetailsServiceAutoConfiguration +spring.autoconfigure.exclude=\ + org.springframework.boot.autoconfigure.security.servlet.UserDetailsServiceAutoConfiguration,\ + org.springframework.boot.actuate.autoconfigure.metrics.jersey.JerseyServerMetricsAutoConfiguration diff --git a/enrollment-server/src/main/webapp/WEB-INF/jboss-deployment-structure.xml b/enrollment-server/src/main/webapp/WEB-INF/jboss-deployment-structure.xml index fe707a2a..2a4d8818 100644 --- a/enrollment-server/src/main/webapp/WEB-INF/jboss-deployment-structure.xml +++ b/enrollment-server/src/main/webapp/WEB-INF/jboss-deployment-structure.xml @@ -1,16 +1,11 @@ - + - - - - - From 58e36734424b3c5db125e6e5e9d02fd8f0c61be1 Mon Sep 17 00:00:00 2001 From: Lubos Racansky Date: Mon, 22 Apr 2024 12:43:07 +0200 Subject: [PATCH 13/20] Fix #1055: Refactor BouncyCastle dependency Use transient dependency from `powerauth-crypto` --- enrollment-server-onboarding-domain-model/pom.xml | 6 ------ enrollment-server-onboarding/pom.xml | 6 ------ enrollment-server/pom.xml | 6 ------ pom.xml | 8 -------- 4 files changed, 26 deletions(-) diff --git a/enrollment-server-onboarding-domain-model/pom.xml b/enrollment-server-onboarding-domain-model/pom.xml index 170d0dc1..18d0612e 100644 --- a/enrollment-server-onboarding-domain-model/pom.xml +++ b/enrollment-server-onboarding-domain-model/pom.xml @@ -39,12 +39,6 @@ powerauth-java-crypto - - - org.bouncycastle - bcprov-jdk18on - - org.springframework.boot diff --git a/enrollment-server-onboarding/pom.xml b/enrollment-server-onboarding/pom.xml index aeaaa64c..908b9b5e 100644 --- a/enrollment-server-onboarding/pom.xml +++ b/enrollment-server-onboarding/pom.xml @@ -76,12 +76,6 @@ http-common - - - org.bouncycastle - bcprov-jdk18on - - org.springframework.boot diff --git a/enrollment-server/pom.xml b/enrollment-server/pom.xml index 8a14c040..f6a72ce3 100644 --- a/enrollment-server/pom.xml +++ b/enrollment-server/pom.xml @@ -70,12 +70,6 @@ http-common - - - org.bouncycastle - bcprov-jdk18on - - org.springframework.boot diff --git a/pom.xml b/pom.xml index 797c5f27..8e898490 100644 --- a/pom.xml +++ b/pom.xml @@ -101,7 +101,6 @@ 1.8.0-SNAPSHOT 1.8.0-SNAPSHOT - 1.78.1 7.4 @@ -227,13 +226,6 @@ ${swagger-annotations-jakarta.version} - - - org.bouncycastle - bcprov-jdk18on - ${bcprov-jdk18on.version} - - net.logstash.logback From 0f57c6ddd86197c64d5dbaddfcd6320bd462842b Mon Sep 17 00:00:00 2001 From: Lubos Racansky Date: Thu, 16 May 2024 08:40:08 +0200 Subject: [PATCH 14/20] Add dependabot configuration for github-actions --- .github/dependabot.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 81dcf707..4452a25a 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -9,3 +9,8 @@ updates: directory: "/" schedule: interval: "weekly" + - package-ecosystem: "github-actions" + # Workflow files stored in the default location of `.github/workflows`. (You don't need to specify `/.github/workflows` for `directory`. You can use `directory: "/"`.) + directory: "/" + schedule: + interval: "weekly" From c363a74f5555c8a8f1ba7126b2acff558a7749d6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 May 2024 09:05:44 +0000 Subject: [PATCH 15/20] Bump io.swagger.core.v3:swagger-annotations-jakarta Bumps io.swagger.core.v3:swagger-annotations-jakarta from 2.2.21 to 2.2.22. --- updated-dependencies: - dependency-name: io.swagger.core.v3:swagger-annotations-jakarta dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8e898490..8681af27 100644 --- a/pom.xml +++ b/pom.xml @@ -92,7 +92,7 @@ 5.13.0 4.0.0 - 2.2.21 + 2.2.22 2.5.0 1.4.4 From 8e0182b76379a642599a1b9fe841f6af70b01c9a Mon Sep 17 00:00:00 2001 From: Lubos Racansky Date: Thu, 23 May 2024 14:26:21 +0200 Subject: [PATCH 16/20] Fix #1061: Repair link on Developer portal --- docs/_Sidebar.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/_Sidebar.md b/docs/_Sidebar.md index 4a723510..dd0ae146 100644 --- a/docs/_Sidebar.md +++ b/docs/_Sidebar.md @@ -17,5 +17,5 @@ **Implementation Tutorials** -- [Authentication in Mobile Banking Apps (SCA)](https://developers.wultra.com/products/mobile-security-suite/develop/tutorials/Authentication-in-Mobile-Apps) -- [Verifying PowerAuth Signatures On The Server](https://developers.wultra.com/products/mobile-security-suite/develop/tutorials/Manual-Signature-Verification) +- [Authentication in Mobile Banking Apps (SCA)](https://developers.wultra.com/tutorials/posts/Mobile-First-Authentication/) +- [Verifying PowerAuth Signatures On The Server](https://developers.wultra.com/tutorials/posts/Manual-Signature-Verification/) From 8ed9d283c28576eeac592ef6947f3a026b0c80a7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 May 2024 02:31:45 +0000 Subject: [PATCH 17/20] Bump org.springframework.boot:spring-boot-starter-parent Bumps [org.springframework.boot:spring-boot-starter-parent](https://github.com/spring-projects/spring-boot) from 3.2.5 to 3.3.0. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.2.5...v3.3.0) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-starter-parent dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8681af27..d1ec4cd9 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.5 + 3.3.0 From c99cdd57aa75ec3f529f9ea1fe6b51c9fc3157aa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 May 2024 02:32:03 +0000 Subject: [PATCH 18/20] Bump org.openapitools:openapi-generator-maven-plugin from 7.5.0 to 7.6.0 Bumps org.openapitools:openapi-generator-maven-plugin from 7.5.0 to 7.6.0. --- updated-dependencies: - dependency-name: org.openapitools:openapi-generator-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8681af27..574651c9 100644 --- a/pom.xml +++ b/pom.xml @@ -88,7 +88,7 @@ - 7.5.0 + 7.6.0 5.13.0 4.0.0 From 69003e9d7b7f0d39ec18bddf825a953c908025b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Ra=C4=8Dansk=C3=BD?= Date: Fri, 31 May 2024 07:06:59 +0200 Subject: [PATCH 19/20] Fix #1069: Name Hikari Pool (#1070) * Fix #1069: Name Hikari Pool --- .../src/main/resources/application.properties | 1 + enrollment-server/src/main/resources/application.properties | 1 + 2 files changed, 2 insertions(+) diff --git a/enrollment-server-onboarding/src/main/resources/application.properties b/enrollment-server-onboarding/src/main/resources/application.properties index 36f0267b..21597928 100644 --- a/enrollment-server-onboarding/src/main/resources/application.properties +++ b/enrollment-server-onboarding/src/main/resources/application.properties @@ -29,6 +29,7 @@ spring.datasource.url=jdbc:postgresql://localhost:5432/powerauth spring.datasource.username=powerauth spring.datasource.password= spring.datasource.hikari.auto-commit=false +spring.datasource.hikari.pool-name=HikariPool-Enrollment-Server-Onboarding spring.jpa.properties.hibernate.connection.characterEncoding=utf8 spring.jpa.properties.hibernate.connection.useUnicode=true diff --git a/enrollment-server/src/main/resources/application.properties b/enrollment-server/src/main/resources/application.properties index 9ffb211b..c0cb052d 100644 --- a/enrollment-server/src/main/resources/application.properties +++ b/enrollment-server/src/main/resources/application.properties @@ -29,6 +29,7 @@ spring.datasource.url=jdbc:postgresql://localhost:5432/powerauth spring.datasource.username=powerauth spring.datasource.password= spring.datasource.hikari.auto-commit=false +spring.datasource.hikari.pool-name=HikariPool-Enrollment-Server spring.jpa.properties.hibernate.connection.characterEncoding=utf8 spring.jpa.properties.hibernate.connection.useUnicode=true From 94821c68af84ab457a9af01162bb6367ebd076f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Ra=C4=8Dansk=C3=BD?= Date: Fri, 31 May 2024 07:44:36 +0200 Subject: [PATCH 20/20] Fix #1067: Add STATUS_REASON to operations for Cancel of the operation (#1068) * Fix #1067: Add STATUS_REASON to operations for Cancel of the operation --- .../service/converter/MobileTokenConverter.java | 1 + .../lib/mtoken/model/entity/Operation.java | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/enrollment-server/src/main/java/com/wultra/app/enrollmentserver/impl/service/converter/MobileTokenConverter.java b/enrollment-server/src/main/java/com/wultra/app/enrollmentserver/impl/service/converter/MobileTokenConverter.java index 2bd4b8cf..98b574cb 100644 --- a/enrollment-server/src/main/java/com/wultra/app/enrollmentserver/impl/service/converter/MobileTokenConverter.java +++ b/enrollment-server/src/main/java/com/wultra/app/enrollmentserver/impl/service/converter/MobileTokenConverter.java @@ -103,6 +103,7 @@ public Operation convert(OperationDetailResponse operationDetail, OperationTempl operation.setOperationCreated(operationDetail.getTimestampCreated()); operation.setOperationExpires(operationDetail.getTimestampExpires()); operation.setStatus(operationDetail.getStatus().name()); + operation.setStatusReason(operationDetail.getStatusReason()); operation.setUi(uiExtensions); operation.setFormData(formData); diff --git a/mtoken-model/src/main/java/com/wultra/security/powerauth/lib/mtoken/model/entity/Operation.java b/mtoken-model/src/main/java/com/wultra/security/powerauth/lib/mtoken/model/entity/Operation.java index f7205f23..294efec2 100644 --- a/mtoken-model/src/main/java/com/wultra/security/powerauth/lib/mtoken/model/entity/Operation.java +++ b/mtoken-model/src/main/java/com/wultra/security/powerauth/lib/mtoken/model/entity/Operation.java @@ -17,7 +17,9 @@ */ package com.wultra.security.powerauth.lib.mtoken.model.entity; +import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import lombok.Data; import java.util.Date; @@ -37,6 +39,20 @@ public class Operation { @NotNull private String data; private String status; + + /** + * Optional details why the status has changed by backend services. + * The value should be sent in the form of a computer-readable code, not a free-form text. + * Mind that it differs from {@code reason} at the cancel request filled by the user. + */ + @Schema(description = """ + Optional details why the status has changed by backend services. + The value should be sent in the form of a computer-readable code, not a free-form text. + Mind that it differs from `reason` at the cancel request filled by the user. + """) + @Size(max = 32) + private String statusReason; + private Date operationCreated; private Date operationExpires; private UiExtensions ui;