Merge pull request #147 from wultra/issues/merge-upstream

Merge upstream
wultra · Aug 7, 2024 · 19e78b3 · 19e78b3
2 parents 54d2a3e + 208eb8b
commit 19e78b3
Show file tree

Hide file tree

Showing 17 changed files with 39 additions and 28 deletions.
diff --git a/docs/db/changelog/changesets/enrollment-server/1.8.x/20240625-add-tag-1.8.0.xml b/docs/db/changelog/changesets/enrollment-server/1.8.x/20240625-add-tag-1.8.0.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.9.xsd">
+
+    <changeSet id="1" logicalFilePath="enrollment-server/1.8.x/20240625-add-tag-1.8.0.xml" author="Lubos Racansky">
+        <tagDatabase tag="enrollment-server/1.8.0"/>
+    </changeSet>
+
+</databaseChangeLog>
diff --git a/docs/db/changelog/changesets/enrollment-server/1.8.x/db.changelog-version.xml b/docs/db/changelog/changesets/enrollment-server/1.8.x/db.changelog-version.xml
@@ -4,5 +4,6 @@
                    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.9.xsd">
 
     <include file="20240620-add-resultTexts.xml" relativeToChangelogFile="true" />
+    <include file="20240625-add-tag-1.8.0.xml" relativeToChangelogFile="true" />
 
 </databaseChangeLog>
diff --git a/enrollment-server-api-model/pom.xml b/enrollment-server-api-model/pom.xml
@@ -30,7 +30,7 @@
     <parent>
         <groupId>com.wultra.security</groupId>
         <artifactId>enrollment-server-parent</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>1.9.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>

diff --git a/enrollment-server-onboarding-adapter-mock/pom.xml b/enrollment-server-onboarding-adapter-mock/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>com.wultra.security</groupId>
         <artifactId>enrollment-server-parent</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>1.9.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>enrollment-server-onboarding-adapter-mock</artifactId>

diff --git a/enrollment-server-onboarding-api-model/pom.xml b/enrollment-server-onboarding-api-model/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.wultra.security</groupId>
         <artifactId>enrollment-server-parent</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>1.9.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>enrollment-server-onboarding-api-model</artifactId>

diff --git a/enrollment-server-onboarding-api/pom.xml b/enrollment-server-onboarding-api/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>com.wultra.security</groupId>
         <artifactId>enrollment-server-parent</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>1.9.0-SNAPSHOT</version>
     </parent>
 
     <groupId>com.wultra.security</groupId>

diff --git a/enrollment-server-onboarding-common/pom.xml b/enrollment-server-onboarding-common/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>com.wultra.security</groupId>
         <artifactId>enrollment-server-parent</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>1.9.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>enrollment-server-onboarding-common</artifactId>

diff --git a/enrollment-server-onboarding-domain-model/pom.xml b/enrollment-server-onboarding-domain-model/pom.xml
@@ -30,7 +30,7 @@
     <parent>
         <groupId>com.wultra.security</groupId>
         <artifactId>enrollment-server-parent</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>1.9.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>

diff --git a/enrollment-server-onboarding-provider-innovatrics/pom.xml b/enrollment-server-onboarding-provider-innovatrics/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>com.wultra.security</groupId>
         <artifactId>enrollment-server-parent</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>1.9.0-SNAPSHOT</version>
     </parent>
 
     <groupId>com.wultra.security</groupId>
@@ -76,12 +76,12 @@
                             <generateModelDocumentation>false</generateModelDocumentation>
                             <generateModels>true</generateModels>
                             <generateModelTests>false</generateModelTests>
-                            <generateSupportingFiles>false</generateSupportingFiles>
                             <configOptions>
                                 <library>native</library>
                                 <hideGenerationTimestamp>true</hideGenerationTimestamp>
                                 <modelPackage>com.wultra.app.onboardingserver.provider.innovatrics.model.api</modelPackage>
                                 <useJakartaEe>true</useJakartaEe>
+                                <openApiNullable>false</openApiNullable>
                             </configOptions>
                         </configuration>
                     </execution>

