MARP-1481 Upgrade for Ivy 12

.github/workflows/ci.yml

@@ -9,4 +9,4 @@ on:
 
 jobs:
   build:
-    uses: axonivy-market/github-workflows/.github/workflows/ci.yml@v4
+    uses: axonivy-market/github-workflows/.github/workflows/ci.yml@v5

.github/workflows/dev.yml

@@ -8,5 +8,5 @@ on:
 
 jobs:
   build:
-    uses: axonivy-market/github-workflows/.github/workflows/dev.yml@v4
+    uses: axonivy-market/github-workflows/.github/workflows/dev.yml@v5
 

.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

pom.xml

@@ -3,7 +3,7 @@
   <groupId>com.axonivy.connector.salesforce</groupId>
   <name>salesforce-connector</name>
   <artifactId>salesforce-connector-modules</artifactId>
-  <version>10.0.18-SNAPSHOT</version>
+  <version>12.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <modules>

salesforce-connector-demo/.classpath

@@ -5,12 +5,7 @@
 			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**/*.ivyClass|**/*.p.json|**/*.rddescriptor|**/*.xhtml" kind="src" path="src_hd">
-		<attributes>
-			<attribute name="optional" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" path="src_wsproc">
+		<classpathentry kind="src" path="src_wsproc">
 		<attributes>
 			<attribute name="optional" value="true"/>
 		</attributes>

salesforce-connector-demo/.project

@@ -25,6 +25,11 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>ch.ivyteam.ivy.dialog.form.build.ivyDialogFormBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>ch.ivyteam.ivy.designer.ide.ivyModelValidationBuilder</name>
 			<arguments>
@@ -44,6 +49,5 @@
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jem.beaninfo.BeanInfoNature</nature>
 		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
 	</natures>
-</projectDescription>
+</projectDescription>

salesforce-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs

@@ -1,5 +1,4 @@
-ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_DATA_CLASS=salesforce.connector.demo.Data
 ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=salesforce.connector.demo
-ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=11
-ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=100000
+ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13
+ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=120001
 eclipse.preferences.version=1

salesforce-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

salesforce-connector-demo/.settings/org.eclipse.wst.common.component

@@ -2,10 +2,9 @@
     <wb-module deploy-name="salesforce-connector-demo">
         <wb-resource deploy-path="/" source-path="/webContent" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src_hd"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src_wsproc"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src_dataClasses"/>
         <property name="context-root" value="salesforce-connector-demo"/>
         <property name="java-output-path" value="/salesforce-connector-demo/target/classes"/>
     </wb-module>
-</project-modules>
+</project-modules>

salesforce-connector-demo/.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
-  <fixed facet="wst.jsdt.web"/>
-  <installed facet="java" version="17"/>
+  <installed facet="java" version="21"/>
   <installed facet="jst.web" version="3.0"/>
-  <installed facet="wst.jsdt.web" version="1.0"/>
   <installed facet="jst.jsf" version="2.1"/>
-</faceted-project>
+</faceted-project>

salesforce-connector-demo/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.

salesforce-connector-demo/dataclasses/com/axonivy/connector/salesforce/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.salesforce",
+  "isBusinessCaseData" : false,
+  "fields" : [ {
+    "name" : "opps",
+    "type" : "java.util.List<com.axonivy.connector.salesforce.model.Opportunity>"
+  }, {
+    "name" : "id",
+    "type" : "String",
+    "modifiers" : [ "PERSISTENT" ]
+  }, {
+    "name" : "acc",
+    "type" : "com.axonivy.connector.salesforce.model.Account"
+  }, {
+    "name" : "accs",
+    "type" : "java.util.List<com.axonivy.connector.salesforce.model.Account>"
+  } ]
+}

salesforce-connector-demo/dataclasses/com/axonivy/connector/salesforce/FindAllEventByOpportunityIdData.d.json

@@ -0,0 +1,13 @@
+{
+  "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json",
+  "simpleName" : "FindAllEventByOpportunityIdData",
+  "namespace" : "com.axonivy.connector.salesforce",
+  "isBusinessCaseData" : false,
+  "fields" : [ {
+    "name" : "events",
+    "type" : "java.util.List<com.axonivy.connector.salesforce.model.Event>"
+  }, {
+    "name" : "oppId",
+    "type" : "String"
+  } ]
+}

salesforce-connector-demo/dataclasses/com/axonivy/connector/salesforce/FindAllTaskByOpportunityIdData.d.json

@@ -0,0 +1,13 @@
+{
+  "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json",
+  "simpleName" : "FindAllTaskByOpportunityIdData",
+  "namespace" : "com.axonivy.connector.salesforce",
+  "isBusinessCaseData" : false,
+  "fields" : [ {
+    "name" : "tasks",
+    "type" : "java.util.List<com.axonivy.connector.salesforce.model.Task>"
+  }, {
+    "name" : "oppId",
+    "type" : "String"
+  } ]
+}

salesforce-connector-demo/dataclasses/com/axonivy/connector/salesforce/GetOppotunityData.d.json

