Merge branch 'develop' of https://github.com/axonivy-market/axonivy-e…

…xpress into feature/IVYPORTAL-16522-Portal-Express-Make-integration-via-non-specific-customizations # Conflicts: # .github/workflows/ci.yml # .github/workflows/dev.yml # axonivy-express/.settings/ch.ivyteam.ivy.designer.prefs # axonivy-express/dataclasses/ch/ivy/addon/express/generic/HandleEndPageData.d.json # axonivy-express/dataclasses/gawfs/Applicant.d.json # axonivy-express/dataclasses/gawfs/ApprovalTaskResult.d.json # axonivy-express/dataclasses/gawfs/AvailWorkflow.d.json # axonivy-express/dataclasses/gawfs/CustomDeleteDocumentItemData.d.json # axonivy-express/dataclasses/gawfs/CustomGetDocumentItemsData.d.json # axonivy-express/dataclasses/gawfs/CustomUploadDocumentItemData.d.json # axonivy-express/dataclasses/gawfs/Data.d.json # axonivy-express/dataclasses/gawfs/ExecutePredefinedWorkflowData.d.json # axonivy-express/dataclasses/gawfs/ExpressStartData.d.json # axonivy-express/dataclasses/gawfs/ExternalDataProvider.d.json # axonivy-express/dataclasses/gawfs/GenericPredefinedWorkflowStartData.d.json # axonivy-express/dataclasses/gawfs/ParallelTasksUtilData.d.json # axonivy-express/dataclasses/gawfs/PortalStartData.d.json # axonivy-express/dataclasses/gawfs/SendEmailData.d.json # axonivy-express/dataclasses/gawfs/TaskDef.d.json # axonivy-express/dataclasses/gawfs/UserTaskResult.d.json # axonivy-express/dataclasses/gawfs/createWorkflowData.d.json # axonivy-express/pom.xml # axonivy-express/processes/Functional Processes/executePredefinedWorkflow.p.json # axonivy-express/src_hd/com/axonivy/utils/axonivyexpress/FormDefinition/FormDefinitionData.d.json # axonivy-express/src_hd/com/axonivy/utils/axonivyexpress/WorkflowDefinition/WorkflowDefinitionData.d.json # axonivy-express/src_hd/com/axonivy/utils/axonivyexpress/components/ApprovalResult/ApprovalResultData.d.json # axonivy-express/src_hd/com/axonivy/utils/axonivyexpress/generic/ExpressBusinessView/ExpressBusinessViewData.d.json # axonivy-express/src_hd/com/axonivy/utils/axonivyexpress/workflowExecution/ApprovalForm/ApprovalFormData.d.json # axonivy-express/src_hd/com/axonivy/utils/axonivyexpress/workflowExecution/FinalReviewForm/FinalReviewFormData.d.json # axonivy-express/src_hd/com/axonivy/utils/axonivyexpress/workflowExecution/UserTaskForm/UserTaskFormData.d.json # axonivy-express/src_hd/com/axonivy/utils/axonivyexpress/workflowExecution/UserTaskWithMailForm/UserTaskWithMailFormData.d.json
axonivy-market · Jan 9, 2025 · 3712b25 · 3712b25
2 parents da273e6 + a8d748a
commit 3712b25
Show file tree

Hide file tree

Showing 6 changed files with 94 additions and 2 deletions.
diff --git a/axonivy-express/processes/Functional Processes/executePredefinedWorkflow.p.json b/axonivy-express/processes/Functional Processes/executePredefinedWorkflow.p.json
@@ -1217,4 +1217,4 @@
         { "id" : "f19", "to" : "f34" }
       ]
     } ]
