MARP-828 Convert project version to 11.3 (#41)

axonivy-market · Aug 14, 2024 · be9a937 · be9a937
1 parent 5e66e97
commit be9a937
Show file tree

Hide file tree

Showing 20 changed files with 123 additions and 122 deletions.
diff --git a/amazon-lex-connector-demo/.classpath b/amazon-lex-connector-demo/.classpath
@@ -5,11 +5,6 @@
       <attribute name="optional" value="true" />
     </attributes>
   </classpathentry>
-  <classpathentry excluding="**/*.ivyClass|**/*.mod|**/*.rddescriptor|**/*.xhtml" kind="src" path="src_hd">
-    <attributes>
-      <attribute name="optional" value="true" />
-    </attributes>
-  </classpathentry>
 
   <classpathentry kind="src" path="src_wsproc">
     <attributes>

diff --git a/amazon-lex-connector-demo/.project b/amazon-lex-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>

diff --git a/amazon-lex-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs b/amazon-lex-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs
@@ -1,4 +1,5 @@
 ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_DATA_CLASS=com.axonivy.connector.amazon.lex.demo.Data
 ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.connector.amazon.lex.demo
-ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=100000
-eclipse.preferences.version=1
+ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13
+ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=113000
+eclipse.preferences.version=1
diff --git a/amazon-lex-connector-demo/.settings/org.eclipse.wst.common.component b/amazon-lex-connector-demo/.settings/org.eclipse.wst.common.component
@@ -3,11 +3,9 @@
   <wb-module deploy-name="amazon-lex-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="amazon-lex-connector-demo" />
     <property name="java-output-path" value="/amazon-lex-connector-demo/classes" />
   </wb-module>
-
-</project-modules>
+</project-modules>
diff --git a/amazon-lex-connector-demo/pom.xml b/amazon-lex-connector-demo/pom.xml
@@ -1,22 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.axonivy.connector.amazon.lex</groupId>
   <artifactId>amazon-lex-connector-demo</artifactId>
-  <version>10.0.4-SNAPSHOT</version>
+  <version>11.3.1-SNAPSHOT</version>
   <packaging>iar</packaging>
   <properties>
-    <project.build.plugin.version>10.0.16</project.build.plugin.version>
+    <project.build.plugin.version>11.3.0</project.build.plugin.version>
   </properties>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>sonatype</id>
-      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-      <snapshots>
-        <updatePolicy>always</updatePolicy>
-      </snapshots>
-    </pluginRepository>
-  </pluginRepositories>
   <dependencies>
     <dependency>
       <groupId>com.axonivy.connector.amazon.lex</groupId>
@@ -25,6 +17,15 @@
       <type>iar</type>
     </dependency>
   </dependencies>
+  <pluginRepositories>
+    <pluginRepository>
+      <snapshots>
+        <updatePolicy>always</updatePolicy>
+      </snapshots>
+      <id>sonatype</id>
+      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+    </pluginRepository>
+  </pluginRepositories>
   <build>
     <plugins>
       <plugin>

diff --git a/amazon-lex-connector-demo/processes/Business Processes/LexDemo.p.json b/amazon-lex-connector-demo/processes/Business Processes/LexDemo.p.json
@@ -1,5 +1,5 @@
 {
-  "format" : "10.0.0",
+  "$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json",
   "id" : "17B2F6A64C6C86D0",
   "config" : {
     "data" : "com.axonivy.connector.amazon.lex.demo.Data"
@@ -9,16 +9,19 @@
       "type" : "RequestStart",
       "name" : "chatBot.ivp",
       "config" : {
-        "callSignature" : "chatBot",
-        "outLink" : "chatBot.ivp",
-        "startDescription" : "Amazon Lex based Chat Bot",
-        "startName" : "Amazon Lex Chat Bot"
+        "signature" : "chatBot",
+        "request" : {
+          "name" : "Amazon Lex Chat Bot",
+          "description" : "Amazon Lex based Chat Bot"
+        }
       },
       "visual" : {
         "at" : { "x" : 96, "y" : 64 },
         "labelOffset" : { "x" : 22, "y" : 37 }
       },
-      "connect" : { "id" : "f4", "to" : "f3" }
+      "connect" : [
+        { "id" : "f4", "to" : "f3" }
+      ]
     }, {
       "id" : "f1",
       "type" : "TaskEnd",
@@ -30,12 +33,13 @@
       "type" : "DialogCall",
       "name" : "ChatBot",
       "config" : {
-        "dialogId" : "com.axonivy.connector.amazon.lex.demo.ChatBot",
-        "startMethod" : "start()"
+        "dialog" : "com.axonivy.connector.amazon.lex.demo.ChatBot:start()"
       },
       "visual" : {
         "at" : { "x" : 224, "y" : 64 }
       },
-      "connect" : { "id" : "f2", "to" : "f1" }
+      "connect" : [
+        { "id" : "f2", "to" : "f1" }
+      ]
     } ]
 }