@@ -0,0 +1,13 @@
+{
+  "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json",
+  "simpleName" : "GetOppotunityData",
+  "namespace" : "com.axonivy.connector.salesforce",
+  "isBusinessCaseData" : false,
+  "fields" : [ {
+    "name" : "opp",
+    "type" : "com.axonivy.connector.salesforce.model.Opportunity"
+  }, {
+    "name" : "id",
+    "type" : "String"
+  } ]
+}

salesforce-connector-demo/dataclasses/salesforce/connector/demo/waitData.d.json

@@ -0,0 +1,6 @@
+{
+  "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json",
+  "simpleName" : "waitData",
+  "namespace" : "salesforce.connector.demo",
+  "isBusinessCaseData" : false
+}

salesforce-connector-demo/pom.xml

@@ -3,10 +3,10 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.axonivy.connector.salesforce</groupId>
   <artifactId>salesforce-connector-demo</artifactId>
-  <version>10.0.18-SNAPSHOT</version>
+  <version>12.0.0-SNAPSHOT</version>
   <packaging>iar</packaging>
   <properties>
-    <project.build.plugin.version>10.0.16</project.build.plugin.version>
+    <project.build.plugin.version>12.0.0</project.build.plugin.version>
   </properties>
   <pluginRepositories>
     <pluginRepository>

salesforce-connector-demo/processes/ChartDemo.p.json

@@ -1,5 +1,5 @@
 {
-  "format" : "10.0.0",
+  "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
   "id" : "18C19135AC79638F",
   "config" : {
     "data" : "com.axonivy.connector.salesforce.Data"
@@ -9,13 +9,14 @@
       "type" : "RequestStart",
       "name" : "start.ivp",
       "config" : {
-        "callSignature" : "start",
-        "outLink" : "start.ivp"
+        "signature" : "start"
       },
       "visual" : {
         "at" : { "x" : 96, "y" : 64 }
       },
-      "connect" : { "id" : "f3", "to" : "f2" }
+      "connect" : [
+        { "id" : "f3", "to" : "f2" }
+      ]
     }, {
       "id" : "f1",
       "type" : "TaskEnd",
@@ -27,21 +28,22 @@
       "type" : "UserTask",
       "name" : "ChartDemo",
       "config" : {
-        "dialogId" : "salesforce.connector.demo.Chart",
-        "startMethod" : "start()",
-        "case" : {
-          "name" : "ChartDemo",
-          "description" : "Chart Demo"
-        },
+        "dialog" : "salesforce.connector.demo.Chart:start()",
         "task" : {
           "name" : "ChartDemo",
           "description" : "Chart Demo",
           "skipTasklist" : true
+        },
+        "case" : {
+          "name" : "ChartDemo",
+          "description" : "Chart Demo"
         }
       },
       "visual" : {
         "at" : { "x" : 288, "y" : 64 }
       },
-      "connect" : { "id" : "f4", "to" : "f1" }
+      "connect" : [
+        { "id" : "f4", "to" : "f1" }
+      ]
     } ]
 }

salesforce-connector-demo/processes/Functional Processes/findAllEventByOpportunityId.p.json

@@ -1,5 +1,5 @@
 {
-  "format" : "10.0.0",
+  "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
   "id" : "18C19E836CE959F3",
   "kind" : "CALLABLE_SUB",
   "config" : {
@@ -10,18 +10,18 @@
       "type" : "CallSubStart",
       "name" : "findEvent(String)",
       "config" : {
-        "callSignature" : "findEvent",
+        "signature" : "findEvent",
         "input" : {
           "params" : [
-            { "name" : "oppId", "type" : "String" }
+            { "name" : "oppId", "type" : "String", "desc" : "" }
           ],
           "map" : {
             "out.oppId" : "param.oppId"
           }
         },
         "result" : {
           "params" : [
-            { "name" : "events", "type" : "java.util.List<com.axonivy.connector.salesforce.model.Event>" }
+            { "name" : "events", "type" : "java.util.List<com.axonivy.connector.salesforce.model.Event>", "desc" : "" }
           ],
           "map" : {
             "result.events" : "in.events"
@@ -31,7 +31,9 @@
       "visual" : {
         "at" : { "x" : 96, "y" : 64 }
       },
-      "connect" : { "id" : "f4", "to" : "f3" }
+      "connect" : [
+        { "id" : "f4", "to" : "f3" }
+      ]
     }, {
       "id" : "f1",
       "type" : "CallSubEnd",
@@ -43,13 +45,11 @@
       "type" : "SubProcessCall",
       "name" : "QueryService",
       "config" : {
+        "processCall" : "QueryService:call(String)",
         "call" : {
-          "params" : [
-            { "name" : "query", "type" : "String" }
-          ],
+          "map" : { },
           "code" : "param.query = \"Select FIELDS(ALL) from Event where WhatId='\"+ in.oppId +\"' LIMIT 200\";"
         },
-        "processCall" : "QueryService:call(String)",
         "output" : {
           "code" : [
             "import com.axonivy.connector.salesforce.utils.ConvertUtils;",
@@ -61,6 +61,8 @@
       "visual" : {
         "at" : { "x" : 264, "y" : 64 }
       },
-      "connect" : { "id" : "f2", "to" : "f1" }
+      "connect" : [
+        { "id" : "f2", "to" : "f1" }
+      ]
     } ]
 }