-}
+}
diff --git a/axonivy-express/src_hd/ch/ivy/addon/express/generic/EndPage/EndPageData.d.json b/axonivy-express/src_hd/ch/ivy/addon/express/generic/EndPage/EndPageData.d.json
@@ -0,0 +1,6 @@
+{
+  "$schema" : "https://json-schema.axonivy.com/data-class/11.4.0/data-class.json",
+  "simpleName" : "EndPageData",
+  "namespace" : "ch.ivy.addon.express.generic.EndPage",
+  "isBusinessCaseData" : false
+}
diff --git a/axonivy-express/src_hd/ch/ivy/gawfs/component/Email/EmailData.d.json b/axonivy-express/src_hd/ch/ivy/gawfs/component/Email/EmailData.d.json
@@ -0,0 +1,6 @@
+{
+  "$schema" : "https://json-schema.axonivy.com/data-class/11.4.0/data-class.json",
+  "simpleName" : "EmailData",
+  "namespace" : "ch.ivy.gawfs.component.Email",
+  "isBusinessCaseData" : false
+}
diff --git a/...ress/src_hd/ch/ivy/gawfs/component/FinishedUserTasksForm/FinishedUserTasksFormData.d.json b/...ress/src_hd/ch/ivy/gawfs/component/FinishedUserTasksForm/FinishedUserTasksFormData.d.json
@@ -0,0 +1,11 @@
+{
+  "$schema" : "https://json-schema.axonivy.com/data-class/11.4.0/data-class.json",
+  "simpleName" : "FinishedUserTasksFormData",
+  "namespace" : "ch.ivy.gawfs.component.FinishedUserTasksForm",
+  "isBusinessCaseData" : false,
+  "fields" : [ {
+    "name" : "finishedTasks",
+    "type" : "java.util.List<gawfs.TaskDef>",
+    "modifiers" : [ "PERSISTENT" ]
+  } ]
+}
diff --git a/build/Dockerfile b/build/Dockerfile
@@ -1,3 +1,3 @@
-FROM maven:3.8.6-eclipse-temurin-17
+FROM maven:3.9.8-eclipse-temurin-21
 
 RUN addgroup --gid 1001 build && adduser --uid 1001 --gid 1001 --disabled-password --gecos "" build
diff --git a/build/create-release/Jenkinsfile b/build/create-release/Jenkinsfile
@@ -0,0 +1,69 @@
+pipeline {
+  agent {label 'portal-slave'}
+
+  options {
+    buildDiscarder(logRotator(numToKeepStr: '60', artifactNumToKeepStr: '5'))
+  }
+
+  tools { 
+      maven '3.9' 
+      jdk '21'
+  }
+
+  parameters {
+      string(name: 'releaseVersion', defaultValue: '1.0.0-m1', description: 'The release version.')
+      string(name: 'engineDownloadURL', defaultValue: '-Divy.engine.download.url=https://developer.axonivy.com/permalink/nightly/axonivy-engine-windows.zip', description: '''Where to download engine? e.g.
+        -Divy.engine.download.url=https://developer.axonivy.com/permalink/nightly/axonivy-engine-windows.zip for nightly master
+        -Divy.engine.download.url=https://developer.axonivy.com/permalink/dev/axonivy-engine-windows.zip for dev master
+        -Divy.engine.download.url=file:///C:/wawa/engine/AxonIvyEngineX.X.X.X_Windows_x64.zip for downloaded engine
+        -Divy.engine.list.url=https://jenkins.ivyteam.io/job/core_product/job/release%252F9.4/lastSuccessfulBuild/artifact/workspace/ch.ivyteam.ivy.server.product/target/products/ -Divy.engine.os.arch=Windows_x64 for last successful build 9.4
+      ''')
+  }
+
+  environment {
+    engineDir = "$env.WORKSPACE/engine"
+  }
+
+  stages {
+    stage('build') {
+      steps {
+        script {
+          currentBuild.description = "On ${env.NODE_NAME}"
+          echo "====================Update pom version to ${params.releaseVersion}===================="
+          powershell '''
+            #find all pom file of portal project and change their versions and their portal dependencies to releaseVersion
+            $utf8WithoutBom = New-Object System.Text.UTF8Encoding($false)
+            $files = get-childitem axonivy-express/pom.xml
+            foreach($file in $files) {
+              $xml = new-object xml
+              $xml.load($file)
+              $xml.project.version = $env:releaseVersion
+              $dependencies = $xml.project.dependencies.ChildNodes
+              foreach($dependency in $dependencies) {
+                if($dependency.groupId -eq 'com.axonivy.portal') {
+                  $dependency.version = $env:releaseVersion
+                }
+              }
+              $sw = New-Object System.IO.StreamWriter($file, $false, $utf8WithoutBom)
+              $xml.Save($sw)
+            }
+          '''
+
+          echo "====================Build all modules===================="
+          // module structure [module path, isPossibleToDeploy]
+          def modules = [['axonivy-express', true]]
+          for (module in modules) {
+            bat "mvn clean install -Divy.engine.directory=%engineDir% -Divy.engine.version=(7.0.0,] -Divy.compiler.engine.start.timeout=120 %engineDownloadURL% -f ${module[0]}/pom.xml"
+          }
+
+        }
+      }
+    }
+  }
+
+  post {
+    always {
+      archiveArtifacts artifacts: "**/target/*.iar,*/pom.xml"
+    }
+  }
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -1217,4 +1217,4 @@ @@
             { "id" : "f19", "to" : "f34" }
           ]
         } ]
-    }
+    }