From 9fb14497fc0991c0e70e99017894f56c632c97a4 Mon Sep 17 00:00:00 2001 From: Jan Dusil <134381434+jandusil@users.noreply.github.com> Date: Tue, 6 Feb 2024 10:57:18 +0100 Subject: [PATCH 01/16] Fix #298: Add TraceID/SpanID to Monitoring for Enhanced Observability (#299) --- powerauth-data-adapter/pom.xml | 19 +++++++++++++++++++ .../src/main/resources/application.properties | 3 +++ 2 files changed, 22 insertions(+) diff --git a/powerauth-data-adapter/pom.xml b/powerauth-data-adapter/pom.xml index 63cbaf9..36168a8 100644 --- a/powerauth-data-adapter/pom.xml +++ b/powerauth-data-adapter/pom.xml @@ -161,6 +161,25 @@ springdoc-openapi-starter-webmvc-ui ${springdoc-openapi-starter-webmvc-ui.version} + + + + io.projectreactor + reactor-core-micrometer + + + + io.micrometer + micrometer-tracing-bridge-otel + + + + + io.netty + netty-resolver-dns-native-macos + runtime + osx-aarch_64 + diff --git a/powerauth-data-adapter/src/main/resources/application.properties b/powerauth-data-adapter/src/main/resources/application.properties index d785faf..bbcd4f8 100644 --- a/powerauth-data-adapter/src/main/resources/application.properties +++ b/powerauth-data-adapter/src/main/resources/application.properties @@ -42,3 +42,6 @@ banner.application.version=@project.version@ springdoc.swagger-ui.disable-swagger-default-url=true logging.config=${POWERAUTH_DATA_ADAPTER_LOGGING:} + +# Monitoring +management.tracing.sampling.probability=1.0 \ No newline at end of file From b2c15fecbac7665c90fc9c87f4281191ac026279 Mon Sep 17 00:00:00 2001 From: Jan Dusil <134381434+jandusil@users.noreply.github.com> Date: Tue, 6 Feb 2024 11:51:52 +0100 Subject: [PATCH 02/16] Fix #300: Remove spring.datasource.driverClassName from app props (#301) --- .../src/main/resources/application.properties | 2 -- 1 file changed, 2 deletions(-) diff --git a/powerauth-data-adapter/src/main/resources/application.properties b/powerauth-data-adapter/src/main/resources/application.properties index bbcd4f8..20762ab 100644 --- a/powerauth-data-adapter/src/main/resources/application.properties +++ b/powerauth-data-adapter/src/main/resources/application.properties @@ -6,7 +6,6 @@ spring.datasource.url=jdbc:postgresql://localhost:5432/powerauth spring.datasource.username=powerauth spring.datasource.password= spring.datasource.hikari.auto-commit=false -spring.datasource.driver-class-name=org.postgresql.Driver spring.jpa.properties.hibernate.connection.characterEncoding=utf8 spring.jpa.properties.hibernate.connection.useUnicode=true @@ -14,7 +13,6 @@ spring.jpa.properties.hibernate.connection.useUnicode=true #spring.datasource.url=jdbc:oracle:thin:@//localhost:1521/powerauth #spring.datasource.username=powerauth #spring.datasource.password= -#spring.datasource.driver-class-name=oracle.jdbc.OracleDriver # The following property speeds up Spring Boot startup # SMS OTP expiration time in seconds From 3c898042f17b21657c5f43b5f1d6f17913738442 Mon Sep 17 00:00:00 2001 From: Lubos Racansky Date: Tue, 13 Feb 2024 08:54:39 +0100 Subject: [PATCH 03/16] Fix #302: Warning: Using generated security password --- .../src/main/resources/application.properties | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/powerauth-data-adapter/src/main/resources/application.properties b/powerauth-data-adapter/src/main/resources/application.properties index 20762ab..f0f568a 100644 --- a/powerauth-data-adapter/src/main/resources/application.properties +++ b/powerauth-data-adapter/src/main/resources/application.properties @@ -42,4 +42,6 @@ springdoc.swagger-ui.disable-swagger-default-url=true logging.config=${POWERAUTH_DATA_ADAPTER_LOGGING:} # Monitoring -management.tracing.sampling.probability=1.0 \ No newline at end of file +management.tracing.sampling.probability=1.0 + +spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.security.servlet.UserDetailsServiceAutoConfiguration From c2755677490eafcc0d0bf463aa01a3fa663d42c4 Mon Sep 17 00:00:00 2001 From: Lubos Racansky Date: Tue, 13 Feb 2024 08:59:19 +0100 Subject: [PATCH 04/16] Fix #304: Set develop version to 1.7.0-SNAPSHOT --- powerauth-data-adapter/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/powerauth-data-adapter/pom.xml b/powerauth-data-adapter/pom.xml index 36168a8..f8a8c32 100644 --- a/powerauth-data-adapter/pom.xml +++ b/powerauth-data-adapter/pom.xml @@ -5,7 +5,7 @@ powerauth-data-adapter io.getlime.security - 1.6.0 + 1.7.0-SNAPSHOT war powerauth-data-adapter @@ -68,8 +68,8 @@ 1.4.14 - 1.6.0 - 1.6.0 + 1.7.0-SNAPSHOT + 1.7.0-SNAPSHOT From 060a58bd5c08b4355be3da6ba0ca34164825bd97 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 13 Feb 2024 08:00:42 +0000 Subject: [PATCH 05/16] 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.1.6 to 3.2.2. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.1.6...v3.2.2) --- 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] --- powerauth-data-adapter/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/powerauth-data-adapter/pom.xml b/powerauth-data-adapter/pom.xml index 36168a8..391b9eb 100644 --- a/powerauth-data-adapter/pom.xml +++ b/powerauth-data-adapter/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.6 + 3.2.2 From c262ee3340040d3d4e6463fab6a341bb21cff3db Mon Sep 17 00:00:00 2001 From: Lubos Racansky Date: Tue, 13 Feb 2024 09:03:12 +0100 Subject: [PATCH 06/16] Revert "Fix #288: Update logback" This reverts commit d0db254b076d3c18d2b493f34b9c7bfb9b64cf54. --- powerauth-data-adapter/pom.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/powerauth-data-adapter/pom.xml b/powerauth-data-adapter/pom.xml index 391b9eb..824cd7e 100644 --- a/powerauth-data-adapter/pom.xml +++ b/powerauth-data-adapter/pom.xml @@ -65,8 +65,6 @@ 2.3.0 7.4 1.77 - - 1.4.14 1.6.0 1.6.0 From 901724a942e1da211c33a2f53c7da47e81c65108 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 23 Feb 2024 06:00:58 +0000 Subject: [PATCH 07/16] 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.2 to 3.2.3. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.2.2...v3.2.3) --- 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] --- powerauth-data-adapter/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/powerauth-data-adapter/pom.xml b/powerauth-data-adapter/pom.xml index faef136..d14da82 100644 --- a/powerauth-data-adapter/pom.xml +++ b/powerauth-data-adapter/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.2 + 3.2.3 From 1223dbb0b54d19f72e90215adf377a100e0b5dbb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 10:36:35 +0000 Subject: [PATCH 08/16] Bump io.getlime.security:powerauth-java-crypto Bumps [io.getlime.security:powerauth-java-crypto](https://github.com/wultra/powerauth-crypto) from 1.7.0-SNAPSHOT to 1.7.0. - [Release notes](https://github.com/wultra/powerauth-crypto/releases) - [Changelog](https://github.com/wultra/powerauth-crypto/blob/develop/docs/Releases.md) - [Commits](https://github.com/wultra/powerauth-crypto/commits/1.7.0) --- updated-dependencies: - dependency-name: io.getlime.security:powerauth-java-crypto dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- powerauth-data-adapter/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/powerauth-data-adapter/pom.xml b/powerauth-data-adapter/pom.xml index d14da82..a431475 100644 --- a/powerauth-data-adapter/pom.xml +++ b/powerauth-data-adapter/pom.xml @@ -66,7 +66,7 @@ 7.4 1.77 - 1.7.0-SNAPSHOT + 1.7.0 1.7.0-SNAPSHOT From 7c6f2f37ef620646cb56d70f2456c8210f3e91b4 Mon Sep 17 00:00:00 2001 From: Lubos Racansky Date: Tue, 5 Mar 2024 07:26:15 +0100 Subject: [PATCH 09/16] Fix #310: Set release version to 1.7.0 --- powerauth-data-adapter/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/powerauth-data-adapter/pom.xml b/powerauth-data-adapter/pom.xml index a431475..3f76c42 100644 --- a/powerauth-data-adapter/pom.xml +++ b/powerauth-data-adapter/pom.xml @@ -5,7 +5,7 @@ powerauth-data-adapter io.getlime.security - 1.7.0-SNAPSHOT + 1.7.0 war powerauth-data-adapter From 30c0cd9556b61ed849606a5c49f70bf4b44e692c Mon Sep 17 00:00:00 2001 From: Lubos Racansky Date: Thu, 7 Mar 2024 11:06:37 +0100 Subject: [PATCH 10/16] Update GitHub Actions to JDK 21 --- .github/workflows/codeql-analysis.yml | 3 ++- .github/workflows/coverity-scan.yml | 1 + .github/workflows/maven-deploy.yml | 2 ++ .github/workflows/maven-test.yml | 3 ++- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index c502bf2..27a8fda 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -19,4 +19,5 @@ jobs: # 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 \ No newline at end of file + # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support + java_version: 21 \ No newline at end of file diff --git a/.github/workflows/coverity-scan.yml b/.github/workflows/coverity-scan.yml index 9f03a71..b5eac97 100644 --- a/.github/workflows/coverity-scan.yml +++ b/.github/workflows/coverity-scan.yml @@ -15,3 +15,4 @@ jobs: version: ${{ github.sha }} description: ${{ github.ref }} directory_path: powerauth-data-adapter + java_version: 21 diff --git a/.github/workflows/maven-deploy.yml b/.github/workflows/maven-deploy.yml index baaacef..5ce1c9c 100644 --- a/.github/workflows/maven-deploy.yml +++ b/.github/workflows/maven-deploy.yml @@ -33,6 +33,7 @@ jobs: environment: internal-publish release_type: snapshot directory_path: powerauth-data-adapter + java_version: 21 secrets: username: ${{ secrets.MAVEN_CENTRAL_USERNAME }} password: ${{ secrets.MAVEN_CENTRAL_PASSWORD }} @@ -45,6 +46,7 @@ jobs: environment: ${{ inputs.environment }} release_type: ${{ inputs.release_type }} directory_path: powerauth-data-adapter + java_version: 21 secrets: username: ${{ secrets.MAVEN_CENTRAL_USERNAME }} password: ${{ secrets.MAVEN_CENTRAL_PASSWORD }} diff --git a/.github/workflows/maven-test.yml b/.github/workflows/maven-test.yml index 9d1ab18..6a13c21 100644 --- a/.github/workflows/maven-test.yml +++ b/.github/workflows/maven-test.yml @@ -17,4 +17,5 @@ jobs: uses: wultra/wultra-infrastructure/.github/workflows/maven-test.yml@develop secrets: inherit with: - directory_path: powerauth-data-adapter \ No newline at end of file + directory_path: powerauth-data-adapter + java_version: 21 \ No newline at end of file From 45f96986c0a8daa6501aa7b54386715dde8efc7b Mon Sep 17 00:00:00 2001 From: Lubos Racansky Date: Thu, 7 Mar 2024 11:08:32 +0100 Subject: [PATCH 11/16] Update GitHub Actions to checkout@v4, and setup-java@v4 --- .github/workflows/scp-deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/scp-deploy.yml b/.github/workflows/scp-deploy.yml index 98034c5..ad0a460 100644 --- a/.github/workflows/scp-deploy.yml +++ b/.github/workflows/scp-deploy.yml @@ -7,9 +7,9 @@ jobs: scp-deploy: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up JDK 21 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: 21 distribution: 'temurin' From 477ad849691bb57c906ecef77e0dc282665861ca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Mar 2024 11:00:53 +0000 Subject: [PATCH 12/16] Bump org.springdoc:springdoc-openapi-starter-webmvc-ui Bumps [org.springdoc:springdoc-openapi-starter-webmvc-ui](https://github.com/springdoc/springdoc-openapi) from 2.3.0 to 2.4.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.3.0...v2.4.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] --- powerauth-data-adapter/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/powerauth-data-adapter/pom.xml b/powerauth-data-adapter/pom.xml index a431475..ed37884 100644 --- a/powerauth-data-adapter/pom.xml +++ b/powerauth-data-adapter/pom.xml @@ -62,7 +62,7 @@ - 2.3.0 + 2.4.0 7.4 1.77 From bad34302b35b556d7e57018ada4324e762da55b6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Mar 2024 11:01:49 +0000 Subject: [PATCH 13/16] 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.3 to 3.2.4. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.2.3...v3.2.4) --- 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] --- powerauth-data-adapter/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/powerauth-data-adapter/pom.xml b/powerauth-data-adapter/pom.xml index ed37884..ea7cab1 100644 --- a/powerauth-data-adapter/pom.xml +++ b/powerauth-data-adapter/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.3 + 3.2.4 From c2d839d9d67295559e4fe617087640d3dfdd484d Mon Sep 17 00:00:00 2001 From: Lubos Racansky Date: Thu, 28 Mar 2024 07:51:19 +0100 Subject: [PATCH 14/16] Downgrade JDK for Coverity GHA to 17 --- .github/workflows/coverity-scan.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/coverity-scan.yml b/.github/workflows/coverity-scan.yml index b5eac97..9f03a71 100644 --- a/.github/workflows/coverity-scan.yml +++ b/.github/workflows/coverity-scan.yml @@ -15,4 +15,3 @@ jobs: version: ${{ github.sha }} description: ${{ github.ref }} directory_path: powerauth-data-adapter - java_version: 21 From b82063781f3874c7ab156e79c86cdfbfbbb32c59 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Apr 2024 10:16:55 +0000 Subject: [PATCH 15/16] 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] --- powerauth-data-adapter/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/powerauth-data-adapter/pom.xml b/powerauth-data-adapter/pom.xml index ea7cab1..b540539 100644 --- a/powerauth-data-adapter/pom.xml +++ b/powerauth-data-adapter/pom.xml @@ -62,7 +62,7 @@ - 2.4.0 + 2.5.0 7.4 1.77 From 9c496101e440acf41d5a28a3bfbb4464a345d2f9 Mon Sep 17 00:00:00 2001 From: Lubos Racansky Date: Tue, 5 Mar 2024 07:27:58 +0100 Subject: [PATCH 16/16] Fix #313: Update Wultra dependencies --- powerauth-data-adapter/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/powerauth-data-adapter/pom.xml b/powerauth-data-adapter/pom.xml index b540539..b95c08f 100644 --- a/powerauth-data-adapter/pom.xml +++ b/powerauth-data-adapter/pom.xml @@ -67,7 +67,7 @@ 1.77 1.7.0 - 1.7.0-SNAPSHOT + 1.7.0