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/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 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' diff --git a/powerauth-data-adapter/pom.xml b/powerauth-data-adapter/pom.xml index 63cbaf9..c6a62ec 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 war powerauth-data-adapter @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.6 + 3.2.4 @@ -62,14 +62,12 @@ - 2.3.0 + 2.5.0 7.4 1.77 - - 1.4.14 - 1.6.0 - 1.6.0 + 1.7.0 + 1.7.0 @@ -161,6 +159,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..f0f568a 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 @@ -42,3 +40,8 @@ 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 + +spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.security.servlet.UserDetailsServiceAutoConfiguration