diff --git a/...connector-demo/src_hd/com/axonivy/connector/amazon/lex/demo/ChatBot/ChatBotProcess.p.json b/...connector-demo/src_hd/com/axonivy/connector/amazon/lex/demo/ChatBot/ChatBotProcess.p.json
@@ -1,5 +1,5 @@
 {
-  "format" : "10.0.0",
+  "$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json",
   "id" : "17B2F6BE1C69F667",
   "kind" : "HTML_DIALOG",
   "config" : {
@@ -10,7 +10,7 @@
       "type" : "HtmlDialogStart",
       "name" : "start()",
       "config" : {
-        "callSignature" : "start",
+        "signature" : "start",
         "input" : {
           "map" : {
             "out.sessionId" : "java.util.UUID.randomUUID().toString()"
@@ -29,7 +29,9 @@
         "at" : { "x" : 96, "y" : 64 },
         "labelOffset" : { "x" : 12, "y" : 35 }
       },
-      "connect" : { "id" : "f2", "to" : "f1" }
+      "connect" : [
+        { "id" : "f2", "to" : "f1" }
+      ]
     }, {
       "id" : "f1",
       "type" : "HtmlDialogEnd",
@@ -47,7 +49,9 @@
         "at" : { "x" : 96, "y" : 160 },
         "labelOffset" : { "x" : 9, "y" : 35 }
       },
-      "connect" : { "id" : "f5", "to" : "f4" }
+      "connect" : [
+        { "id" : "f5", "to" : "f4" }
+      ]
     }, {
       "id" : "f4",
       "type" : "Script",
@@ -65,55 +69,66 @@
       },
       "visual" : {
         "at" : { "x" : 208, "y" : 160 },
-        "size" : { "width" : 144, "height" : 60 }
+        "size" : { "width" : 144 }
       },
-      "connect" : { "id" : "f7", "to" : "f6" }
+      "connect" : [
+        { "id" : "f7", "to" : "f6" }
+      ]
     }, {
       "id" : "f6",
       "type" : "RestClientCall",
       "name" : "Send input to Amazon Lex",
       "config" : {
-        "path" : "/bots/{botId}/botAliases/{botAliasId}/botLocales/{localeId}/sessions/{sessionId}/text",
-        "bodyObjectMapping" : {
-          "param.text" : "in.input"
-        },
-        "clientId" : "13f7783c-cd64-4625-a663-82b504bd4195",
-        "clientErrorCode" : "ivy:error:rest:client",
         "method" : "POST",
-        "statusErrorCode" : "ivy:error:rest:client",
-        "bodyObjectType" : "com.amazonaws.lex.runtime.v2.SessionIdTextBody",
-        "templateParams" : {
-          "botAliasId" : "ivy.var.Amazon_Lex_BotAliasId",
-          "botId" : "ivy.var.Amazon_Lex_BotId",
-          "sessionId" : "in.sessionId",
-          "localeId" : "\"en_US\""
+        "target" : {
+          "clientId" : "13f7783c-cd64-4625-a663-82b504bd4195",
+          "path" : "/bots/{botId}/botAliases/{botAliasId}/botLocales/{localeId}/sessions/{sessionId}/text",
+          "templateParams" : {
+            "botId" : "ivy.var.get(\"Amazon.Lex.BotId\")",
+            "botAliasId" : "ivy.var.get(\"Amazon.Lex.BotAliasId\")",
+            "localeId" : "\"en_US\"",
+            "sessionId" : "in.sessionId"
+          }
+        },
+        "body" : {
+          "entity" : {
+            "type" : "com.amazonaws.lex.runtime.v2.SessionIdTextBody",
+            "map" : {
+              "param.text" : "in.input"
+            }
+          }
         },
-        "resultType" : "com.amazonaws.lex.runtime.v2.RecognizeTextResponse",
-        "bodyInputType" : "ENTITY",
-        "responseCode" : [
-          "import com.amazonaws.lex.runtime.v2.Intent;",
-          "import com.axonivy.connector.amazon.lex.connector.BotResponse;",
-          "import com.axonivy.connector.amazon.lex.demo.Message;",
-          "",
-          "List<String> messages = BotResponse.messages(result);",
-          "if (!messages.isEmpty()) {",
-          "  Message message;",
-          "  message.what = messages.get(0);",
-          "  message.icon = \"si si-messages-bubble\";",
-          "  out.messages.add(message);",
-          "} else if (BotResponse.getIntent(result) is initialized) {",
-          "  Intent intent = BotResponse.getIntent(result);",
-          "  out.confirmation = BotResponse.stringify(intent);",
-          "  out.finished = true;",
-          "}",
-          "in.input = \"\";"
-        ]
+        "response" : {
+          "entity" : {
+            "type" : "com.amazonaws.lex.runtime.v2.RecognizeTextResponse",
+            "code" : [
+              "import com.amazonaws.lex.runtime.v2.Intent;",
+              "import com.axonivy.connector.amazon.lex.connector.BotResponse;",
+              "import com.axonivy.connector.amazon.lex.demo.Message;",
+              "",
+              "List<String> messages = BotResponse.messages(result);",
+              "if (!messages.isEmpty()) {",
+              "  Message message;",
+              "  message.what = messages.get(0);",
+              "  message.icon = \"si si-messages-bubble\";",
+              "  out.messages.add(message);",
+              "} else if (BotResponse.getIntent(result) is initialized) {",
+              "  Intent intent = BotResponse.getIntent(result);",
+              "  out.confirmation = BotResponse.stringify(intent);",
+              "  out.finished = true;",
+              "}",
+              "in.input = \"\";"
+            ]
+          }
+        }
       },
       "visual" : {
         "at" : { "x" : 392, "y" : 160 },
-        "size" : { "width" : 160, "height" : 60 }
+        "size" : { "width" : 160 }
       },
-      "connect" : { "id" : "f9", "to" : "f8" }
+      "connect" : [
+        { "id" : "f9", "to" : "f8" }
+      ]
     }, {
       "id" : "f8",
       "type" : "HtmlDialogEnd",

diff --git a/amazon-lex-connector-product/pom.xml b/amazon-lex-connector-product/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.axonivy.connector.amazon.lex</groupId>  
   <artifactId>amazon-lex-connector-product</artifactId>
-  <version>10.0.4-SNAPSHOT</version>
+  <version>11.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <build>

diff --git a/amazon-lex-connector-test/.classpath b/amazon-lex-connector-test/.classpath
@@ -5,11 +5,6 @@
       <attribute name="optional" value="true" />
     </attributes>
   </classpathentry>
-  <classpathentry excluding="**/*.ivyClass|**/*.mod|**/*.rddescriptor|**/*.xhtml" kind="src" path="src_hd">
-    <attributes>
-      <attribute name="optional" value="true" />
-    </attributes>
-  </classpathentry>
 
   <classpathentry kind="src" path="src_wsproc">
     <attributes>

diff --git a/amazon-lex-connector-test/.project b/amazon-lex-connector-test/.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>

diff --git a/amazon-lex-connector-test/.settings/ch.ivyteam.ivy.designer.prefs b/amazon-lex-connector-test/.settings/ch.ivyteam.ivy.designer.prefs
@@ -1,4 +1,5 @@
 ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_DATA_CLASS=com.axonivy.connector.amazon.lex.test.Data
 ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.connector.amazon.lex.test
-ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=100000
-eclipse.preferences.version=1
+ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13
+ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=113000
+eclipse.preferences.version=1
diff --git a/amazon-lex-connector-test/.settings/org.eclipse.wst.common.component b/amazon-lex-connector-test/.settings/org.eclipse.wst.common.component
@@ -3,10 +3,9 @@
   <wb-module deploy-name="amazon-lex-connector-text">
     <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="amazon-lex-connector-text" />
     <property name="java-output-path" value="/amazon-lex-connector-text/classes" />
   </wb-module>
-</project-modules>
+</project-modules>
diff --git a/amazon-lex-connector-test/pom.xml b/amazon-lex-connector-test/pom.xml
@@ -3,11 +3,11 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.axonivy.connector.amazon.lex</groupId>
   <artifactId>amazon-lex-connector-test</artifactId>
-  <version>10.0.4-SNAPSHOT</version>
+  <version>11.3.1-SNAPSHOT</version>
   <packaging>iar-integration-test</packaging>
   <properties>
-    <project.build.plugin.version>10.0.16</project.build.plugin.version>
-    <tester.version>10.0.16</tester.version>
+    <project.build.plugin.version>11.3.0</project.build.plugin.version>
+    <tester.version>11.3.0</tester.version>
   </properties>
   <pluginRepositories>
     <pluginRepository>