diff --git a/enrollment-server-onboarding-provider-iproov/pom.xml b/enrollment-server-onboarding-provider-iproov/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>com.wultra.security</groupId>
         <artifactId>enrollment-server-parent</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>1.9.0-SNAPSHOT</version>
     </parent>
 
     <groupId>com.wultra.security</groupId>
@@ -75,13 +75,13 @@
                             <generateModelDocumentation>false</generateModelDocumentation>
                             <generateModels>true</generateModels>
                             <generateModelTests>false</generateModelTests>
-                            <generateSupportingFiles>false</generateSupportingFiles>
                             <skipValidateSpec>true</skipValidateSpec>
                             <configOptions>
                                 <library>native</library>
                                 <hideGenerationTimestamp>true</hideGenerationTimestamp>
                                 <modelPackage>com.wultra.app.onboardingserver.provider.iproov.model.api</modelPackage>
                                 <useJakartaEe>true</useJakartaEe>
+                                <openApiNullable>false</openApiNullable>
                             </configOptions>
                         </configuration>
                     </execution>

diff --git a/enrollment-server-onboarding-provider-zenid/pom.xml b/enrollment-server-onboarding-provider-zenid/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>com.wultra.security</groupId>
         <artifactId>enrollment-server-parent</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>1.9.0-SNAPSHOT</version>
     </parent>
 
     <groupId>com.wultra.security</groupId>
@@ -76,13 +76,13 @@
                             <generateModelDocumentation>false</generateModelDocumentation>
                             <generateModels>true</generateModels>
                             <generateModelTests>false</generateModelTests>
-                            <generateSupportingFiles>false</generateSupportingFiles>
                             <skipValidateSpec>true</skipValidateSpec>
                             <configOptions>
                                 <library>native</library>
                                 <hideGenerationTimestamp>true</hideGenerationTimestamp>
                                 <modelPackage>com.wultra.app.onboardingserver.provider.zenid.model.api</modelPackage>
                                 <useJakartaEe>true</useJakartaEe>
+                                <openApiNullable>false</openApiNullable>
                             </configOptions>
                         </configuration>
                     </execution>

diff --git a/...ava/com/wultra/app/onboardingserver/provider/zenid/ZenidDocumentVerificationProvider.java b/...ava/com/wultra/app/onboardingserver/provider/zenid/ZenidDocumentVerificationProvider.java
@@ -297,7 +297,7 @@ public void cleanupDocuments(OwnerId id, List<String> uploadIds) throws RemoteCo
             }
             handleLicenceError(response.getErrorCode(), response.getErrorText());
 
