From 6f85644011c3950283d4e33f2da3b10880dd4370 Mon Sep 17 00:00:00 2001 From: Reguel Date: Fri, 29 Nov 2024 16:01:11 +0100 Subject: [PATCH] Migrate to 12.0.0 :camel: (#49) * Raise project to 12.0.0-SNAPSHOT * Update maven version to 12.0.0-SNAPSHOT * Raise project to 12.0.0-SNAPSHOT * Update maven version to 12.0.0-SNAPSHOT * Update workflow actions to v5 * migrate to v12 APIs * Fix warning in data class * Update template * Remove deprecated in test project --------- Co-authored-by: nqhoan-axonivy --- .github/workflows/ci.yml | 2 +- .github/workflows/dev.yml | 2 +- .github/workflows/release.yml | 2 +- a-trust-connector-demo/.project | 3 +- a-trust-connector-demo/.settings/.jsdtscope | 12 ---- .../.settings/ch.ivyteam.ivy.designer.prefs | 5 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +- ....eclipse.wst.common.project.facet.core.xml | 6 +- ...rg.eclipse.wst.jsdt.ui.superType.container | 1 - .../org.eclipse.wst.jsdt.ui.superType.name | 1 - a-trust-connector-demo/config/variables.yaml | 7 ++- .../axonivy/connector/atrust/demo/Data.d.json | 20 ++++++ .../connector/atrust/demo/Data.ivyClass | 7 --- a-trust-connector-demo/pom.xml | 4 +- .../ATrustIntegration/ATrustDemo.p.json | 2 +- .../DocumentSignature.rddescriptor | 7 --- .../DocumentSignatureData.d.json | 62 +++++++++++++++++++ .../DocumentSignatureData.ivyClass | 36 ----------- .../DocumentSignatureProcess.p.json | 2 +- .../webContent/layouts/frame-10.xhtml | 6 +- a-trust-connector-product/pom.xml | 2 +- a-trust-connector-test/.project | 3 +- a-trust-connector-test/.settings/.jsdtscope | 12 ---- .../.settings/ch.ivyteam.ivy.designer.prefs | 5 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +- ....eclipse.wst.common.project.facet.core.xml | 6 +- ...rg.eclipse.wst.jsdt.ui.superType.container | 1 - .../org.eclipse.wst.jsdt.ui.superType.name | 1 - a-trust-connector-test/config/variables.yaml | 3 +- .../axonivy/connector/atrust/test/Data.d.json | 15 +++++ .../connector/atrust/test/Data.ivyClass | 6 -- a-trust-connector-test/pom.xml | 6 +- .../Start Processes/TestATrust.p.json | 2 +- .../connector/atrust/test/ATrustSignMock.java | 8 +-- .../atrust/test/ATrustProcessTest.java | 8 ++- a-trust-connector/.project | 3 +- a-trust-connector/.settings/.jsdtscope | 12 ---- .../.settings/ch.ivyteam.ivy.designer.prefs | 5 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +- ....eclipse.wst.common.project.facet.core.xml | 6 +- ...rg.eclipse.wst.jsdt.ui.superType.container | 1 - .../org.eclipse.wst.jsdt.ui.superType.name | 1 - a-trust-connector/config/variables.yaml | 7 ++- .../com/axonivy/connector/atrust/Data.d.json | 6 ++ .../axonivy/connector/atrust/Data.ivyClass | 2 - .../connector/atrust/EndSignatureData.d.json | 26 ++++++++ .../atrust/EndSignatureData.ivyClass | 11 ---- .../atrust/StartSignatureData.d.json | 47 ++++++++++++++ .../atrust/StartSignatureData.ivyClass | 22 ------- .../atrust/TemplateManagementData.d.json | 22 +++++++ .../atrust/TemplateManagementData.ivyClass | 7 --- a-trust-connector/pom.xml | 4 +- .../processes/ATrust/EndSignature.p.json | 2 +- .../processes/ATrust/StartSignature.p.json | 2 +- .../ATrust/TemplateManagement.p.json | 2 +- alfresco-connector | 1 + pom.xml | 2 +- 57 files changed, 264 insertions(+), 210 deletions(-) delete mode 100644 a-trust-connector-demo/.settings/.jsdtscope delete mode 100644 a-trust-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.container delete mode 100644 a-trust-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.name create mode 100644 a-trust-connector-demo/dataclasses/com/axonivy/connector/atrust/demo/Data.d.json delete mode 100644 a-trust-connector-demo/dataclasses/com/axonivy/connector/atrust/demo/Data.ivyClass delete mode 100644 a-trust-connector-demo/src_hd/com/axonivy/connector/atrust/demo/DocumentSignature/DocumentSignature.rddescriptor create mode 100644 a-trust-connector-demo/src_hd/com/axonivy/connector/atrust/demo/DocumentSignature/DocumentSignatureData.d.json delete mode 100644 a-trust-connector-demo/src_hd/com/axonivy/connector/atrust/demo/DocumentSignature/DocumentSignatureData.ivyClass delete mode 100644 a-trust-connector-test/.settings/.jsdtscope delete mode 100644 a-trust-connector-test/.settings/org.eclipse.wst.jsdt.ui.superType.container delete mode 100644 a-trust-connector-test/.settings/org.eclipse.wst.jsdt.ui.superType.name create mode 100644 a-trust-connector-test/dataclasses/com/axonivy/connector/atrust/test/Data.d.json delete mode 100644 a-trust-connector-test/dataclasses/com/axonivy/connector/atrust/test/Data.ivyClass delete mode 100644 a-trust-connector/.settings/.jsdtscope delete mode 100644 a-trust-connector/.settings/org.eclipse.wst.jsdt.ui.superType.container delete mode 100644 a-trust-connector/.settings/org.eclipse.wst.jsdt.ui.superType.name create mode 100644 a-trust-connector/dataclasses/com/axonivy/connector/atrust/Data.d.json delete mode 100644 a-trust-connector/dataclasses/com/axonivy/connector/atrust/Data.ivyClass create mode 100644 a-trust-connector/dataclasses/com/axonivy/connector/atrust/EndSignatureData.d.json delete mode 100644 a-trust-connector/dataclasses/com/axonivy/connector/atrust/EndSignatureData.ivyClass create mode 100644 a-trust-connector/dataclasses/com/axonivy/connector/atrust/StartSignatureData.d.json delete mode 100644 a-trust-connector/dataclasses/com/axonivy/connector/atrust/StartSignatureData.ivyClass create mode 100644 a-trust-connector/dataclasses/com/axonivy/connector/atrust/TemplateManagementData.d.json delete mode 100644 a-trust-connector/dataclasses/com/axonivy/connector/atrust/TemplateManagementData.ivyClass create mode 160000 alfresco-connector diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 93dc08b..8dc89c2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,4 +8,4 @@ on: jobs: build: - uses: axonivy-market/github-workflows/.github/workflows/ci.yml@v4 + uses: axonivy-market/github-workflows/.github/workflows/ci.yml@v5 diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 18d48e5..b5df4a4 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -8,4 +8,4 @@ on: jobs: build: - uses: axonivy-market/github-workflows/.github/workflows/dev.yml@v4 \ No newline at end of file + uses: axonivy-market/github-workflows/.github/workflows/dev.yml@v5 \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ab5b0d7..bc801b4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,4 +4,4 @@ on: workflow_dispatch jobs: build: - uses: axonivy-market/github-workflows/.github/workflows/release.yml@v4 + uses: axonivy-market/github-workflows/.github/workflows/release.yml@v5 diff --git a/a-trust-connector-demo/.project b/a-trust-connector-demo/.project index 4fb1d82..c757cad 100644 --- a/a-trust-connector-demo/.project +++ b/a-trust-connector-demo/.project @@ -49,6 +49,5 @@ org.eclipse.jdt.core.javanature org.eclipse.jem.beaninfo.BeanInfoNature org.eclipse.wst.common.project.facet.core.nature - org.eclipse.wst.jsdt.core.jsNature - + \ No newline at end of file diff --git a/a-trust-connector-demo/.settings/.jsdtscope b/a-trust-connector-demo/.settings/.jsdtscope deleted file mode 100644 index 869c01d..0000000 --- a/a-trust-connector-demo/.settings/.jsdtscope +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/a-trust-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs b/a-trust-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs index f4fc409..0b2f73b 100644 --- a/a-trust-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs +++ b/a-trust-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs @@ -1,5 +1,4 @@ -ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_DATA_CLASS=com.axonivy.connector.atrust.demo.Data ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.connector.atrust.demo ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13 -ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=113000 -eclipse.preferences.version=1 +ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=120001 +eclipse.preferences.version=1 \ No newline at end of file diff --git a/a-trust-connector-demo/.settings/org.eclipse.jdt.core.prefs b/a-trust-connector-demo/.settings/org.eclipse.jdt.core.prefs index d4540a5..3a79233 100644 --- a/a-trust-connector-demo/.settings/org.eclipse.jdt.core.prefs +++ b/a-trust-connector-demo/.settings/org.eclipse.jdt.core.prefs @@ -1,10 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 diff --git a/a-trust-connector-demo/.settings/org.eclipse.wst.common.project.facet.core.xml b/a-trust-connector-demo/.settings/org.eclipse.wst.common.project.facet.core.xml index 156ecdb..621b1f8 100644 --- a/a-trust-connector-demo/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/a-trust-connector-demo/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,6 @@ - - + - - + \ No newline at end of file diff --git a/a-trust-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.container b/a-trust-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.container deleted file mode 100644 index 3bd5d0a..0000000 --- a/a-trust-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.container +++ /dev/null @@ -1 +0,0 @@ -org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file diff --git a/a-trust-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.name b/a-trust-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.name deleted file mode 100644 index 05bd71b..0000000 --- a/a-trust-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.name +++ /dev/null @@ -1 +0,0 @@ -Window \ No newline at end of file diff --git a/a-trust-connector-demo/config/variables.yaml b/a-trust-connector-demo/config/variables.yaml index 9df7321..4e05790 100644 --- a/a-trust-connector-demo/config/variables.yaml +++ b/a-trust-connector-demo/config/variables.yaml @@ -1,17 +1,18 @@ +# yaml-language-server: $schema=https://json-schema.axonivy.com/app/12.0.0/variables.json Variables: ATrust: # API Key for "A-Trust Handysignature API" APIKey: '' - + # The Server URL under which the SigBox Server is reachable ServerUrl: '' # The SignBox belong to your ATrust server SignBox: '' - + # The default signature template ID to be used TemplateId: 0 - + # To config the Handy-Signature view in iframe. The Details can be found on the A-Trust Website https://labs.a-trust.at/developer/Handy-Signatur.aspx. HandySignaturParameter: # For setting width of frame. diff --git a/a-trust-connector-demo/dataclasses/com/axonivy/connector/atrust/demo/Data.d.json b/a-trust-connector-demo/dataclasses/com/axonivy/connector/atrust/demo/Data.d.json new file mode 100644 index 0000000..752fe36 --- /dev/null +++ b/a-trust-connector-demo/dataclasses/com/axonivy/connector/atrust/demo/Data.d.json @@ -0,0 +1,20 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "Data", + "namespace" : "com.axonivy.connector.atrust.demo", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "myIvyFile", + "type" : "File" + }, { + "name" : "templateData", + "type" : "com.axonivy.connector.atrust.bo.TemplateData" + }, { + "name" : "templateId", + "type" : "Number", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "signatureTemplates", + "type" : "at.a.trust.rest.api.client.SignatureTemplates" + } ] +} \ No newline at end of file diff --git a/a-trust-connector-demo/dataclasses/com/axonivy/connector/atrust/demo/Data.ivyClass b/a-trust-connector-demo/dataclasses/com/axonivy/connector/atrust/demo/Data.ivyClass deleted file mode 100644 index 6e9cbf2..0000000 --- a/a-trust-connector-demo/dataclasses/com/axonivy/connector/atrust/demo/Data.ivyClass +++ /dev/null @@ -1,7 +0,0 @@ -Data #class -com.axonivy.connector.atrust.demo #namespace -myIvyFile File #field -templateData com.axonivy.connector.atrust.bo.TemplateData #field -templateId Number #field -templateId PERSISTENT #fieldModifier -signatureTemplates at.a.trust.rest.api.client.SignatureTemplates #field diff --git a/a-trust-connector-demo/pom.xml b/a-trust-connector-demo/pom.xml index e2b2452..56cafb0 100644 --- a/a-trust-connector-demo/pom.xml +++ b/a-trust-connector-demo/pom.xml @@ -3,10 +3,10 @@ 4.0.0 com.axonivy.connector.atrust a-trust-connector-demo - 11.3.3-SNAPSHOT + 12.0.0-SNAPSHOT iar - 11.3.0 + 12.0.0 diff --git a/a-trust-connector-demo/processes/ATrustIntegration/ATrustDemo.p.json b/a-trust-connector-demo/processes/ATrustIntegration/ATrustDemo.p.json index a850676..342713e 100644 --- a/a-trust-connector-demo/processes/ATrustIntegration/ATrustDemo.p.json +++ b/a-trust-connector-demo/processes/ATrustIntegration/ATrustDemo.p.json @@ -1,5 +1,5 @@ { - "$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json", + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", "id" : "1798254723F146E3", "config" : { "data" : "com.axonivy.connector.atrust.demo.Data" diff --git a/a-trust-connector-demo/src_hd/com/axonivy/connector/atrust/demo/DocumentSignature/DocumentSignature.rddescriptor b/a-trust-connector-demo/src_hd/com/axonivy/connector/atrust/demo/DocumentSignature/DocumentSignature.rddescriptor deleted file mode 100644 index ae605f0..0000000 --- a/a-trust-connector-demo/src_hd/com/axonivy/connector/atrust/demo/DocumentSignature/DocumentSignature.rddescriptor +++ /dev/null @@ -1,7 +0,0 @@ - - - - viewTechnology - JSF - - diff --git a/a-trust-connector-demo/src_hd/com/axonivy/connector/atrust/demo/DocumentSignature/DocumentSignatureData.d.json b/a-trust-connector-demo/src_hd/com/axonivy/connector/atrust/demo/DocumentSignature/DocumentSignatureData.d.json new file mode 100644 index 0000000..aa47e77 --- /dev/null +++ b/a-trust-connector-demo/src_hd/com/axonivy/connector/atrust/demo/DocumentSignature/DocumentSignatureData.d.json @@ -0,0 +1,62 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "DocumentSignatureData", + "namespace" : "com.axonivy.connector.atrust.demo.DocumentSignature", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "signatureJob", + "type" : "com.axonivy.connector.atrust.bo.SignatureJob", + "comment" : "The input of A-Trust Signature servive" + }, { + "name" : "signatureDocumentData", + "type" : "com.axonivy.connector.atrust.bo.SignatureDocumentData", + "comment" : "The output of A-Trust Signature servive" + }, { + "name" : "disableSignButton", + "type" : "Boolean", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "documents", + "type" : "java.util.List", + "comment" : "Documents of case" + }, { + "name" : "selectedDocument", + "type" : "ch.ivyteam.ivy.workflow.document.IDocument" + }, { + "name" : "uploadedFile", + "type" : "org.primefaces.model.file.UploadedFile" + }, { + "name" : "streamedContent", + "type" : "org.primefaces.model.StreamedContent" + }, { + "name" : "doesDocumentExist", + "type" : "Boolean", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "disableUpload", + "type" : "Boolean", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "handySignatureURL", + "type" : "String", + "comment" : "The URL (which includes the required session id) to start the Handy-Signature", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "templateData", + "type" : "at.a.trust.rest.api.client.SignatureTemplates" + }, { + "name" : "templates", + "type" : "java.util.List" + }, { + "name" : "selectedTemplate", + "type" : "at.a.trust.rest.api.client.TemplateMeta" + }, { + "name" : "uploadedDocumentName", + "type" : "String", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "isSignFinished", + "type" : "Boolean", + "modifiers" : [ "PERSISTENT" ] + } ] +} \ No newline at end of file diff --git a/a-trust-connector-demo/src_hd/com/axonivy/connector/atrust/demo/DocumentSignature/DocumentSignatureData.ivyClass b/a-trust-connector-demo/src_hd/com/axonivy/connector/atrust/demo/DocumentSignature/DocumentSignatureData.ivyClass deleted file mode 100644 index a2db9c8..0000000 --- a/a-trust-connector-demo/src_hd/com/axonivy/connector/atrust/demo/DocumentSignature/DocumentSignatureData.ivyClass +++ /dev/null @@ -1,36 +0,0 @@ -DocumentSignatureData #class -com.axonivy.connector.atrust.demo.DocumentSignature #namespace -signatureJob com.axonivy.connector.atrust.bo.SignatureJob #field -signatureJob 'The input of A-Trust Signature servive' #fieldComment -signatureJob PERSISTENT #fieldModifier -signatureDocumentData com.axonivy.connector.atrust.bo.SignatureDocumentData #field -signatureDocumentData 'The output of A-Trust Signature servive' #fieldComment -signatureDocumentData PERSISTENT #fieldModifier -disableSignButton Boolean #field -disableSignButton PERSISTENT #fieldModifier -documents java.util.List #field -documents 'Documents of case' #fieldComment -documents PERSISTENT #fieldModifier -selectedDocument ch.ivyteam.ivy.workflow.document.IDocument #field -selectedDocument PERSISTENT #fieldModifier -uploadedFile org.primefaces.model.file.UploadedFile #field -uploadedFile PERSISTENT #fieldModifier -streamedContent org.primefaces.model.StreamedContent #field -streamedContent PERSISTENT #fieldModifier -doesDocumentExist Boolean #field -doesDocumentExist PERSISTENT #fieldModifier -disableUpload Boolean #field -disableUpload PERSISTENT #fieldModifier -handySignatureURL String #field -handySignatureURL 'The URL (which includes the required session id) to start the Handy-Signature' #fieldComment -handySignatureURL PERSISTENT #fieldModifier -templateData at.a.trust.rest.api.client.SignatureTemplates #field -templateData PERSISTENT #fieldModifier -templates java.util.List #field -templates PERSISTENT #fieldModifier -selectedTemplate at.a.trust.rest.api.client.TemplateMeta #field -selectedTemplate PERSISTENT #fieldModifier -uploadedDocumentName String #field -uploadedDocumentName PERSISTENT #fieldModifier -isSignFinished Boolean #field -isSignFinished PERSISTENT #fieldModifier diff --git a/a-trust-connector-demo/src_hd/com/axonivy/connector/atrust/demo/DocumentSignature/DocumentSignatureProcess.p.json b/a-trust-connector-demo/src_hd/com/axonivy/connector/atrust/demo/DocumentSignature/DocumentSignatureProcess.p.json index d2a5bc9..5e70924 100644 --- a/a-trust-connector-demo/src_hd/com/axonivy/connector/atrust/demo/DocumentSignature/DocumentSignatureProcess.p.json +++ b/a-trust-connector-demo/src_hd/com/axonivy/connector/atrust/demo/DocumentSignature/DocumentSignatureProcess.p.json @@ -1,5 +1,5 @@ { - "$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json", + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", "id" : "1798259395763051", "kind" : "HTML_DIALOG", "config" : { diff --git a/a-trust-connector-demo/webContent/layouts/frame-10.xhtml b/a-trust-connector-demo/webContent/layouts/frame-10.xhtml index 74501bd..c05c1fb 100644 --- a/a-trust-connector-demo/webContent/layouts/frame-10.xhtml +++ b/a-trust-connector-demo/webContent/layouts/frame-10.xhtml @@ -13,11 +13,11 @@ This is the default template to use the freya-ivy theme as well as iFrames appro PORTAL: If you are using the Axon Ivy Portal, you can pass several parameters to it to use some features (e.g. process chain). -You'll find the list of parameters here: https://developer.axonivy.com/portal/11.3/doc/portal-developer-guide/components/layout-templates.html#components-layout-templates-iframe-task-template -For further information about iframes and usage in Portal please refer to: https://developer.axonivy.com/portal/11.3/doc/portal-developer-guide/iframe/index.html +You'll find the list of parameters here: https://developer.axonivy.com/portal/12.0/doc/portal-developer-guide/components/layout-templates.html#components-layout-templates-iframe-task-template +For further information about iframes and usage in Portal please refer to: https://developer.axonivy.com/portal/12.0/doc/portal-developer-guide/iframe/index.html BRANDING: -If you want to brand your dialogs, please take a look at our documentation: https://developer.axonivy.com/doc/11.3/designer-guide/user-interface/branding/index.html +If you want to brand your dialogs, please take a look at our documentation: https://developer.axonivy.com/doc/12.0/designer-guide/user-interface/branding/index.html STYLING: If you want to add custom styles, you can simply add your own .css file (e.g. at the location: "webContent/layouts/styles/style.css") diff --git a/a-trust-connector-product/pom.xml b/a-trust-connector-product/pom.xml index 9e3ece5..ad20b92 100644 --- a/a-trust-connector-product/pom.xml +++ b/a-trust-connector-product/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.axonivy.connector.atrust a-trust-connector-product - 11.3.3-SNAPSHOT + 12.0.0-SNAPSHOT pom diff --git a/a-trust-connector-test/.project b/a-trust-connector-test/.project index a385b44..a252718 100644 --- a/a-trust-connector-test/.project +++ b/a-trust-connector-test/.project @@ -49,6 +49,5 @@ org.eclipse.jdt.core.javanature org.eclipse.jem.beaninfo.BeanInfoNature org.eclipse.wst.common.project.facet.core.nature - org.eclipse.wst.jsdt.core.jsNature - + \ No newline at end of file diff --git a/a-trust-connector-test/.settings/.jsdtscope b/a-trust-connector-test/.settings/.jsdtscope deleted file mode 100644 index 869c01d..0000000 --- a/a-trust-connector-test/.settings/.jsdtscope +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/a-trust-connector-test/.settings/ch.ivyteam.ivy.designer.prefs b/a-trust-connector-test/.settings/ch.ivyteam.ivy.designer.prefs index 9bdcfde..e565894 100644 --- a/a-trust-connector-test/.settings/ch.ivyteam.ivy.designer.prefs +++ b/a-trust-connector-test/.settings/ch.ivyteam.ivy.designer.prefs @@ -1,5 +1,4 @@ -ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_DATA_CLASS=com.axonivy.connector.atrust.test.Data ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.connector.atrust.test ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13 -ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=113000 -eclipse.preferences.version=1 +ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=120001 +eclipse.preferences.version=1 \ No newline at end of file diff --git a/a-trust-connector-test/.settings/org.eclipse.jdt.core.prefs b/a-trust-connector-test/.settings/org.eclipse.jdt.core.prefs index d4540a5..3a79233 100644 --- a/a-trust-connector-test/.settings/org.eclipse.jdt.core.prefs +++ b/a-trust-connector-test/.settings/org.eclipse.jdt.core.prefs @@ -1,10 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 diff --git a/a-trust-connector-test/.settings/org.eclipse.wst.common.project.facet.core.xml b/a-trust-connector-test/.settings/org.eclipse.wst.common.project.facet.core.xml index 156ecdb..621b1f8 100644 --- a/a-trust-connector-test/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/a-trust-connector-test/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,6 @@ - - + - - + \ No newline at end of file diff --git a/a-trust-connector-test/.settings/org.eclipse.wst.jsdt.ui.superType.container b/a-trust-connector-test/.settings/org.eclipse.wst.jsdt.ui.superType.container deleted file mode 100644 index 3bd5d0a..0000000 --- a/a-trust-connector-test/.settings/org.eclipse.wst.jsdt.ui.superType.container +++ /dev/null @@ -1 +0,0 @@ -org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file diff --git a/a-trust-connector-test/.settings/org.eclipse.wst.jsdt.ui.superType.name b/a-trust-connector-test/.settings/org.eclipse.wst.jsdt.ui.superType.name deleted file mode 100644 index 05bd71b..0000000 --- a/a-trust-connector-test/.settings/org.eclipse.wst.jsdt.ui.superType.name +++ /dev/null @@ -1 +0,0 @@ -Window \ No newline at end of file diff --git a/a-trust-connector-test/config/variables.yaml b/a-trust-connector-test/config/variables.yaml index 6ff84af..40bc904 100644 --- a/a-trust-connector-test/config/variables.yaml +++ b/a-trust-connector-test/config/variables.yaml @@ -1,3 +1,4 @@ +# yaml-language-server: $schema=https://json-schema.axonivy.com/app/12.0.0/variables.json # == Variables == # # You can define here your project Variables. @@ -5,4 +6,4 @@ # please add a 'variables.yaml' in the sub directory '_'. # Variables: - #myVariable: value \ No newline at end of file +#myVariable: value diff --git a/a-trust-connector-test/dataclasses/com/axonivy/connector/atrust/test/Data.d.json b/a-trust-connector-test/dataclasses/com/axonivy/connector/atrust/test/Data.d.json new file mode 100644 index 0000000..7062f3c --- /dev/null +++ b/a-trust-connector-test/dataclasses/com/axonivy/connector/atrust/test/Data.d.json @@ -0,0 +1,15 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "Data", + "namespace" : "com.axonivy.connector.atrust.test", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "signatureJob", + "type" : "com.axonivy.connector.atrust.bo.SignatureJob", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "signatureDocumentData", + "type" : "com.axonivy.connector.atrust.bo.SignatureDocumentData", + "modifiers" : [ "PERSISTENT" ] + } ] +} \ No newline at end of file diff --git a/a-trust-connector-test/dataclasses/com/axonivy/connector/atrust/test/Data.ivyClass b/a-trust-connector-test/dataclasses/com/axonivy/connector/atrust/test/Data.ivyClass deleted file mode 100644 index 3918c91..0000000 --- a/a-trust-connector-test/dataclasses/com/axonivy/connector/atrust/test/Data.ivyClass +++ /dev/null @@ -1,6 +0,0 @@ -Data #class -com.axonivy.connector.atrust.test #namespace -signatureJob com.axonivy.connector.atrust.bo.SignatureJob #field -signatureJob PERSISTENT #fieldModifier -signatureDocumentData com.axonivy.connector.atrust.bo.SignatureDocumentData #field -signatureDocumentData PERSISTENT #fieldModifier diff --git a/a-trust-connector-test/pom.xml b/a-trust-connector-test/pom.xml index 6de16e8..8a7c535 100644 --- a/a-trust-connector-test/pom.xml +++ b/a-trust-connector-test/pom.xml @@ -3,11 +3,11 @@ 4.0.0 com.axonivy.connector.atrust a-trust-connector-test - 11.3.3-SNAPSHOT + 12.0.0-SNAPSHOT iar - 11.3.0 - 11.3.0 + 12.0.0 + 12.0.0 diff --git a/a-trust-connector-test/processes/Start Processes/TestATrust.p.json b/a-trust-connector-test/processes/Start Processes/TestATrust.p.json index c7e7ef6..06e29c8 100644 --- a/a-trust-connector-test/processes/Start Processes/TestATrust.p.json +++ b/a-trust-connector-test/processes/Start Processes/TestATrust.p.json @@ -1,5 +1,5 @@ { - "$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json", + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", "id" : "17969069DFA18010", "config" : { "data" : "com.axonivy.connector.atrust.test.Data" diff --git a/a-trust-connector-test/src/com/axonivy/connector/atrust/test/ATrustSignMock.java b/a-trust-connector-test/src/com/axonivy/connector/atrust/test/ATrustSignMock.java index 47b75d9..fd1ec56 100644 --- a/a-trust-connector-test/src/com/axonivy/connector/atrust/test/ATrustSignMock.java +++ b/a-trust-connector-test/src/com/axonivy/connector/atrust/test/ATrustSignMock.java @@ -3,8 +3,8 @@ import java.io.IOException; import java.io.InputStream; import java.net.MalformedURLException; +import java.net.URI; import java.net.URISyntaxException; -import java.net.URL; import java.nio.charset.StandardCharsets; import java.util.UUID; @@ -53,7 +53,7 @@ public String getTemplates() { public Response addTemplate(@FormDataParam("file") InputStream uploadStream, @FormDataParam("file") FormDataContentDisposition fileMetaData) throws MalformedURLException, URISyntaxException { - var location = new URL(getRequestUrl() + MOCK_TEMPLATE_LOCATION).toURI(); + var location = new URI(getRequestUrl() + MOCK_TEMPLATE_LOCATION); return Response.created(location).build(); } @@ -71,8 +71,8 @@ public Response createBatch() throws MalformedURLException, URISyntaxException { return Response.created(location).build(); } - private java.net.URI buildMockBatchLocation() throws URISyntaxException, MalformedURLException { - return new URL(getRequestUrl() + MOCK_BATCH_LOCATION).toURI(); + private URI buildMockBatchLocation() throws URISyntaxException, MalformedURLException { + return new URI(getRequestUrl() + MOCK_BATCH_LOCATION); } @POST diff --git a/a-trust-connector-test/src_test/com/axonivy/connector/atrust/test/ATrustProcessTest.java b/a-trust-connector-test/src_test/com/axonivy/connector/atrust/test/ATrustProcessTest.java index a187fa6..ca5eb8b 100644 --- a/a-trust-connector-test/src_test/com/axonivy/connector/atrust/test/ATrustProcessTest.java +++ b/a-trust-connector-test/src_test/com/axonivy/connector/atrust/test/ATrustProcessTest.java @@ -34,6 +34,7 @@ import ch.ivyteam.ivy.environment.AppFixture; import ch.ivyteam.ivy.environment.Ivy; import ch.ivyteam.ivy.rest.client.RestClient; +import ch.ivyteam.ivy.rest.client.RestClientFeature; import ch.ivyteam.ivy.rest.client.RestClients; import ch.ivyteam.ivy.scripting.objects.CompositeObject; import ch.ivyteam.ivy.scripting.objects.File; @@ -66,8 +67,11 @@ static void beforeAll(AppFixture fixture, IApplication app) { RestClients clients = RestClients.of(app); RestClient atrustRestClient = clients.find(ATRUST_REST_CLIENT); var mockClient = atrustRestClient.toBuilder() - .features(List.of(HeaderFeature.class.getName(), - MultiPartFeature.class.getName(), OpenApiJsonFeature.class.getName())) + .features (List.of( + new RestClientFeature(HeaderFeature.class.getName()), + new RestClientFeature(MultiPartFeature.class.getName()), + new RestClientFeature(OpenApiJsonFeature.class.getName()) + )) .property("AUTH.apiKey", "apiKey").property("PATH.serverUrl", "serverUrl") .property("PATH.signBox", "signBox").toRestClient(); clients.set(mockClient); diff --git a/a-trust-connector/.project b/a-trust-connector/.project index bf2b0ed..1b31053 100644 --- a/a-trust-connector/.project +++ b/a-trust-connector/.project @@ -49,6 +49,5 @@ org.eclipse.jdt.core.javanature org.eclipse.jem.beaninfo.BeanInfoNature org.eclipse.wst.common.project.facet.core.nature - org.eclipse.wst.jsdt.core.jsNature - + \ No newline at end of file diff --git a/a-trust-connector/.settings/.jsdtscope b/a-trust-connector/.settings/.jsdtscope deleted file mode 100644 index 869c01d..0000000 --- a/a-trust-connector/.settings/.jsdtscope +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/a-trust-connector/.settings/ch.ivyteam.ivy.designer.prefs b/a-trust-connector/.settings/ch.ivyteam.ivy.designer.prefs index d16f9eb..e6f4b31 100644 --- a/a-trust-connector/.settings/ch.ivyteam.ivy.designer.prefs +++ b/a-trust-connector/.settings/ch.ivyteam.ivy.designer.prefs @@ -1,5 +1,4 @@ -ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_DATA_CLASS=com.axonivy.connector.atrust.Data ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.connector.atrust ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13 -ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=113000 -eclipse.preferences.version=1 +ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=120001 +eclipse.preferences.version=1 \ No newline at end of file diff --git a/a-trust-connector/.settings/org.eclipse.jdt.core.prefs b/a-trust-connector/.settings/org.eclipse.jdt.core.prefs index d4540a5..3a79233 100644 --- a/a-trust-connector/.settings/org.eclipse.jdt.core.prefs +++ b/a-trust-connector/.settings/org.eclipse.jdt.core.prefs @@ -1,10 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 diff --git a/a-trust-connector/.settings/org.eclipse.wst.common.project.facet.core.xml b/a-trust-connector/.settings/org.eclipse.wst.common.project.facet.core.xml index 156ecdb..621b1f8 100644 --- a/a-trust-connector/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/a-trust-connector/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,6 @@ - - + - - + \ No newline at end of file diff --git a/a-trust-connector/.settings/org.eclipse.wst.jsdt.ui.superType.container b/a-trust-connector/.settings/org.eclipse.wst.jsdt.ui.superType.container deleted file mode 100644 index 3bd5d0a..0000000 --- a/a-trust-connector/.settings/org.eclipse.wst.jsdt.ui.superType.container +++ /dev/null @@ -1 +0,0 @@ -org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file diff --git a/a-trust-connector/.settings/org.eclipse.wst.jsdt.ui.superType.name b/a-trust-connector/.settings/org.eclipse.wst.jsdt.ui.superType.name deleted file mode 100644 index 05bd71b..0000000 --- a/a-trust-connector/.settings/org.eclipse.wst.jsdt.ui.superType.name +++ /dev/null @@ -1 +0,0 @@ -Window \ No newline at end of file diff --git a/a-trust-connector/config/variables.yaml b/a-trust-connector/config/variables.yaml index 9df7321..4e05790 100644 --- a/a-trust-connector/config/variables.yaml +++ b/a-trust-connector/config/variables.yaml @@ -1,17 +1,18 @@ +# yaml-language-server: $schema=https://json-schema.axonivy.com/app/12.0.0/variables.json Variables: ATrust: # API Key for "A-Trust Handysignature API" APIKey: '' - + # The Server URL under which the SigBox Server is reachable ServerUrl: '' # The SignBox belong to your ATrust server SignBox: '' - + # The default signature template ID to be used TemplateId: 0 - + # To config the Handy-Signature view in iframe. The Details can be found on the A-Trust Website https://labs.a-trust.at/developer/Handy-Signatur.aspx. HandySignaturParameter: # For setting width of frame. diff --git a/a-trust-connector/dataclasses/com/axonivy/connector/atrust/Data.d.json b/a-trust-connector/dataclasses/com/axonivy/connector/atrust/Data.d.json new file mode 100644 index 0000000..ba56cf8 --- /dev/null +++ b/a-trust-connector/dataclasses/com/axonivy/connector/atrust/Data.d.json @@ -0,0 +1,6 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "Data", + "namespace" : "com.axonivy.connector.atrust", + "isBusinessCaseData" : false +} \ No newline at end of file diff --git a/a-trust-connector/dataclasses/com/axonivy/connector/atrust/Data.ivyClass b/a-trust-connector/dataclasses/com/axonivy/connector/atrust/Data.ivyClass deleted file mode 100644 index 6ce4de6..0000000 --- a/a-trust-connector/dataclasses/com/axonivy/connector/atrust/Data.ivyClass +++ /dev/null @@ -1,2 +0,0 @@ -Data #class -com.axonivy.connector.atrust #namespace diff --git a/a-trust-connector/dataclasses/com/axonivy/connector/atrust/EndSignatureData.d.json b/a-trust-connector/dataclasses/com/axonivy/connector/atrust/EndSignatureData.d.json new file mode 100644 index 0000000..cd2e79f --- /dev/null +++ b/a-trust-connector/dataclasses/com/axonivy/connector/atrust/EndSignatureData.d.json @@ -0,0 +1,26 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "EndSignatureData", + "namespace" : "com.axonivy.connector.atrust", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "resultCode", + "type" : "Integer", + "comment" : "Result code from A-Trust web service call." + }, { + "name" : "callbackSafetyHash", + "type" : "String", + "comment" : "Hash code generated for more safety in internal callback link." + }, { + "name" : "referenceTaskId", + "type" : "Long", + "comment" : "Reuqest task id. Will be used to add signed document." + }, { + "name" : "atrustTicketId", + "type" : "String", + "comment" : "Ticket ID from A-Trust signature inbox." + }, { + "name" : "signatureDocumentData", + "type" : "com.axonivy.connector.atrust.bo.SignatureDocumentData" + } ] +} \ No newline at end of file diff --git a/a-trust-connector/dataclasses/com/axonivy/connector/atrust/EndSignatureData.ivyClass b/a-trust-connector/dataclasses/com/axonivy/connector/atrust/EndSignatureData.ivyClass deleted file mode 100644 index cfece47..0000000 --- a/a-trust-connector/dataclasses/com/axonivy/connector/atrust/EndSignatureData.ivyClass +++ /dev/null @@ -1,11 +0,0 @@ -EndSignatureData #class -com.axonivy.connector.atrust #namespace -resultCode Integer #field -resultCode 'Result code from A-Trust web service call.' #fieldComment -callbackSafetyHash String #field -callbackSafetyHash 'Hash code generated for more safety in internal callback link.' #fieldComment -referenceTaskId Long #field -referenceTaskId 'Reuqest task id. Will be used to add signed document.' #fieldComment -atrustTicketId String #field -atrustTicketId 'Ticket ID from A-Trust signature inbox.' #fieldComment -signatureDocumentData com.axonivy.connector.atrust.bo.SignatureDocumentData #field diff --git a/a-trust-connector/dataclasses/com/axonivy/connector/atrust/StartSignatureData.d.json b/a-trust-connector/dataclasses/com/axonivy/connector/atrust/StartSignatureData.d.json new file mode 100644 index 0000000..d797e02 --- /dev/null +++ b/a-trust-connector/dataclasses/com/axonivy/connector/atrust/StartSignatureData.d.json @@ -0,0 +1,47 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "StartSignatureData", + "namespace" : "com.axonivy.connector.atrust", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "resultCode", + "type" : "Integer", + "comment" : "Result code from A-Trust web service call." + }, { + "name" : "callbackSafetyHash", + "type" : "String", + "comment" : "Hash code generated for more safety in internal callback link." + }, { + "name" : "forwardTargetUrl", + "type" : "String", + "comment" : "URL for A-Trust. We give it back to caller in order to forward the user to this URL." + }, { + "name" : "signatureJob", + "type" : "com.axonivy.connector.atrust.bo.SignatureJob", + "comment" : "Job data for this signature, passed by caller of this interface." + }, { + "name" : "signatureDocumentData", + "type" : "com.axonivy.connector.atrust.bo.SignatureDocumentData", + "comment" : "The output of A-Trust signature document data, you will get it back together with signed document in the signature result object." + }, { + "name" : "internalCallbackUrl", + "type" : "String", + "comment" : "Internal Callback URL of this interface. (Here we prepare all data before we forward to callback URL of calling process)" + }, { + "name" : "signatureTicket", + "type" : "String", + "comment" : "Ticket ID from A-Trust" + }, { + "name" : "integrateNotInFrame", + "type" : "Boolean", + "comment" : "This indicator set for old approach using TaskTemplate8 - non iframe" + }, { + "name" : "errorCallbackUrl", + "type" : "String", + "comment" : "Error callback URL of this interface." + }, { + "name" : "signDocument", + "type" : "at.a.trust.rest.api.client.SignDocument", + "comment" : "Wrapper object for adding new doc to sign batch" + } ] +} \ No newline at end of file diff --git a/a-trust-connector/dataclasses/com/axonivy/connector/atrust/StartSignatureData.ivyClass b/a-trust-connector/dataclasses/com/axonivy/connector/atrust/StartSignatureData.ivyClass deleted file mode 100644 index 5a87eb6..0000000 --- a/a-trust-connector/dataclasses/com/axonivy/connector/atrust/StartSignatureData.ivyClass +++ /dev/null @@ -1,22 +0,0 @@ -StartSignatureData #class -com.axonivy.connector.atrust #namespace -resultCode Integer #field -resultCode 'Result code from A-Trust web service call.' #fieldComment -callbackSafetyHash String #field -callbackSafetyHash 'Hash code generated for more safety in internal callback link.' #fieldComment -forwardTargetUrl String #field -forwardTargetUrl 'URL for A-Trust. We give it back to caller in order to forward the user to this URL.' #fieldComment -signatureJob com.axonivy.connector.atrust.bo.SignatureJob #field -signatureJob 'Job data for this signature, passed by caller of this interface.' #fieldComment -signatureDocumentData com.axonivy.connector.atrust.bo.SignatureDocumentData #field -signatureDocumentData 'The output of A-Trust signature document data, you will get it back together with signed document in the signature result object.' #fieldComment -internalCallbackUrl String #field -internalCallbackUrl 'Internal Callback URL of this interface. (Here we prepare all data before we forward to callback URL of calling process)' #fieldComment -signatureTicket String #field -signatureTicket 'Ticket ID from A-Trust' #fieldComment -integrateNotInFrame Boolean #field -integrateNotInFrame 'This indicator set for old approach using TaskTemplate8 - non iframe' #fieldComment -errorCallbackUrl String #field -errorCallbackUrl 'Error callback URL of this interface.' #fieldComment -signDocument at.a.trust.rest.api.client.SignDocument #field -signDocument 'Wrapper object for adding new doc to sign batch' #fieldComment diff --git a/a-trust-connector/dataclasses/com/axonivy/connector/atrust/TemplateManagementData.d.json b/a-trust-connector/dataclasses/com/axonivy/connector/atrust/TemplateManagementData.d.json new file mode 100644 index 0000000..369fa67 --- /dev/null +++ b/a-trust-connector/dataclasses/com/axonivy/connector/atrust/TemplateManagementData.d.json @@ -0,0 +1,22 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "TemplateManagementData", + "namespace" : "com.axonivy.connector.atrust", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "documentByteArray", + "type" : "List" + }, { + "name" : "result", + "type" : "com.axonivy.connector.atrust.bo.TemplateData" + }, { + "name" : "ivyFile", + "type" : "File" + }, { + "name" : "templateId", + "type" : "Number" + }, { + "name" : "signatureTemplates", + "type" : "at.a.trust.rest.api.client.SignatureTemplates" + } ] +} \ No newline at end of file diff --git a/a-trust-connector/dataclasses/com/axonivy/connector/atrust/TemplateManagementData.ivyClass b/a-trust-connector/dataclasses/com/axonivy/connector/atrust/TemplateManagementData.ivyClass deleted file mode 100644 index dfa8beb..0000000 --- a/a-trust-connector/dataclasses/com/axonivy/connector/atrust/TemplateManagementData.ivyClass +++ /dev/null @@ -1,7 +0,0 @@ -TemplateManagementData #class -com.axonivy.connector.atrust #namespace -documentByteArray List #field -result com.axonivy.connector.atrust.bo.TemplateData #field -ivyFile File #field -templateId Number #field -signatureTemplates at.a.trust.rest.api.client.SignatureTemplates #field diff --git a/a-trust-connector/pom.xml b/a-trust-connector/pom.xml index 5cca4ee..a7f0efb 100644 --- a/a-trust-connector/pom.xml +++ b/a-trust-connector/pom.xml @@ -3,10 +3,10 @@ 4.0.0 com.axonivy.connector.atrust a-trust-connector - 11.3.3-SNAPSHOT + 12.0.0-SNAPSHOT iar - 11.3.0 + 12.0.0 diff --git a/a-trust-connector/processes/ATrust/EndSignature.p.json b/a-trust-connector/processes/ATrust/EndSignature.p.json index 65453fe..01f55e4 100644 --- a/a-trust-connector/processes/ATrust/EndSignature.p.json +++ b/a-trust-connector/processes/ATrust/EndSignature.p.json @@ -1,5 +1,5 @@ { - "$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json", + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", "id" : "1797F203890511D1", "config" : { "data" : "com.axonivy.connector.atrust.EndSignatureData" diff --git a/a-trust-connector/processes/ATrust/StartSignature.p.json b/a-trust-connector/processes/ATrust/StartSignature.p.json index f30243c..6c5d17c 100644 --- a/a-trust-connector/processes/ATrust/StartSignature.p.json +++ b/a-trust-connector/processes/ATrust/StartSignature.p.json @@ -1,5 +1,5 @@ { - "$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json", + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", "id" : "1797F1F35CA9D09F", "kind" : "CALLABLE_SUB", "config" : { diff --git a/a-trust-connector/processes/ATrust/TemplateManagement.p.json b/a-trust-connector/processes/ATrust/TemplateManagement.p.json index 9fbf894..08c0493 100644 --- a/a-trust-connector/processes/ATrust/TemplateManagement.p.json +++ b/a-trust-connector/processes/ATrust/TemplateManagement.p.json @@ -1,5 +1,5 @@ { - "$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json", + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", "id" : "1797F20B0709EDE7", "kind" : "CALLABLE_SUB", "config" : { diff --git a/alfresco-connector b/alfresco-connector new file mode 160000 index 0000000..cb3c971 --- /dev/null +++ b/alfresco-connector @@ -0,0 +1 @@ +Subproject commit cb3c97158889b0b40c636cc23bfc218629c626a8 diff --git a/pom.xml b/pom.xml index 56b0871..3359bf8 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.axonivy.connector.atrust a-trust-connector-modules - 11.3.3-SNAPSHOT + 12.0.0-SNAPSHOT pom