Migrate to 12.0 🐫 (#44)

* Raise project to 12.0.0-SNAPSHOT * Update maven version to 12.0.0-SNAPSHOT * Update workflow actions to v5 * convert to PF13 using Designer * remove 'persistent' flags * Fix warning in HTML --------- Co-authored-by: nqhoan-axonivy <[email protected]>
axonivy-market · Dec 2, 2024 · 0a296e4 · 0a296e4
1 parent 693bc2b
commit 0a296e4
Show file tree

Hide file tree

Showing 59 changed files with 413 additions and 341 deletions.
diff --git a/.github/workflows/ci.yml b/.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
diff --git 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
+    uses: axonivy-market/github-workflows/.github/workflows/dev.yml@v5
diff --git 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/deepl-connector-demo/.classpath b/deepl-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>

diff --git a/deepl-connector-demo/.project b/deepl-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>
diff --git a/deepl-connector-demo/.settings/.jsdtscope b/deepl-connector-demo/.settings/.jsdtscope
diff --git a/deepl-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs b/deepl-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs
@@ -1,5 +1,4 @@
-ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_DATA_CLASS=com.axonivy.connector.deepl.demo.Data
 ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.connector.deepl.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
diff --git a/deepl-connector-demo/.settings/org.eclipse.jdt.core.prefs b/deepl-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/deepl-connector-demo/.settings/org.eclipse.wst.common.component b/deepl-connector-demo/.settings/org.eclipse.wst.common.component
@@ -2,10 +2,9 @@
     <wb-module deploy-name="deepl-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="deepl-connector-demo"/>
         <property name="java-output-path" value="/deepl-connector-demo/target/classes"/>
     </wb-module>
-</project-modules>
+</project-modules>
diff --git a/deepl-connector-demo/.settings/org.eclipse.wst.common.project.facet.core.xml b/deepl-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>
diff --git a/deepl-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.container b/deepl-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.container
diff --git a/deepl-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.name b/deepl-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.name
diff --git a/deepl-connector-demo/config/variables.yaml b/deepl-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.

diff --git a/deepl-connector-demo/dataclasses/com/axonivy/connector/deepl/demo/Data.d.json b/deepl-connector-demo/dataclasses/com/axonivy/connector/deepl/demo/Data.d.json
@@ -0,0 +1,14 @@
+{
+  "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json",
+  "simpleName" : "Data",
+  "namespace" : "com.axonivy.connector.deepl.demo",
+  "isBusinessCaseData" : false,
+  "fields" : [ {
+    "name" : "language",
+    "type" : "com.deepl.api.v2.client.TargetLanguage"
+  }, {
+    "name" : "file",
+    "type" : "File",
+    "modifiers" : [ "PERSISTENT" ]
+  } ]
+}
diff --git a/deepl-connector-demo/dataclasses/com/axonivy/connector/deepl/demo/Data.ivyClass b/deepl-connector-demo/dataclasses/com/axonivy/connector/deepl/demo/Data.ivyClass
diff --git a/deepl-connector-demo/pom.xml b/deepl-connector-demo/pom.xml
@@ -3,10 +3,10 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.axonivy.connector.deepl</groupId>
   <artifactId>deepl-connector-demo</artifactId>
-  <version>10.0.10-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>
   <dependencies>
     <dependency>

diff --git a/deepl-connector-demo/processes/DeepLDemo.p.json b/deepl-connector-demo/processes/DeepLDemo.p.json
@@ -1,5 +1,5 @@
 {
-  "format" : "10.0.0",
+  "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
   "id" : "1865BBA362D2425B",
   "config" : {
     "data" : "com.axonivy.connector.deepl.demo.Data"
@@ -9,14 +9,17 @@
       "type" : "RequestStart",
       "name" : "translateText.ivp",
       "config" : {
-        "callSignature" : "translateText",
-        "outLink" : "translateText.ivp",
-        "tags" : "demo"
+        "signature" : "translateText"
       },
+      "tags" : [
+        "demo"
+      ],
       "visual" : {
         "at" : { "x" : 96, "y" : 64 }
       },
-      "connect" : { "id" : "f2", "to" : "f4" }
+      "connect" : [
+        { "id" : "f2", "to" : "f4" }
+      ]
     }, {
       "id" : "f1",
       "type" : "TaskEnd",
@@ -28,14 +31,15 @@
       "type" : "DialogCall",
       "name" : "translateText",
       "config" : {
-        "dialogId" : "com.axonivy.connector.deepl.demo.translateText",
-        "startMethod" : "start()"
+        "dialog" : "com.axonivy.connector.deepl.demo.translateText:start()"
       },
       "visual" : {
         "at" : { "x" : 248, "y" : 64 },
         "icon" : "res:/webContent/logo/deepl-logo-blue.png"
       },
-      "connect" : { "id" : "f7", "to" : "f1" }
+      "connect" : [
+        { "id" : "f7", "to" : "f1" }
+      ]
     }, {
       "id" : "f5",
       "type" : "TaskEnd",
@@ -47,21 +51,21 @@
       "type" : "RequestStart",
       "name" : "translateFile.ivp",
       "config" : {
-        "callSignature" : "translateFile",
-        "outLink" : "translateFile.ivp"
+        "signature" : "translateFile"
       },
       "visual" : {
         "at" : { "x" : 96, "y" : 144 },
-        "labelOffset" : { "x" : 9, "y" : 35 }
+        "labelOffset" : { "x" : 9 }
       },
-      "connect" : { "id" : "f6", "to" : "f11" }
+      "connect" : [
+        { "id" : "f6", "to" : "f11" }
+      ]
     }, {
       "id" : "f11",
       "type" : "DialogCall",
       "name" : "translateFile",
       "config" : {
-        "dialogId" : "com.axonivy.connector.deepl.demo.translateFile",
-        "startMethod" : "start()",
+        "dialog" : "com.axonivy.connector.deepl.demo.translateFile:start()",
         "output" : {
           "map" : {
             "out" : "in",
@@ -73,6 +77,8 @@
         "at" : { "x" : 248, "y" : 144 },
         "icon" : "res:/webContent/logo/deepl-logo-blue.png"
       },
-      "connect" : { "id" : "f3", "to" : "f5" }
+      "connect" : [
+        { "id" : "f3", "to" : "f5" }
+      ]
     } ]
 }
diff --git a/...tor-demo/src_hd/com/axonivy/connector/deepl/demo/translateFile/translateFile.rddescriptor b/...tor-demo/src_hd/com/axonivy/connector/deepl/demo/translateFile/translateFile.rddescriptor
diff --git a/...-connector-demo/src_hd/com/axonivy/connector/deepl/demo/translateFile/translateFile.xhtml b/...-connector-demo/src_hd/com/axonivy/connector/deepl/demo/translateFile/translateFile.xhtml
@@ -38,14 +38,14 @@
 					<p:commandButton value="Upload"
 						actionListener="#{logic.fileUpload}" ajax="false"
 						id="fileUploadButton" icon="fa-solid fa-cloud-upload"
-						disabled="#{empty data.translate}" />
+						disabled="#{data.translate eq null}" />
 					<br /> <br />
 					<h:outputText value="No file to translate? Try our example" />
 					<br />
 					<p:commandButton value="Example file"
 						actionListener="#{logic.fileUploadTemplate}" ajax="false"
 						update="form" id="templateButton" icon="fa-solid fa-cloud-upload"
-						disabled="#{empty data.translate}" />
+						disabled="#{data.translate eq null}" />
 
 					<a href="#{ivy.html.fileref(data.exampleFile)}">Example file</a> <br />
 				</div>

diff --git a/...ector-demo/src_hd/com/axonivy/connector/deepl/demo/translateFile/translateFileData.d.json b/...ector-demo/src_hd/com/axonivy/connector/deepl/demo/translateFile/translateFileData.d.json
@@ -0,0 +1,36 @@
+{
+  "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json",
+  "simpleName" : "translateFileData",
+  "namespace" : "com.axonivy.connector.deepl.demo.translateFile",
+  "isBusinessCaseData" : false,
+  "fields" : [ {
+    "name" : "showContent",
+    "type" : "Boolean",
+    "modifiers" : [ "PERSISTENT" ]
+  }, {
+    "name" : "filePath",
+    "type" : "String",
+    "modifiers" : [ "PERSISTENT" ]
+  }, {
+    "name" : "languages",
+    "type" : "List<com.axonivy.connector.deepl.LanguageInfo.Lang>"
+  }, {
+    "name" : "translate",
+    "type" : "com.axonivy.connector.deepl.LanguageInfo.Lang"
+  }, {
+    "name" : "ivyFile",
+    "type" : "File"
+  }, {
+    "name" : "file",
+    "type" : "File",
+    "modifiers" : [ "PERSISTENT" ]
+  }, {
+    "name" : "translated",
+    "type" : "File",
+    "modifiers" : [ "PERSISTENT" ]
+  }, {
+    "name" : "exampleFile",
+    "type" : "File",
+    "modifiers" : [ "PERSISTENT" ]
+  } ]
+}
diff --git a/...tor-demo/src_hd/com/axonivy/connector/deepl/demo/translateFile/translateFileData.ivyClass b/...tor-demo/src_hd/com/axonivy/connector/deepl/demo/translateFile/translateFileData.ivyClass
-Original file line number
+Diff line change
@@ Expand Up / @@ -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