-            if (ZenidWebDeleteSampleResponse.ErrorCodeEnum.UNKNOWNSAMPLEID.equals(response.getErrorCode())) {
+            if (ZenidWebDeleteSampleResponse.ErrorCodeEnum.UNKNOWN_SAMPLE_ID.equals(response.getErrorCode())) {
                 logger.info("Cleanup of an unknown document with uploadId={}", uploadId);
             } else if (response.getErrorCode() != null) {
                 throw new DocumentVerificationException(
@@ -387,7 +387,7 @@ private DocumentSubmitResult createDocumentSubmitResult(OwnerId id,
                 logger.info("No data extracted from {} in ZenID, defaulting to empty json data, {}", uploadContext, id);
                 documentSubmitResult.setExtractedData(DocumentSubmitResult.NO_DATA_EXTRACTED);
             }
-        } else if (state == ZenidWebUploadSampleResponse.StateEnum.NOTDONE) {
+        } else if (state == ZenidWebUploadSampleResponse.StateEnum.NOT_DONE) {
             logger.debug("Document upload of {} is still in progress in ZenID, {}", uploadContext, id);
         } else if (state == ZenidWebUploadSampleResponse.StateEnum.REJECTED) {
             logger.debug("Document upload of {} is rejected in ZenID, {}, {}", uploadContext, response.getErrorText(), id);
@@ -572,7 +572,7 @@ private DocumentVerificationStatus toStatus(ZenidWebInvestigateResponse.StateEnu
         return switch (stateEnum) {
             case DONE, ARCHIVED -> DocumentVerificationStatus.ACCEPTED;
             case ERROR -> DocumentVerificationStatus.FAILED;
-            case NOTDONE, OPERATOR -> DocumentVerificationStatus.IN_PROGRESS;
+            case NOT_DONE, OPERATOR -> DocumentVerificationStatus.IN_PROGRESS;
             case REJECTED -> DocumentVerificationStatus.REJECTED;
         };
     }

diff --git a/...nid/src/main/java/com/wultra/app/onboardingserver/provider/zenid/ZenidRestApiService.java b/...nid/src/main/java/com/wultra/app/onboardingserver/provider/zenid/ZenidRestApiService.java
@@ -287,7 +287,7 @@ private ZenidSharedMineAllResult.PageCodeEnum toPageCodeEnum(CardSide cardSide)
 
     private ZenidWebUploadSampleResponse.SampleTypeEnum toSampleType(DocumentType type) {
         return switch (type) {
-            case ID_CARD, DRIVING_LICENSE, PASSPORT -> ZenidWebUploadSampleResponse.SampleTypeEnum.DOCUMENTPICTURE;
+            case ID_CARD, DRIVING_LICENSE, PASSPORT -> ZenidWebUploadSampleResponse.SampleTypeEnum.DOCUMENT_PICTURE;
             case SELFIE_PHOTO -> ZenidWebUploadSampleResponse.SampleTypeEnum.SELFIE;
             default -> throw new IllegalStateException("Not supported documentType: " + type);
         };

diff --git a/enrollment-server-onboarding/pom.xml b/enrollment-server-onboarding/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>com.wultra.security</groupId>
         <artifactId>enrollment-server-parent</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>1.9.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>

diff --git a/enrollment-server/pom.xml b/enrollment-server/pom.xml
@@ -30,7 +30,7 @@
     <parent>
         <groupId>com.wultra.security</groupId>
         <artifactId>enrollment-server-parent</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>1.9.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>

diff --git a/mtoken-model/pom.xml b/mtoken-model/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>com.wultra.security</groupId>
         <artifactId>enrollment-server-parent</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>1.9.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>

diff --git a/pom.xml b/pom.xml
@@ -26,13 +26,13 @@
 
     <groupId>com.wultra.security</groupId>
     <artifactId>enrollment-server-parent</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>1.9.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.3.1</version>
+        <version>3.3.2</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
@@ -88,18 +88,18 @@
     </modules>
 
     <properties>
-        <openapi-generator-maven-plugin.version>7.6.0</openapi-generator-maven-plugin.version>
+        <openapi-generator-maven-plugin.version>7.7.0</openapi-generator-maven-plugin.version>
 
-        <shedlock.version>5.13.0</shedlock.version>
+        <shedlock.version>5.14.0</shedlock.version>
         <spring-statemachine.version>4.0.0</spring-statemachine.version>
         <swagger-annotations-jakarta.version>2.2.22</swagger-annotations-jakarta.version>
-        <springdoc-openapi-starter-webmvc-ui.version>2.5.0</springdoc-openapi-starter-webmvc-ui.version>
+        <springdoc-openapi-starter-webmvc-ui.version>2.6.0</springdoc-openapi-starter-webmvc-ui.version>
         <moneta.version>1.4.4</moneta.version>
 
-        <wultra-core.version>1.10.0-SNAPSHOT</wultra-core.version>
-        <powerauth-crypto.version>1.8.0-SNAPSHOT</powerauth-crypto.version>
-        <powerauth-restful-integration.version>1.8.0-SNAPSHOT</powerauth-restful-integration.version>
-        <powerauth-push.version>1.8.0-SNAPSHOT</powerauth-push.version>
+        <wultra-core.version>1.11.0-SNAPSHOT</wultra-core.version>
+        <powerauth-crypto.version>1.9.0-SNAPSHOT</powerauth-crypto.version>
+        <powerauth-restful-integration.version>1.9.0-SNAPSHOT</powerauth-restful-integration.version>
+        <powerauth-push.version>1.9.0-SNAPSHOT</powerauth-push.version>
 
         <logstash.version>7.4</logstash.version>
     </properties>