Merge pull request #309 from wultra/develop

Merge develop to master
wultra · Apr 10, 2024 · 637f3b0 · 637f3b0
2 parents 2f0778f + 37b92f9
commit 637f3b0
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 13 deletions.
diff --git 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
+      # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+      java_version: 21
diff --git 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
@@ -17,4 +17,5 @@ jobs:
     uses: wultra/wultra-infrastructure/.github/workflows/maven-test.yml@develop
     secrets: inherit
     with:
-      directory_path: powerauth-data-adapter
+      directory_path: powerauth-data-adapter
+      java_version: 21
diff --git 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
@@ -5,7 +5,7 @@
 
     <artifactId>powerauth-data-adapter</artifactId>
     <groupId>io.getlime.security</groupId>
-    <version>1.6.0</version>
+    <version>1.7.0</version>
     <packaging>war</packaging>
 
     <name>powerauth-data-adapter</name>
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.1.6</version>
+        <version>3.2.4</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
@@ -62,14 +62,12 @@
     </issueManagement>
 
     <properties>
-        <springdoc-openapi-starter-webmvc-ui.version>2.3.0</springdoc-openapi-starter-webmvc-ui.version>
+        <springdoc-openapi-starter-webmvc-ui.version>2.5.0</springdoc-openapi-starter-webmvc-ui.version>
         <logstash.version>7.4</logstash.version>
         <bcprov-jdk18on.version>1.77</bcprov-jdk18on.version>
-        <!--  TODO (racansky, 2023-12-08) temporarily override the version 1.4.11 from spring boot version because of CVE  -->
-        <logback.version>1.4.14</logback.version>
 
-        <powerauth-crypto.version>1.6.0</powerauth-crypto.version>
-        <powerauth-webflow.version>1.6.0</powerauth-webflow.version>
+        <powerauth-crypto.version>1.7.0</powerauth-crypto.version>
+        <powerauth-webflow.version>1.7.0</powerauth-webflow.version>
     </properties>
 
     <dependencyManagement>
@@ -161,6 +159,25 @@
             <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
             <version>${springdoc-openapi-starter-webmvc-ui.version}</version>
         </dependency>
+
+        <!-- Monitoring -->
+        <dependency>
+            <groupId>io.projectreactor</groupId>
+            <artifactId>reactor-core-micrometer</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-tracing-bridge-otel</artifactId>
+        </dependency>
+
+        <!-- For run at Apple M1 architecture -->
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-resolver-dns-native-macos</artifactId>
+            <scope>runtime</scope>
+            <classifier>osx-aarch_64</classifier>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/powerauth-data-adapter/src/main/resources/application.properties b/powerauth-data-adapter/src/main/resources/application.properties
@@ -6,15 +6,13 @@ 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
 
 # Database Configuration - Oracle
 #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 @@ [email protected]@
 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